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.116 by root, Thu Nov 5 15:57:15 2009 UTC vs.
Revision 1.147 by root, Sun May 8 12:40:41 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
48 * map pointers. 48 * map pointers.
49 */ 49 */
50#define MAGIC_MAP_SIZE 50 50#define MAGIC_MAP_SIZE 50
51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
52 52
53#define MAP_LAYERS 3 53#define MAP_LAYERS 3
54 54
55// tile map index 55// tile map index - toggling the lowest bit reverses direction
56enum { 56enum
57 TILE_UP = 0, 57{
58 TILE_RIGHT = 1, 58 TILE_NORTH,
59 TILE_SOUTH,
60 TILE_EAST ,
61 TILE_WEST,
62 TILE_UP,
59 TILE_DOWN = 2, 63 TILE_DOWN,
60 TILE_LEFT = 3, 64 TILE_NUM
61}; 65};
62 66
67#define REVERSE_TILE_DIR(dir) ((dir) ^ 1)
68
63/* Values for in_memory below */ 69/* Values for state below */
64enum { 70enum
65 MAP_ACTIVE, 71{
66 MAP_INACTIVE, // not used atm. 72 MAP_SWAPPED, // header loaded, nothing else
67 MAP_SWAPPED, 73 MAP_INACTIVE, // in memory, linkable, but not active
68 MAP_LOADING, 74 MAP_ACTIVE, // running!
69 MAP_SAVING,
70}; 75};
71 76
72/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 77/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
73 * really be used, as it is multi tile aware. However, there are some cases 78 * really be used, as it is multi tile aware. However, there are some cases
74 * where it is known the map is not tiled or the values are known 79 * where it is known the map is not tiled or the values are known
… …
88 * should almost always be using out_of_map instead, which takes into account 93 * should almost always be using out_of_map instead, which takes into account
89 * map tiling. 94 * map tiling.
90 */ 95 */
91#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) 96#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
92 97
93/* These are used in the MapLook flags element. They are not used in 98/* These are used in the mapspace flags element. They are not used in
94 * in the object flags structure. 99 * in the object flags structure.
95 */ 100 */
96#define P_BLOCKSVIEW 0x01 101#define P_BLOCKSVIEW 0x01
97#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ 102#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
98#define P_PLAYER 0x04 /* a player (or something seeing these objects) is on this mapspace */ 103#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
99#define P_SAFE 0x08 /* If this is set the map tile is a safe space, 104#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
100 * that means, nothing harmful can be done, 105 * that means, nothing harmful can be done,
101 * such as: bombs, potion usage, alchemy, spells 106 * such as: bombs, potion usage, alchemy, spells
102 * this was introduced to make shops safer 107 * this was introduced to make shops safer
103 * but is useful in other situations */ 108 * but is useful in other situations */
109
110#define P_PLAYER 0x10 /* a player (or something seeing these objects) is on this mapspace */
104#define P_IS_ALIVE 0x10 /* something alive is on this space */ 111#define P_IS_ALIVE 0x20 /* something alive is on this space */
105#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
106
107#define P_UPTODATE 0x80 /* this space is up to date */ 112#define P_UPTODATE 0x80 // this space is up to date
108 113
109/* The following two values are not stored in the MapLook flags, but instead 114/* The following two values are not stored in the MapLook flags, but instead
110 * used in the get_map_flags value - that function is used to return 115 * used in the get_map_flags value - that function is used to return
111 * the flag value, as well as other conditions - using a more general 116 * the flag value, as well as other conditions - using a more general
112 * function that does more of the work can hopefully be used to replace 117 * function that does more of the work can hopefully be used to replace
113 * lots of duplicate checks currently in the code. 118 * lots of duplicate checks currently in the code.
114 */ 119 */
115#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 120#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
116#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ 121#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
117 122
123// persistent flags (pflags) in mapspace
124enum
125{
126 PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace
127};
128
118/* Instead of having numerous arrays that have information on a 129/* Instead of having numerous arrays that have information on a
119 * particular space (was map, floor, floor2, map_ob), 130 * particular space (was map, floor, floor2, map_ob),
120 * have this structure take care of that information. 131 * have this structure take care of that information.
121 * This puts it all in one place, and should also make it easier 132 * This puts it all in one place, and should also make it easier
122 * to extend information about a space. 133 * to extend information about a space.
123 */ 134 */
124INTERFACE_CLASS (mapspace) 135INTERFACE_CLASS (mapspace)
125struct mapspace 136struct mapspace
126{ 137{
127 object *ACC (RW, bot); 138 object *ACC (RW, bot);
128 object *ACC (RW, top); /* lowest/highest object on this space */ 139 object *ACC (RW, top); /* lowest/highest object on this space */
129 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ 140 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
130 uint32_t smell; // the last count a player was seen here, or 0
131 static uint32_t smellcount; // global smell counter
132 uint8 flags_; /* flags about this space (see the P_ values above) */ 141 uint8 flags_; /* flags about this space (see the P_ values above) */
133 sint8 ACC (RW, light); /* How much light this space provides */ 142 sint8 ACC (RW, light); /* How much light this space provides */
134 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 143 MoveType ACC (RW, move_block); /* What movement types this space blocks */
135 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 144 MoveType ACC (RW, move_slow); /* What movement types this space slows */
136 MoveType ACC (RW, move_on); /* What movement types are activated */ 145 MoveType ACC (RW, move_on); /* What movement types are activated */
137 MoveType ACC (RW, move_off); /* What movement types are activated */ 146 MoveType ACC (RW, move_off); /* What movement types are activated */
147 uint16_t ACC (RW, items_); // saturates at 64k
148 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
149 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
150 static uint32_t ACC (RW, smellcount); // global smell counter
151
152 uint8_t pflags; // additional, persistent flags
153 uint8_t pad [3]; // pad to 64 bytes on LP64 systems
138 154
139//-GPL 155//-GPL
140 156
141 void update_ (); 157 void update_ ();
142 MTH void update () 158 MTH void update ()
143 { 159 {
144 if (expect_false (!(flags_ & P_UPTODATE))) 160 // we take advantage of the fact that 0x80 is the sign bit
161 // to generate more efficient code on many cpus
162 assert (sint8 (P_UPTODATE) < 0);
163 assert (sint8 (-1 & ~P_UPTODATE) >= 0);
164
165 if (expect_false (sint8 (flags_) >= 0))
145 update_ (); 166 update_ ();
167
168 // must be true by now (gcc seems content with only the second test)
169 assume (sint8 (flags_) < 0);
170 assume (flags_ & P_UPTODATE);
146 } 171 }
147 172
148 MTH uint8 flags () 173 MTH uint8 flags ()
149 { 174 {
150 update (); 175 update ();
151 return flags_; 176 return flags_;
152 } 177 }
153 178
179 MTH void update_up ();
180
154 MTH void invalidate () 181 MTH void invalidate ()
155 { 182 {
156 flags_ = 0; 183 flags_ = 0;
157 } 184
185 if (pflags)
186 update_up ();
158 187 }
188
159 MTH object *player () 189 MTH object *player ()
160 { 190 {
161 object *op; 191 object *op;
162 192
163 if (flags () & P_PLAYER) 193 if (flags () & P_PLAYER)
… …
167 op = 0; 197 op = 0;
168 198
169 return op; 199 return op;
170 } 200 }
171 201
202 MTH uint32 items()
203 {
204 update ();
205 return items_;
206 }
207
172 // return the item volume on this mapspace in cm³ 208 // return the item volume on this mapspace in cm³
173 MTH uint64 volume () const; 209 MTH uint64 volume ()
210 {
211 update ();
212 return volume_ * 1024;
213 }
174 214
175 bool blocks (MoveType mt) const 215 bool blocks (MoveType mt) const
176 { 216 {
177 return move_block && (mt & move_block) == mt; 217 return move_block && (mt & move_block) == mt;
178 } 218 }
… …
181 { 221 {
182 return blocks (op->move_type); 222 return blocks (op->move_type);
183 } 223 }
184}; 224};
185 225
186// a rectangular area of a map 226// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
187struct maprect 227struct maprect
188{ 228{
189 maptile *m; 229 maptile *m;
190 int x0, y0; 230 int x0, y0;
191 int x1, y1; 231 int x1, y1;
192 int dx, dy; // offset to go from local coordinates to original tile */ 232 int dx, dy; // offset to go from local coordinates to original tile */
193}; 233};
234
235// (refcounted) list of objects on this map that need physics processing
236struct physics_queue
237: unordered_vector<object *>
238{
239 int i; // already processed
240 physics_queue ();
241 ~physics_queue ();
242 object *pop ();
243};
244
245#define PHYSICS_QUEUES 16 // "activity" at least every 16 ticks
194 246
195//+GPL 247//+GPL
196 248
197struct shopitems : zero_initialised 249struct shopitems : zero_initialised
198{ 250{
… …
240 bool ACC (RW, dirty); /* if true, something was inserted or removed */ 292 bool ACC (RW, dirty); /* if true, something was inserted or removed */
241 bool ACC (RW, no_reset); // must not reset this map 293 bool ACC (RW, no_reset); // must not reset this map
242 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by 294 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
243 * players entering/exiting map 295 * players entering/exiting map
244 */ 296 */
297 uint8 ACC (RW, state); /* If not true, the map has been freed and must
298 * be loaded before used. The map,omap and map_ob
299 * arrays will be allocated when the map is loaded */
245 sint32 ACC (RW, timeout); /* swapout is set to this */ 300 sint32 ACC (RW, timeout); /* swapout is set to this */
246 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ 301 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
247 uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
248 * be loaded before used. The map,omap and map_ob
249 * arrays will be allocated when the map is loaded */
250 sint16 players; /* How many players are on this map right now */ 302 sint16 players; /* How many players are on this map right now */
251 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 303 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
252 304
253 bool ACC (RW, per_player); 305 bool ACC (RW, per_player);
254 bool ACC (RW, per_party); 306 bool ACC (RW, per_party);
… …
258 static sint8 outdoor_darkness; /* the global darkness level outside */ 310 static sint8 outdoor_darkness; /* the global darkness level outside */
259 311
260 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 312 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
261 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 313 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
262 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 314 oblinkpt *buttons; /* Linked list of linked lists of buttons */
263 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
264 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
265 sint8 ACC (RW, humid); /* humitidy of this tile */
266 sint8 ACC (RW, windspeed); /* windspeed of this tile */
267 sint8 ACC (RW, winddir); /* direction of wind */
268 sint8 ACC (RW, sky); /* sky conditions */
269 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
270 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 315 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
271 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 316 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
272 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 317 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
273 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 318 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
274 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 319 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
275 shstr ACC (RW, msg); /* Message map creator may have left */ 320 shstr ACC (RW, msg); /* Message map creator may have left */
276 shstr ACC (RW, maplore); /* Map lore information */ 321 shstr ACC (RW, maplore); /* Map lore information */
277 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 322 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
278 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 323 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
279 shstr ACC (RW, path); /* Filename of the map */ 324 shstr ACC (RW, path); /* Filename of the map */
280 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
281 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 325 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
326 int ACC (RW, max_items); // maximum number of items on a mapspace
282 327
283//-GPL 328//-GPL
329
330 physics_queue pq[PHYSICS_QUEUES];
331 MTH void queue_physics (object *ob, int after = 0);
332 MTH void queue_physics_at (int x, int y);
333 MTH int run_physics (tick_t tick, int max_objects);
334 MTH void activate_physics ();
284 335
285 // the maptile:: is neccessary here for the perl interface to work 336 // the maptile:: is neccessary here for the perl interface to work
286 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 337 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
287 { 338 {
288 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 339 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
… …
296 // allocates all (empty) mapspace 347 // allocates all (empty) mapspace
297 MTH void alloc (); 348 MTH void alloc ();
298 // deallocates the mapspaces (and destroys all objects) 349 // deallocates the mapspaces (and destroys all objects)
299 MTH void clear (); 350 MTH void clear ();
300 351
352 MTH void post_load (); // update cached values in mapspaces etc.
301 MTH void fix_auto_apply (); 353 MTH void fix_auto_apply ();
302 MTH void do_decay_objects (); 354 MTH void do_decay_objects ();
303 MTH void update_buttons (); 355 MTH void update_buttons ();
304 MTH int change_map_light (int change); 356 MTH int change_map_light (int change);
305 MTH int estimate_difficulty () const; 357 MTH int estimate_difficulty () const;
306 358
307 MTH void play_sound (faceidx sound, int x, int y) const; 359 MTH void play_sound (faceidx sound, int x, int y) const;
308 MTH void say_msg (const char *msg, int x, int y) const; 360 MTH void say_msg (const_utf8_string msg, int x, int y) const;
309 361
310 // connected links 362 // connected links
311 oblinkpt *find_link (shstr_tmp id); 363 oblinkpt *find_link (shstr_tmp id);
312 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0); 364 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
313 365
… …
331 bool _load_objects (object_thawer &thawer); 383 bool _load_objects (object_thawer &thawer);
332 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 384 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
333 385
334 // save objects into the given file (uses IO_ flags) 386 // save objects into the given file (uses IO_ flags)
335 bool _save_objects (object_freezer &freezer, int flags); 387 bool _save_objects (object_freezer &freezer, int flags);
336 MTH bool _save_objects (const char *path, int flags); 388 MTH bool _save_objects (const_octet_string path, int flags);
337 389
338 // save the header pseudo object _only_ 390 // save the header pseudo object _only_
339 bool _save_header (object_freezer &freezer); 391 bool _save_header (object_freezer &freezer);
340 MTH bool _save_header (const char *path); 392 MTH bool _save_header (const_octet_string path);
341 393
342 maptile (); 394 maptile ();
343 maptile (int w, int h); 395 maptile (int w, int h);
396 void init ();
344 ~maptile (); 397 ~maptile ();
345 398
346 void do_destroy (); 399 void do_destroy ();
347 void gather_callbacks (AV *&callbacks, event_type event) const; 400 void gather_callbacks (AV *&callbacks, event_type event) const;
348 401
402 MTH bool linkable () { return state >= MAP_INACTIVE; }
403
349 MTH int size () const { return width * height; } 404 MTH int size () const { return width * height; }
350 405
351 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 406 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
352 407
353 MTH void touch () { last_access = runtime; } 408 MTH void touch () { last_access = runtime; }
354 409
410 // returns the map at given direction. if the map isn't linked yet,
411 // it will either return false (if load is false), or otherwise try to link
412 // it - if linking fails because the map is not loaded yet, it will
413 // start loading the map and return 0.
414 // thus, if you get 0, the map exists and load is true, then some later
415 // call (some tick or so later...) will eventually succeed.
355 MTH maptile *tile_available (int dir, bool load = true); 416 MTH maptile *tile_available (int dir, bool load = true);
356 417
357 // find the map that is at coordinate x|y relative to this map 418 // find the map that is at coordinate x|y relative to this map
358 // TODO: need a better way than passing by reference 419 // TODO: need a better way than passing by reference
359 // TODO: make perl interface 420 // TODO: make perl interface
… …
369 { 430 {
370 if (!spaces) 431 if (!spaces)
371 do_load_sync (); 432 do_load_sync ();
372 } 433 }
373 434
374 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 435 void make_map_floor (char **layout, const char *floorstyle, random_map_params *RP);
375 bool generate_random_map (random_map_params *RP); 436 bool generate_random_map (random_map_params *RP);
376 437
377 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 438 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
378 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 439 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
379 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 440 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
380 object *pick_random_object (rand_gen &gen = rndm) const; 441 object *pick_random_object (rand_gen &gen = rndm) const;
381 442
382 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 443 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
383 444
384 // return an array of maprects corresponding 445 // return an array of maprects corresponding
385 // to the given rectangular area. the last rect will have 446 // to the given rectangular area. the last rect will have
386 // a 0 map pointer. 447 // a 0 map pointer.
387 // the array will be stored in a static memory area,
388 // so recursion is not atm. supported
389 maprect *split_to_tiles (int x0, int y0, int x1, int y1); 448 maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
449
450 MTH bool is_in_shop (int x, int y) const;
390}; 451};
452
453inline bool
454object::is_in_shop () const
455{
456 return is_on_map ()
457 && map->is_in_shop (x, y);
458}
391 459
392//+GPL 460//+GPL
393 461
394/* This is used by get_rangevector to determine where the other 462/* This is used by get_rangevector to determine where the other
395 * creature is. get_rangevector takes into account map tiling, 463 * creature is. get_rangevector takes into account map tiling,
… …
414// and so on. 482// and so on.
415int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 483int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
416int out_of_map (maptile *m, int x, int y); 484int out_of_map (maptile *m, int x, int y);
417maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 485maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
418void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 486void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
419void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); 487void get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
420int on_same_map (const object *op1, const object *op2); 488int on_same_map (const object *op1, const object *op2);
421int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 489int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
422 490
423// adjust map, x and y for tiled maps and return true if the position is valid at all 491// adjust map, x and y for tiled maps and return true if the position is valid at all
424static inline bool 492static inline bool
425xy_normalise (maptile *&map, sint16 &x, sint16 &y) 493xy_normalise (maptile *&map, sint16 &x, sint16 &y)
426{ 494{
… …
530 598
531#define ordered_mapwalk_end \ 599#define ordered_mapwalk_end \
532 } \ 600 } \
533 } 601 }
534 602
603extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
604
535// loop over every space in the given maprect, 605// loop over every space in the given maprect,
536// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 606// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
537// the iterator code must be a single statement following this macro call, similar to "if" 607// the iterator code must be a single statement following this macro call, similar to "if"
538// "continue" will skip to the next space 608// "continue" will skip to the next space
539#define rect_mapwalk(rect,dx0,dy0) \ 609#define rect_mapwalk(rect,dx0,dy0) \
… …
545 615
546// same as ordered_mapwalk, but the walk will not follow any particular 616// same as ordered_mapwalk, but the walk will not follow any particular
547// order (unorded), but is likely faster. 617// order (unorded), but is likely faster.
548// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op 618// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
549// "continue" will skip to the next space 619// "continue" will skip to the next space
550#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 620#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
551 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 621 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
552 (ox) + (dx0) , (oy) + (dy0) , \ 622 (ox) + (dx0) , (oy) + (dy0) , \
553 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 623 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
554 r_e_c_t->m; \ 624 r_e_c_t->m; \
555 ++r_e_c_t) \ 625 ++r_e_c_t) \
556 rect_mapwalk (r_e_c_t, (ox), (oy)) 626 rect_mapwalk (r_e_c_t, (ox), (oy))
557 627
558#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 628#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
559 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) 629 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
560 630
561#endif 631#endif
562 632

Diff Legend

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