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.103 by root, Tue Dec 23 22:03:06 2008 UTC vs.
Revision 1.104 by root, Fri Dec 26 10:36:42 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,
… …
165 173
166 bool blocks (object *op) const 174 bool blocks (object *op) const
167 { 175 {
168 return blocks (op->move_type); 176 return blocks (op->move_type);
169 } 177 }
178};
179
180// a rectangular area of a map
181struct maprect
182{
183 maptile *m;
184 int x0, y0;
185 int x1, y1;
186 int dx, dy; // offset to go from local coordinates to original tile */
170}; 187};
171 188
172struct shopitems : zero_initialised 189struct shopitems : zero_initialised
173{ 190{
174 const char *name; /* name of the item in question, null if it is the default item */ 191 const char *name; /* name of the item in question, null if it is the default item */
… …
318 335
319 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 336 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
320 337
321 MTH void touch () { last_access = runtime; } 338 MTH void touch () { last_access = runtime; }
322 339
323 MTH bool tile_available (int dir, bool load = true); 340 MTH maptile *tile_available (int dir, bool load = true);
324 341
325 // find the map that is at coordinate x|y relative to this map 342 // find the map that is at coordinate x|y relative to this map
326 // TODO: need a better way than passing by reference 343 // TODO: need a better way than passing by reference
327 // TODO: make perl interface 344 // TODO: make perl interface
328 maptile *xy_find (sint16 &x, sint16 &y); 345 maptile *xy_find (sint16 &x, sint16 &y);
… …
346 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 363 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 364 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
348 object *pick_random_object (rand_gen &gen = rndm) const; 365 object *pick_random_object (rand_gen &gen = rndm) const;
349 366
350 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 367 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
368
369 // return an array of maprects corresponding
370 // to the given rectangular area. the last rect will have
371 // a 0 map pointer.
372 // the array will be stored in a static memory area,
373 // so recursion is not atm. supported
374 maprect *split_to_tiles (int x0, int y0, int x1, int y1);
351}; 375};
352 376
353/* This is used by get_rangevector to determine where the other 377/* This is used by get_rangevector to determine where the other
354 * creature is. get_rangevector takes into account map tiling, 378 * creature is. get_rangevector takes into account map tiling,
355 * so you just can not look the the map coordinates and get the 379 * so you just can not look the the map coordinates and get the
… …
462 486
463// iterate over a rectangular area relative to op 487// iterate over a rectangular area relative to op
464// can be used as a single statement, but both iterate macros 488// can be used as a single statement, but both iterate macros
465// invocations must not be followed by a ";" 489// invocations must not be followed by a ";"
466// see common/los.C for usage example 490// see common/los.C for usage example
467#define rectangular_mapspace_iterate_begin(op,dx0,dx1,dy0,dy1) \ 491// the walk will be ordered, outer loop x, inner loop y
492// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
493#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
468 for (int dx = (dx0); dx <= (dx1); dx++) \ 494 for (int dx = (dx0); dx <= (dx1); ++dx) \
469 { \ 495 { \
470 sint16 nx, ny; \ 496 sint16 nx, ny; \
471 maptile *m = 0; \ 497 maptile *m = 0; \
472 \ 498 \
473 for (int dy = (dy0); dy <= (dy1); dy++) \ 499 for (int dy = (dy0); dy <= (dy1); ++dy) \
474 { \ 500 { \
475 /* check to see if we can simply go one down quickly, */ \ 501 /* check to see if we can simply go one down quickly, */ \
476 /* if not, due it the slow way */ \ 502 /* if not, do it the slow way */ \
477 if (!m || ++ny >= m->height) \ 503 if (!m || ++ny >= m->height) \
478 { \ 504 { \
479 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ 505 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
480 \ 506 \
481 if (xy_normalise (m, nx, ny)) \ 507 if (xy_normalise (m, nx, ny)) \
482 m->touch (); \ 508 m->touch (); \
483 else \ 509 else \
484 m = 0; \ 510 m = 0; \
485 } 511 }
486 512
487#define rectangular_mapspace_iterate_end \ 513#define ordered_mapwalk_end \
488 } \ 514 } \
489 } 515 }
516
517// loop over every space in the given maprect,
518// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
519// the iterator code must be a single statement following this macro call, similar to "if"
520#define rect_mapwalk(rect,dx0,dy0) \
521 statementvar (maptile *, m, (rect)->m) \
522 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
523 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
524 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
525 statementvar (int, dy, ny + (rect)->dy - (dy0))
526
527// same as above, but the walk will not follow any particular
528// order (unorded), but is likely faster.
529// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
530#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
531 for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \
532 (op)->x + (dx0) , (op)->y + (dy0) , \
533 (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \
534 r_e_c_t->m; \
535 ++r_e_c_t) \
536 rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
490 537
491#endif 538#endif
492 539

Diff Legend

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