ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/map.h
(Generate patch)

Comparing deliantra/server/include/map.h (file contents):
Revision 1.89 by root, Sun Sep 30 20:22:18 2007 UTC vs.
Revision 1.96 by root, Mon Jul 14 16:42:49 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 24/*
25 * The maptile is allocated each time a new map is opened. 25 * The maptile is allocated each time a new map is opened.
26 * It contains pointers (very indirectly) to all objects on the map. 26 * It contains pointers (very indirectly) to all objects on the map.
… …
47#define MAGIC_MAP_SIZE 50 47#define MAGIC_MAP_SIZE 50
48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49 49
50#define MAP_LAYERS 3 50#define MAP_LAYERS 3
51 51
52/* Values for in_memory below. Should probably be an enumerations */ 52/* Values for in_memory below */
53enum { 53enum {
54 MAP_IN_MEMORY, 54 MAP_ACTIVE,
55 MAP_INACTIVE, // not used atm.
55 MAP_SWAPPED, 56 MAP_SWAPPED,
56 MAP_LOADING, 57 MAP_LOADING,
57 MAP_SAVING, 58 MAP_SAVING,
58}; 59};
59 60
… …
153 uint64 volume () const; 154 uint64 volume () const;
154 155
155 bool blocks (MoveType mt) const 156 bool blocks (MoveType mt) const
156 { 157 {
157 return move_block && (mt & move_block) == mt; 158 return move_block && (mt & move_block) == mt;
159 }
160
161 bool blocks (object *op) const
162 {
163 return blocks (op->move_type);
158 } 164 }
159}; 165};
160 166
161struct shopitems : zero_initialised 167struct shopitems : zero_initialised
162{ 168{
… …
215 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 221 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216 222
217 bool ACC (RW, per_player); 223 bool ACC (RW, per_player);
218 bool ACC (RW, per_party); 224 bool ACC (RW, per_party);
219 bool ACC (RW, outdoor); /* True if an outdoor map */ 225 bool ACC (RW, outdoor); /* True if an outdoor map */
220 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 226 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
221 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 227 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
222 228
223 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 229 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
224 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 230 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
225 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 231 oblinkpt *buttons; /* Linked list of linked lists of buttons */
… …
261 267
262 MTH void play_sound (faceidx sound, int x, int y) const; 268 MTH void play_sound (faceidx sound, int x, int y) const;
263 269
264 // set the given flag on all objects in the map 270 // set the given flag on all objects in the map
265 MTH void set_object_flag (int flag, int value = 1); 271 MTH void set_object_flag (int flag, int value = 1);
272 MTH void post_load_original ();
266 273
267 MTH void link_multipart_objects (); 274 MTH void link_multipart_objects ();
268 MTH void clear_unique_items (); 275 MTH void clear_unique_items ();
269 276
270 MTH void clear_header (); 277 MTH void clear_header ();
… …
324 bool generate_random_map (random_map_params *RP); 331 bool generate_random_map (random_map_params *RP);
325 332
326 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 333 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
327 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 334 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
328 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 335 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
329 MTH object *pick_random_object () const; 336 object *pick_random_object (rand_gen &gen = rndm) const;
330 337
331 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 338 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
332 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 339 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
333}; 340};
334 341
… …
419 bool normalise () 426 bool normalise ()
420 { 427 {
421 return xy_normalise (m, x, y); 428 return xy_normalise (m, x, y);
422 } 429 }
423 430
431 mapspace &ms () const
432 {
433 return m->at (x, y);
434 }
435
424 object *insert (object *op, object *originator = 0, int flags = 0) const 436 object *insert (object *op, object *originator = 0, int flags = 0) const
425 { 437 {
426 m->insert (op, x, y, originator, flags); 438 return m->insert (op, x, y, originator, flags);
427 } 439 }
428}; 440};
429 441
430inline const mapxy & 442inline const mapxy &
431object::operator =(const mapxy &pos) 443object::operator =(const mapxy &pos)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines