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.107 by root, Sat Dec 27 08:41:44 2008 UTC vs.
Revision 1.138 by root, Wed May 4 07:36:40 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
… …
28 29
29#ifndef MAP_H 30#ifndef MAP_H
30#define MAP_H 31#define MAP_H
31 32
32#include <tr1/unordered_map> 33#include <tr1/unordered_map>
34
35//+GPL
33 36
34#include "region.h" 37#include "region.h"
35#include "cfperl.h" 38#include "cfperl.h"
36 39
37/* We set this size - this is to make magic map work properly on 40/* We set this size - this is to make magic map work properly on
… …
45 * map pointers. 48 * map pointers.
46 */ 49 */
47#define MAGIC_MAP_SIZE 50 50#define MAGIC_MAP_SIZE 50
48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49 52
50#define MAP_LAYERS 3 53#define MAP_LAYERS 3
51 54
52// tile map index 55// tile map index
53enum { 56enum {
54 TILE_UP = 0, 57 TILE_NORTH,
55 TILE_RIGHT = 1, 58 TILE_EAST,
59 TILE_SOUTH,
60 TILE_WEST,
61 TILE_UP,
56 TILE_DOWN = 2, 62 TILE_DOWN,
57 TILE_LEFT = 3, 63 TILE_NUM,
58}; 64};
59 65
60/* Values for in_memory below */ 66/* Values for in_memory below */
61enum { 67enum {
62 MAP_ACTIVE, 68 MAP_SWAPPED, // header loaded, nothing else
63 MAP_INACTIVE, // not used atm. 69 MAP_INACTIVE, // in memory, linkable, but not active
64 MAP_SWAPPED, 70 MAP_ACTIVE, // running!
65 MAP_LOADING,
66 MAP_SAVING,
67}; 71};
68 72
69/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 73/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
70 * really be used, as it is multi tile aware. However, there are some cases 74 * really be used, as it is multi tile aware. However, there are some cases
71 * where it is known the map is not tiled or the values are known 75 * where it is known the map is not tiled or the values are known
… …
90/* These are used in the MapLook flags element. They are not used in 94/* These are used in the MapLook flags element. They are not used in
91 * in the object flags structure. 95 * in the object flags structure.
92 */ 96 */
93#define P_BLOCKSVIEW 0x01 97#define P_BLOCKSVIEW 0x01
94#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ 98#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
95#define P_PLAYER 0x04 /* a player (or something seeing these objects) is on this mapspace */ 99#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
96#define P_SAFE 0x08 /* If this is set the map tile is a safe space, 100#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
97 * that means, nothing harmful can be done, 101 * that means, nothing harmful can be done,
98 * such as: bombs, potion usage, alchemy, spells 102 * such as: bombs, potion usage, alchemy, spells
99 * this was introduced to make shops safer 103 * this was introduced to make shops safer
100 * but is useful in other situations */ 104 * but is useful in other situations */
105
106#define P_PLAYER 0x10 /* a player (or something seeing these objects) is on this mapspace */
101#define P_IS_ALIVE 0x10 /* something alive is on this space */ 107#define P_IS_ALIVE 0x20 /* something alive is on this space */
102#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
103
104#define P_UPTODATE 0x80 /* this space is up to date */ 108#define P_UPTODATE 0x80 // this space is up to date
105 109
106/* The following two values are not stored in the MapLook flags, but instead 110/* The following two values are not stored in the MapLook flags, but instead
107 * used in the get_map_flags value - that function is used to return 111 * used in the get_map_flags value - that function is used to return
108 * the flag value, as well as other conditions - using a more general 112 * the flag value, as well as other conditions - using a more general
109 * function that does more of the work can hopefully be used to replace 113 * function that does more of the work can hopefully be used to replace
… …
120 */ 124 */
121INTERFACE_CLASS (mapspace) 125INTERFACE_CLASS (mapspace)
122struct mapspace 126struct mapspace
123{ 127{
124 object *ACC (RW, bot); 128 object *ACC (RW, bot);
125 object *ACC (RW, top); /* lowest/highest object on this space */ 129 object *ACC (RW, top); /* lowest/highest object on this space */
126 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ 130 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
129 uint8 flags_; /* flags about this space (see the P_ values above) */ 131 uint8 flags_; /* flags about this space (see the P_ values above) */
130 sint8 ACC (RW, light); /* How much light this space provides */ 132 sint8 ACC (RW, light); /* How much light this space provides */
131 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 133 MoveType ACC (RW, move_block); /* What movement types this space blocks */
132 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 134 MoveType ACC (RW, move_slow); /* What movement types this space slows */
133 MoveType ACC (RW, move_on); /* What movement types are activated */ 135 MoveType ACC (RW, move_on); /* What movement types are activated */
134 MoveType ACC (RW, move_off); /* What movement types are activated */ 136 MoveType ACC (RW, move_off); /* What movement types are activated */
137 uint16_t ACC (RW, items_); // saturates at 64k
138 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
139 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
140 static uint32_t ACC (RW, smellcount); // global smell counter
141
142 uint32_t pad1_; // pad to 64 bytes on 64 bit systems
143
144//-GPL
135 145
136 void update_ (); 146 void update_ ();
137 MTH void update () 147 MTH void update ()
138 { 148 {
139 if (!(flags_ & P_UPTODATE)) 149 // we take advantage of the fact that 0x80 is the sign bit
150 // to generate more efficient code on many cpus
151 assert (sint8 (P_UPTODATE) < 0);
152 assert (sint8 (-1 & ~P_UPTODATE) >= 0);
153
154 if (expect_false (sint8 (flags_) >= 0))
140 update_ (); 155 update_ ();
156
157 // must be true by now (gcc seems content with only the second test)
158 assume (sint8 (flags_) < 0);
159 assume (flags_ & P_UPTODATE);
141 } 160 }
142 161
143 MTH uint8 flags () 162 MTH uint8 flags ()
144 { 163 {
145 update (); 164 update ();
… …
162 op = 0; 181 op = 0;
163 182
164 return op; 183 return op;
165 } 184 }
166 185
186 MTH uint32 items()
187 {
188 update ();
189 return items_;
190 }
191
167 // return the item volume on this mapspace in cm³ 192 // return the item volume on this mapspace in cm³
168 MTH uint64 volume () const; 193 MTH uint64 volume ()
194 {
195 update ();
196 return volume_ * 1024;
197 }
169 198
170 bool blocks (MoveType mt) const 199 bool blocks (MoveType mt) const
171 { 200 {
172 return move_block && (mt & move_block) == mt; 201 return move_block && (mt & move_block) == mt;
173 } 202 }
… …
176 { 205 {
177 return blocks (op->move_type); 206 return blocks (op->move_type);
178 } 207 }
179}; 208};
180 209
181// a rectangular area of a map 210// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
182struct maprect 211struct maprect
183{ 212{
184 maptile *m; 213 maptile *m;
185 int x0, y0; 214 int x0, y0;
186 int x1, y1; 215 int x1, y1;
187 int dx, dy; // offset to go from local coordinates to original tile */ 216 int dx, dy; // offset to go from local coordinates to original tile */
188}; 217};
218
219//+GPL
189 220
190struct shopitems : zero_initialised 221struct shopitems : zero_initialised
191{ 222{
192 const char *name; /* name of the item in question, null if it is the default item */ 223 const char *name; /* name of the item in question, null if it is the default item */
193 const char *name_pl; /* plural name */ 224 const char *name_pl; /* plural name */
… …
251 static sint8 outdoor_darkness; /* the global darkness level outside */ 282 static sint8 outdoor_darkness; /* the global darkness level outside */
252 283
253 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 284 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
254 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 285 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
255 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 286 oblinkpt *buttons; /* Linked list of linked lists of buttons */
256 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
257 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
258 sint8 ACC (RW, humid); /* humitidy of this tile */
259 sint8 ACC (RW, windspeed); /* windspeed of this tile */
260 sint8 ACC (RW, winddir); /* direction of wind */
261 sint8 ACC (RW, sky); /* sky conditions */
262 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
263 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 287 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
264 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 288 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
265 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 289 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
266 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 290 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
267 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 291 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
268 shstr ACC (RW, msg); /* Message map creator may have left */ 292 shstr ACC (RW, msg); /* Message map creator may have left */
269 shstr ACC (RW, maplore); /* Map lore information */ 293 shstr ACC (RW, maplore); /* Map lore information */
270 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 294 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
271 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 295 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
272 shstr ACC (RW, path); /* Filename of the map */ 296 shstr ACC (RW, path); /* Filename of the map */
273 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
274 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 297 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
298 int ACC (RW, max_items); // maximum number of items on a mapspace
299
300//-GPL
275 301
276 // the maptile:: is neccessary here for the perl interface to work 302 // the maptile:: is neccessary here for the perl interface to work
277 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 303 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
278 { 304 {
279 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 305 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
… …
287 // allocates all (empty) mapspace 313 // allocates all (empty) mapspace
288 MTH void alloc (); 314 MTH void alloc ();
289 // deallocates the mapspaces (and destroys all objects) 315 // deallocates the mapspaces (and destroys all objects)
290 MTH void clear (); 316 MTH void clear ();
291 317
318 MTH void post_load (); // update cached values in mapspaces etc.
292 MTH void fix_auto_apply (); 319 MTH void fix_auto_apply ();
293 MTH void do_decay_objects (); 320 MTH void do_decay_objects ();
294 MTH void update_buttons (); 321 MTH void update_buttons ();
295 MTH int change_map_light (int change); 322 MTH int change_map_light (int change);
296 MTH int estimate_difficulty () const; 323 MTH int estimate_difficulty () const;
297 324
298 MTH void play_sound (faceidx sound, int x, int y) const; 325 MTH void play_sound (faceidx sound, int x, int y) const;
326 MTH void say_msg (const_utf8_string msg, int x, int y) const;
327
328 // connected links
329 oblinkpt *find_link (shstr_tmp id);
330 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
299 331
300 // set the given flag on all objects in the map 332 // set the given flag on all objects in the map
301 MTH void set_object_flag (int flag, int value = 1); 333 MTH void set_object_flag (int flag, int value = 1);
302 MTH void post_load_original (); 334 MTH void post_load_original ();
303 335
… …
317 bool _load_objects (object_thawer &thawer); 349 bool _load_objects (object_thawer &thawer);
318 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 350 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
319 351
320 // save objects into the given file (uses IO_ flags) 352 // save objects into the given file (uses IO_ flags)
321 bool _save_objects (object_freezer &freezer, int flags); 353 bool _save_objects (object_freezer &freezer, int flags);
322 MTH bool _save_objects (const char *path, int flags); 354 MTH bool _save_objects (const_octet_string path, int flags);
323 355
324 // save the header pseudo object _only_ 356 // save the header pseudo object _only_
325 bool _save_header (object_freezer &freezer); 357 bool _save_header (object_freezer &freezer);
326 MTH bool _save_header (const char *path); 358 MTH bool _save_header (const_octet_string path);
327 359
328 maptile (); 360 maptile ();
329 maptile (int w, int h); 361 maptile (int w, int h);
362 void init ();
330 ~maptile (); 363 ~maptile ();
331 364
332 void do_destroy (); 365 void do_destroy ();
333 void gather_callbacks (AV *&callbacks, event_type event) const; 366 void gather_callbacks (AV *&callbacks, event_type event) const;
367
368 MTH bool linkable () { return in_memory >= MAP_INACTIVE; }
334 369
335 MTH int size () const { return width * height; } 370 MTH int size () const { return width * height; }
336 371
337 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 372 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
338 373
… …
355 { 390 {
356 if (!spaces) 391 if (!spaces)
357 do_load_sync (); 392 do_load_sync ();
358 } 393 }
359 394
360 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 395 void make_map_floor (char **layout, const char *floorstyle, random_map_params *RP);
361 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
362 397
363 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 398 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
364 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 399 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
365 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 400 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
366 object *pick_random_object (rand_gen &gen = rndm) const; 401 object *pick_random_object (rand_gen &gen = rndm) const;
367 402
368 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 403 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
369 404
370 // return an array of maprects corresponding 405 // return an array of maprects corresponding
371 // to the given rectangular area. the last rect will have 406 // to the given rectangular area. the last rect will have
372 // a 0 map pointer. 407 // 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); 408 maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
409
410 MTH bool is_in_shop (int x, int y) const;
376}; 411};
412
413inline bool
414object::is_in_shop () const
415{
416 return is_on_map ()
417 && map->is_in_shop (x, y);
418}
419
420//+GPL
377 421
378/* This is used by get_rangevector to determine where the other 422/* This is used by get_rangevector to determine where the other
379 * creature is. get_rangevector takes into account map tiling, 423 * creature is. get_rangevector takes into account map tiling,
380 * so you just can not look the the map coordinates and get the 424 * so you just can not look the the map coordinates and get the
381 * righte value. distance_x/y are distance away, which 425 * righte value. distance_x/y are distance away, which
… …
398// and so on. 442// and so on.
399int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 443int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
400int out_of_map (maptile *m, int x, int y); 444int out_of_map (maptile *m, int x, int y);
401maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 445maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
402void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 446void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
403void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 447void get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
404int on_same_map (const object *op1, const object *op2); 448int on_same_map (const object *op1, const object *op2);
405int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 449int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
406 450
407// adjust map, x and y for tiled maps and return true if the position is valid at all 451// adjust map, x and y for tiled maps and return true if the position is valid at all
408static inline bool 452static inline bool
409xy_normalise (maptile *&map, sint16 &x, sint16 &y) 453xy_normalise (maptile *&map, sint16 &x, sint16 &y)
410{ 454{
… …
413 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height)) 457 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
414 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP); 458 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
415} 459}
416// comaptibility cruft end 460// comaptibility cruft end
417 461
462//-GPL
463
418inline mapspace & 464inline mapspace &
419object::ms () const 465object::ms () const
420{ 466{
421 return map->at (x, y); 467 return map->at (x, y);
422} 468}
… …
489// can be used as a single statement, but both iterate macros 535// can be used as a single statement, but both iterate macros
490// invocations must not be followed by a ";" 536// invocations must not be followed by a ";"
491// see common/los.C for usage example 537// see common/los.C for usage example
492// the walk will be ordered, outer loop x, inner loop y 538// 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 539// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
540// "continue" will skip to the next space
494#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \ 541#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
495 for (int dx = (dx0); dx <= (dx1); ++dx) \ 542 for (int dx = (dx0); dx <= (dx1); ++dx) \
496 { \ 543 { \
497 sint16 nx, ny; \ 544 sint16 nx, ny; \
498 maptile *m = 0; \ 545 maptile *m = 0; \
… …
511 558
512#define ordered_mapwalk_end \ 559#define ordered_mapwalk_end \
513 } \ 560 } \
514 } 561 }
515 562
563extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
564
516// loop over every space in the given maprect, 565// 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 566// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
518// the iterator code must be a single statement following this macro call, similar to "if" 567// the iterator code must be a single statement following this macro call, similar to "if"
568// "continue" will skip to the next space
519#define rect_mapwalk(rect,dx0,dy0) \ 569#define rect_mapwalk(rect,dx0,dy0) \
520 statementvar (maptile *, m, (rect)->m) \ 570 statementvar (maptile *, m, (rect)->m) \
521 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \ 571 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
522 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \ 572 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
523 statementvar (int, dx, nx + (rect)->dx - (dx0)) \ 573 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
524 statementvar (int, dy, ny + (rect)->dy - (dy0)) 574 statementvar (int, dy, ny + (rect)->dy - (dy0))
525 575
526// same as above, but the walk will not follow any particular 576// same as ordered_mapwalk, but the walk will not follow any particular
527// order (unorded), but is likely faster. 577// 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 578// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
579// "continue" will skip to the next space
529#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 580#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
530 for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \ 581 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
531 (op)->x + (dx0) , (op)->y + (dy0) , \ 582 (ox) + (dx0) , (oy) + (dy0) , \
532 (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \ 583 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
533 r_e_c_t->m; \ 584 r_e_c_t->m; \
534 ++r_e_c_t) \ 585 ++r_e_c_t) \
535 rect_mapwalk (r_e_c_t, (op)->x, (op)->y) 586 rect_mapwalk (r_e_c_t, (ox), (oy))
587
588#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
589 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
536 590
537#endif 591#endif
538 592

Diff Legend

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