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.94 by root, Wed May 7 11:02:50 2008 UTC vs.
Revision 1.107 by root, Sat Dec 27 08:41:44 2008 UTC

… …
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// tile map index
53enum {
54 TILE_UP = 0,
55 TILE_RIGHT = 1,
56 TILE_DOWN = 2,
57 TILE_LEFT = 3,
58};
59
52/* Values for in_memory below */ 60/* Values for in_memory below */
53enum { 61enum {
54 MAP_ACTIVE, 62 MAP_ACTIVE,
55 MAP_INACTIVE, // not used atm. 63 MAP_INACTIVE, // not used atm.
56 MAP_SWAPPED, 64 MAP_SWAPPED,
… …
63 * where it is known the map is not tiled or the values are known 71 * where it is known the map is not tiled or the values are known
64 * consistent (eg, op->map, op->x, op->y) 72 * consistent (eg, op->map, op->x, op->y)
65 */ 73 */
66// all those macros are herewith declared legacy 74// all those macros are herewith declared legacy
67#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags () 75#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()
68#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
69#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot 76#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot
70#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top 77#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
71#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L] 78#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
72#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block 79#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
73#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow 80#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
… …
100 * used in the get_map_flags value - that function is used to return 107 * used in the get_map_flags value - that function is used to return
101 * the flag value, as well as other conditions - using a more general 108 * the flag value, as well as other conditions - using a more general
102 * function that does more of the work can hopefully be used to replace 109 * function that does more of the work can hopefully be used to replace
103 * lots of duplicate checks currently in the code. 110 * lots of duplicate checks currently in the code.
104 */ 111 */
105#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 112#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
106#define P_NEW_MAP 0x20000 113#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
107 /* Coordinates passed result in a new tiled map */
108 114
109/* Instead of having numerous arrays that have information on a 115/* Instead of having numerous arrays that have information on a
110 * particular space (was map, floor, floor2, map_ob), 116 * particular space (was map, floor, floor2, map_ob),
111 * have this structure take care of that information. 117 * have this structure take care of that information.
112 * This puts it all in one place, and should also make it easier 118 * This puts it all in one place, and should also make it easier
113 * to extend information about a space. 119 * to extend information about a space.
114 */ 120 */
121INTERFACE_CLASS (mapspace)
115struct mapspace 122struct mapspace
116{ 123{
124 object *ACC (RW, bot);
117 object *bot, *top; /* lowest/highest object on this space */ 125 object *ACC (RW, top); /* lowest/highest object on this space */
118 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 126 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
127 uint32_t smell; // the last count a player was seen here, or 0
128 static uint32_t smellcount; // global smell counter
119 uint8 flags_; /* flags about this space (see the P_ values above) */ 129 uint8 flags_; /* flags about this space (see the P_ values above) */
120 sint8 light; /* How much light this space provides */ 130 sint8 ACC (RW, light); /* How much light this space provides */
121 MoveType move_block; /* What movement types this space blocks */ 131 MoveType ACC (RW, move_block); /* What movement types this space blocks */
122 MoveType move_slow; /* What movement types this space slows */ 132 MoveType ACC (RW, move_slow); /* What movement types this space slows */
123 MoveType move_on; /* What movement types are activated */ 133 MoveType ACC (RW, move_on); /* What movement types are activated */
124 MoveType move_off; /* What movement types are activated */ 134 MoveType ACC (RW, move_off); /* What movement types are activated */
125 135
126 void update_ (); 136 void update_ ();
127 void update () 137 MTH void update ()
128 { 138 {
129 if (!(flags_ & P_UPTODATE)) 139 if (!(flags_ & P_UPTODATE))
130 update_ (); 140 update_ ();
131 } 141 }
132 142
133 uint8 flags () 143 MTH uint8 flags ()
134 { 144 {
135 update (); 145 update ();
136 return flags_; 146 return flags_;
137 } 147 }
148
149 MTH void invalidate ()
150 {
151 flags_ = 0;
152 }
138 153
139 // maybe only inline quick flags_ checking?
140 object *player () 154 MTH object *player ()
141 { 155 {
142 // search from the top, because players are usually on top 156 object *op;
143 // make usually == always and this non-amortized O(1) 157
144 // could gte rid of P_PLAYER, too, then
145 if (flags () & P_PLAYER) 158 if (flags () & P_PLAYER)
146 for (object *op = top; op; op = op->below) 159 for (op = top; op->type != PLAYER; op = op->below)
147 if (op->type == PLAYER) 160 ;
148 return op; 161 else
162 op = 0;
149 163
150 return 0; 164 return op;
151 } 165 }
152 166
153 // return the item volume on this mapspace in cm³ 167 // return the item volume on this mapspace in cm³
154 uint64 volume () const; 168 MTH uint64 volume () const;
155 169
156 bool blocks (MoveType mt) const 170 bool blocks (MoveType mt) const
157 { 171 {
158 return move_block && (mt & move_block) == mt; 172 return move_block && (mt & move_block) == mt;
159 } 173 }
174
175 bool blocks (object *op) const
176 {
177 return blocks (op->move_type);
178 }
179};
180
181// a rectangular area of a map
182struct maprect
183{
184 maptile *m;
185 int x0, y0;
186 int x1, y1;
187 int dx, dy; // offset to go from local coordinates to original tile */
160}; 188};
161 189
162struct shopitems : zero_initialised 190struct shopitems : zero_initialised
163{ 191{
164 const char *name; /* name of the item in question, null if it is the default item */ 192 const char *name; /* name of the item in question, null if it is the default item */
… …
217 245
218 bool ACC (RW, per_player); 246 bool ACC (RW, per_player);
219 bool ACC (RW, per_party); 247 bool ACC (RW, per_party);
220 bool ACC (RW, outdoor); /* True if an outdoor map */ 248 bool ACC (RW, outdoor); /* True if an outdoor map */
221 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */ 249 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
222 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 250 sint8 ACC (RW, darkness); /* indicates level of darkness of map */
251 static sint8 outdoor_darkness; /* the global darkness level outside */
223 252
224 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 253 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
225 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 254 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
226 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 255 oblinkpt *buttons; /* Linked list of linked lists of buttons */
227 sint16 ACC (RW, temp); /* base temperature of this tile (F) */ 256 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
… …
242 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 271 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
243 shstr ACC (RW, path); /* Filename of the map */ 272 shstr ACC (RW, path); /* Filename of the map */
244 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace 273 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
245 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 274 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
246 275
276 // the maptile:: is neccessary here for the perl interface to work
277 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
278 {
279 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
280 }
281
282 static void adjust_daylight ();
283
247 MTH void activate (); 284 MTH void activate ();
248 MTH void deactivate (); 285 MTH void deactivate ();
249 286
250 // allocates all (empty) mapspace 287 // allocates all (empty) mapspace
251 MTH void alloc (); 288 MTH void alloc ();
… …
254 291
255 MTH void fix_auto_apply (); 292 MTH void fix_auto_apply ();
256 MTH void do_decay_objects (); 293 MTH void do_decay_objects ();
257 MTH void update_buttons (); 294 MTH void update_buttons ();
258 MTH int change_map_light (int change); 295 MTH int change_map_light (int change);
259 static void change_all_map_light (int change); //PERL
260 MTH void set_darkness_map ();
261 MTH int estimate_difficulty () const; 296 MTH int estimate_difficulty () const;
262 297
263 MTH void play_sound (faceidx sound, int x, int y) const; 298 MTH void play_sound (faceidx sound, int x, int y) const;
264 299
265 // set the given flag on all objects in the map 300 // set the given flag on all objects in the map
266 MTH void set_object_flag (int flag, int value = 1); 301 MTH void set_object_flag (int flag, int value = 1);
302 MTH void post_load_original ();
267 303
268 MTH void link_multipart_objects (); 304 MTH void link_multipart_objects ();
269 MTH void clear_unique_items (); 305 MTH void clear_unique_items ();
270 306
271 MTH void clear_header (); 307 MTH void clear_header ();
… …
300 336
301 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 337 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
302 338
303 MTH void touch () { last_access = runtime; } 339 MTH void touch () { last_access = runtime; }
304 340
305 MTH bool tile_available (int dir, bool load = true); 341 MTH maptile *tile_available (int dir, bool load = true);
306 342
307 // find the map that is at coordinate x|y relative to this map 343 // find the map that is at coordinate x|y relative to this map
308 // TODO: need a better way than passing by reference 344 // TODO: need a better way than passing by reference
309 // TODO: make perl interface 345 // TODO: make perl interface
310 maptile *xy_find (sint16 &x, sint16 &y); 346 maptile *xy_find (sint16 &x, sint16 &y);
… …
327 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 363 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
328 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 364 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
329 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 365 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
330 object *pick_random_object (rand_gen &gen = rndm) const; 366 object *pick_random_object (rand_gen &gen = rndm) const;
331 367
332 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 368 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
333 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 369
370 // return an array of maprects corresponding
371 // to the given rectangular area. the last rect will have
372 // a 0 map pointer.
373 // the array will be stored in a static memory area,
374 // so recursion is not atm. supported
375 maprect *split_to_tiles (int x0, int y0, int x1, int y1);
334}; 376};
335 377
336/* This is used by get_rangevector to determine where the other 378/* This is used by get_rangevector to determine where the other
337 * creature is. get_rangevector takes into account map tiling, 379 * creature is. get_rangevector takes into account map tiling,
338 * so you just can not look the the map coordinates and get the 380 * so you just can not look the the map coordinates and get the
… …
420 bool normalise () 462 bool normalise ()
421 { 463 {
422 return xy_normalise (m, x, y); 464 return xy_normalise (m, x, y);
423 } 465 }
424 466
467 mapspace &ms () const
468 {
469 return m->at (x, y);
470 }
471
425 object *insert (object *op, object *originator = 0, int flags = 0) const 472 object *insert (object *op, object *originator = 0, int flags = 0) const
426 { 473 {
427 m->insert (op, x, y, originator, flags); 474 return m->insert (op, x, y, originator, flags);
428 } 475 }
429}; 476};
430 477
431inline const mapxy & 478inline const mapxy &
432object::operator =(const mapxy &pos) 479object::operator =(const mapxy &pos)
… …
436 y = pos.y; 483 y = pos.y;
437 484
438 return pos; 485 return pos;
439} 486}
440 487
488// iterate over a rectangular area relative to op
489// can be used as a single statement, but both iterate macros
490// invocations must not be followed by a ";"
491// see common/los.C for usage example
492// the walk will be ordered, outer loop x, inner loop y
493// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
494#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
495 for (int dx = (dx0); dx <= (dx1); ++dx) \
496 { \
497 sint16 nx, ny; \
498 maptile *m = 0; \
499 \
500 for (int dy = (dy0); dy <= (dy1); ++dy) \
501 { \
502 /* check to see if we can simply go one down quickly, */ \
503 /* if not, do it the slow way */ \
504 if (!m || ++ny >= m->height) \
505 { \
506 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
507 \
508 if (!xy_normalise (m, nx, ny)) \
509 m = 0; \
510 }
511
512#define ordered_mapwalk_end \
513 } \
514 }
515
516// loop over every space in the given maprect,
517// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
518// the iterator code must be a single statement following this macro call, similar to "if"
519#define rect_mapwalk(rect,dx0,dy0) \
520 statementvar (maptile *, m, (rect)->m) \
521 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
522 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
523 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
524 statementvar (int, dy, ny + (rect)->dy - (dy0))
525
526// same as above, but the walk will not follow any particular
527// order (unorded), but is likely faster.
528// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
529#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
530 for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \
531 (op)->x + (dx0) , (op)->y + (dy0) , \
532 (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \
533 r_e_c_t->m; \
534 ++r_e_c_t) \
535 rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
536
441#endif 537#endif
442 538

Diff Legend

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