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.102 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.106 by root, Sat Dec 27 04:07: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,
… …
99 * 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
100 * 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
101 * 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
102 * lots of duplicate checks currently in the code. 110 * lots of duplicate checks currently in the code.
103 */ 111 */
104#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 */
105#define P_NEW_MAP 0x20000 113#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
106 /* Coordinates passed result in a new tiled map */
107 114
108/* Instead of having numerous arrays that have information on a 115/* Instead of having numerous arrays that have information on a
109 * particular space (was map, floor, floor2, map_ob), 116 * particular space (was map, floor, floor2, map_ob),
110 * have this structure take care of that information. 117 * have this structure take care of that information.
111 * 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
… …
115struct mapspace 122struct mapspace
116{ 123{
117 object *ACC (RW, bot); 124 object *ACC (RW, bot);
118 object *ACC (RW, top); /* lowest/highest object on this space */ 125 object *ACC (RW, top); /* lowest/highest object on this space */
119 object *ACC (RW, 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
120 uint8 flags_; /* flags about this space (see the P_ values above) */ 129 uint8 flags_; /* flags about this space (see the P_ values above) */
121 sint8 ACC (RW, light); /* How much light this space provides */ 130 sint8 ACC (RW, light); /* How much light this space provides */
122 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 131 MoveType ACC (RW, move_block); /* What movement types this space blocks */
123 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 132 MoveType ACC (RW, move_slow); /* What movement types this space slows */
124 MoveType ACC (RW, move_on); /* What movement types are activated */ 133 MoveType ACC (RW, move_on); /* What movement types are activated */
… …
165 174
166 bool blocks (object *op) const 175 bool blocks (object *op) const
167 { 176 {
168 return blocks (op->move_type); 177 return blocks (op->move_type);
169 } 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 */
170}; 188};
171 189
172struct shopitems : zero_initialised 190struct shopitems : zero_initialised
173{ 191{
174 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 */
… …
318 336
319 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);
320 338
321 MTH void touch () { last_access = runtime; } 339 MTH void touch () { last_access = runtime; }
322 340
323 MTH bool tile_available (int dir, bool load = true); 341 MTH maptile *tile_available (int dir, bool load = true);
324 342
325 // 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
326 // TODO: need a better way than passing by reference 344 // TODO: need a better way than passing by reference
327 // TODO: make perl interface 345 // TODO: make perl interface
328 maptile *xy_find (sint16 &x, sint16 &y); 346 maptile *xy_find (sint16 &x, sint16 &y);
… …
346 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 364 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
347 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
348 object *pick_random_object (rand_gen &gen = rndm) const; 366 object *pick_random_object (rand_gen &gen = rndm) const;
349 367
350 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 368 mapspace &at (uint32 x, uint32 y) const { 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);
351}; 376};
352 377
353/* This is used by get_rangevector to determine where the other 378/* This is used by get_rangevector to determine where the other
354 * creature is. get_rangevector takes into account map tiling, 379 * creature is. get_rangevector takes into account map tiling,
355 * 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
… …
458 y = pos.y; 483 y = pos.y;
459 484
460 return pos; 485 return pos;
461} 486}
462 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->touch (); \
510 else \
511 m = 0; \
512 }
513
514#define ordered_mapwalk_end \
515 } \
516 }
517
518// loop over every space in the given maprect,
519// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
520// the iterator code must be a single statement following this macro call, similar to "if"
521#define rect_mapwalk(rect,dx0,dy0) \
522 statementvar (maptile *, m, (rect)->m) \
523 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
524 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
525 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
526 statementvar (int, dy, ny + (rect)->dy - (dy0))
527
528// same as above, but the walk will not follow any particular
529// order (unorded), but is likely faster.
530// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
531#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
532 for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \
533 (op)->x + (dx0) , (op)->y + (dy0) , \
534 (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \
535 r_e_c_t->m; \
536 ++r_e_c_t) \
537 rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
538
463#endif 539#endif
464 540

Diff Legend

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