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.98 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.105 by root, Sat Dec 27 02:31:19 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
… …
116struct mapspace 122struct mapspace
117{ 123{
118 object *ACC (RW, bot); 124 object *ACC (RW, bot);
119 object *ACC (RW, top); /* lowest/highest object on this space */ 125 object *ACC (RW, top); /* lowest/highest object on this space */
120 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 tick_t smell; // the last ptick a player was seen here, or 0
121 uint8 flags_; /* flags about this space (see the P_ values above) */ 128 uint8 flags_; /* flags about this space (see the P_ values above) */
122 sint8 ACC (RW, light); /* How much light this space provides */ 129 sint8 ACC (RW, light); /* How much light this space provides */
123 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 130 MoveType ACC (RW, move_block); /* What movement types this space blocks */
124 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 131 MoveType ACC (RW, move_slow); /* What movement types this space slows */
125 MoveType ACC (RW, move_on); /* What movement types are activated */ 132 MoveType ACC (RW, move_on); /* What movement types are activated */
… …
135 MTH uint8 flags () 142 MTH uint8 flags ()
136 { 143 {
137 update (); 144 update ();
138 return flags_; 145 return flags_;
139 } 146 }
147
148 MTH void invalidate ()
149 {
150 flags_ = 0;
151 }
140 152
141 MTH object *player () 153 MTH object *player ()
142 { 154 {
143 object *op; 155 object *op;
144 156
… …
161 173
162 bool blocks (object *op) const 174 bool blocks (object *op) const
163 { 175 {
164 return blocks (op->move_type); 176 return blocks (op->move_type);
165 } 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 */
166}; 187};
167 188
168struct shopitems : zero_initialised 189struct shopitems : zero_initialised
169{ 190{
170 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 */
… …
223 244
224 bool ACC (RW, per_player); 245 bool ACC (RW, per_player);
225 bool ACC (RW, per_party); 246 bool ACC (RW, per_party);
226 bool ACC (RW, outdoor); /* True if an outdoor map */ 247 bool ACC (RW, outdoor); /* True if an outdoor map */
227 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */ 248 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
228 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 249 sint8 ACC (RW, darkness); /* indicates level of darkness of map */
250 static sint8 outdoor_darkness; /* the global darkness level outside */
229 251
230 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 252 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
231 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 253 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
232 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 254 oblinkpt *buttons; /* Linked list of linked lists of buttons */
233 sint16 ACC (RW, temp); /* base temperature of this tile (F) */ 255 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
… …
248 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 270 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
249 shstr ACC (RW, path); /* Filename of the map */ 271 shstr ACC (RW, path); /* Filename of the map */
250 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace 272 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
251 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 273 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
252 274
275 // the maptile:: is neccessary here for the perl interface to work
276 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
277 {
278 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
279 }
280
281 static void adjust_daylight ();
282
253 MTH void activate (); 283 MTH void activate ();
254 MTH void deactivate (); 284 MTH void deactivate ();
255 285
256 // allocates all (empty) mapspace 286 // allocates all (empty) mapspace
257 MTH void alloc (); 287 MTH void alloc ();
… …
260 290
261 MTH void fix_auto_apply (); 291 MTH void fix_auto_apply ();
262 MTH void do_decay_objects (); 292 MTH void do_decay_objects ();
263 MTH void update_buttons (); 293 MTH void update_buttons ();
264 MTH int change_map_light (int change); 294 MTH int change_map_light (int change);
265 static void change_all_map_light (int change); //PERL
266 MTH void set_darkness_map ();
267 MTH int estimate_difficulty () const; 295 MTH int estimate_difficulty () const;
268 296
269 MTH void play_sound (faceidx sound, int x, int y) const; 297 MTH void play_sound (faceidx sound, int x, int y) const;
270 298
271 // set the given flag on all objects in the map 299 // set the given flag on all objects in the map
… …
307 335
308 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);
309 337
310 MTH void touch () { last_access = runtime; } 338 MTH void touch () { last_access = runtime; }
311 339
312 MTH bool tile_available (int dir, bool load = true); 340 MTH maptile *tile_available (int dir, bool load = true);
313 341
314 // 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
315 // TODO: need a better way than passing by reference 343 // TODO: need a better way than passing by reference
316 // TODO: make perl interface 344 // TODO: make perl interface
317 maptile *xy_find (sint16 &x, sint16 &y); 345 maptile *xy_find (sint16 &x, sint16 &y);
… …
334 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 362 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
335 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 363 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
336 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
337 object *pick_random_object (rand_gen &gen = rndm) const; 365 object *pick_random_object (rand_gen &gen = rndm) const;
338 366
339 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 367 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
340 mapspace &at (uint32 x, uint32 y) { 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);
341}; 375};
342 376
343/* This is used by get_rangevector to determine where the other 377/* This is used by get_rangevector to determine where the other
344 * creature is. get_rangevector takes into account map tiling, 378 * creature is. get_rangevector takes into account map tiling,
345 * 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
… …
448 y = pos.y; 482 y = pos.y;
449 483
450 return pos; 484 return pos;
451} 485}
452 486
487// iterate over a rectangular area relative to op
488// can be used as a single statement, but both iterate macros
489// invocations must not be followed by a ";"
490// see common/los.C for usage example
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) \
494 for (int dx = (dx0); dx <= (dx1); ++dx) \
495 { \
496 sint16 nx, ny; \
497 maptile *m = 0; \
498 \
499 for (int dy = (dy0); dy <= (dy1); ++dy) \
500 { \
501 /* check to see if we can simply go one down quickly, */ \
502 /* if not, do it the slow way */ \
503 if (!m || ++ny >= m->height) \
504 { \
505 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
506 \
507 if (xy_normalise (m, nx, ny)) \
508 m->touch (); \
509 else \
510 m = 0; \
511 }
512
513#define ordered_mapwalk_end \
514 } \
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)
537
453#endif 538#endif
454 539

Diff Legend

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