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.104 by root, Fri Dec 26 10:36:42 2008 UTC vs.
Revision 1.128 by root, Sun Feb 7 04:22:33 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
… …
90/* These are used in the MapLook flags element. They are not used in 93/* These are used in the MapLook flags element. They are not used in
91 * in the object flags structure. 94 * in the object flags structure.
92 */ 95 */
93#define P_BLOCKSVIEW 0x01 96#define P_BLOCKSVIEW 0x01
94#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ 97#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 */ 98#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, 99#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
97 * that means, nothing harmful can be done, 100 * that means, nothing harmful can be done,
98 * such as: bombs, potion usage, alchemy, spells 101 * such as: bombs, potion usage, alchemy, spells
99 * this was introduced to make shops safer 102 * this was introduced to make shops safer
100 * but is useful in other situations */ 103 * but is useful in other situations */
104
105#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 */ 106#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 */ 107#define P_UPTODATE 0x80 // this space is up to date
105 108
106/* The following two values are not stored in the MapLook flags, but instead 109/* 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 110 * 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 111 * 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 112 * function that does more of the work can hopefully be used to replace
110 * lots of duplicate checks currently in the code. 113 * lots of duplicate checks currently in the code.
111 */ 114 */
112#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 115#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
113#define P_NEW_MAP 0x20000 116#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
114 /* Coordinates passed result in a new tiled map */
115 117
116/* Instead of having numerous arrays that have information on a 118/* Instead of having numerous arrays that have information on a
117 * particular space (was map, floor, floor2, map_ob), 119 * particular space (was map, floor, floor2, map_ob),
118 * have this structure take care of that information. 120 * have this structure take care of that information.
119 * This puts it all in one place, and should also make it easier 121 * This puts it all in one place, and should also make it easier
… …
121 */ 123 */
122INTERFACE_CLASS (mapspace) 124INTERFACE_CLASS (mapspace)
123struct mapspace 125struct mapspace
124{ 126{
125 object *ACC (RW, bot); 127 object *ACC (RW, bot);
126 object *ACC (RW, top); /* lowest/highest object on this space */ 128 object *ACC (RW, top); /* lowest/highest object on this space */
127 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ 129 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
128 uint8 flags_; /* flags about this space (see the P_ values above) */ 130 uint8 flags_; /* flags about this space (see the P_ values above) */
129 sint8 ACC (RW, light); /* How much light this space provides */ 131 sint8 ACC (RW, light); /* How much light this space provides */
130 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 132 MoveType ACC (RW, move_block); /* What movement types this space blocks */
131 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 133 MoveType ACC (RW, move_slow); /* What movement types this space slows */
132 MoveType ACC (RW, move_on); /* What movement types are activated */ 134 MoveType ACC (RW, move_on); /* What movement types are activated */
133 MoveType ACC (RW, move_off); /* What movement types are activated */ 135 MoveType ACC (RW, move_off); /* What movement types are activated */
136 uint16_t ACC (RW, items_); // saturates at 64k
137 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
138 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
139 static uint32_t ACC (RW, smellcount); // global smell counter
140
141 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
142
143//-GPL
134 144
135 void update_ (); 145 void update_ ();
136 MTH void update () 146 MTH void update ()
137 { 147 {
138 if (!(flags_ & P_UPTODATE)) 148 // we take advantage of the fact that 0x80 is the sign bit
149 // to generate more efficient code on many cpus
150 assert (sint8 (P_UPTODATE) < 0);
151 assert (sint8 (-1 & ~P_UPTODATE) >= 0);
152
153 if (expect_false (sint8 (flags_) >= 0))
139 update_ (); 154 update_ ();
155
156 // must be true by now (gcc seems content with only the second test)
157 assume (sint8 (flags_) < 0);
158 assume (flags_ & P_UPTODATE);
140 } 159 }
141 160
142 MTH uint8 flags () 161 MTH uint8 flags ()
143 { 162 {
144 update (); 163 update ();
… …
161 op = 0; 180 op = 0;
162 181
163 return op; 182 return op;
164 } 183 }
165 184
185 MTH uint32 items()
186 {
187 update ();
188 return items_;
189 }
190
166 // return the item volume on this mapspace in cm³ 191 // return the item volume on this mapspace in cm³
167 MTH uint64 volume () const; 192 MTH uint64 volume ()
193 {
194 update ();
195 return volume_ * 1024;
196 }
168 197
169 bool blocks (MoveType mt) const 198 bool blocks (MoveType mt) const
170 { 199 {
171 return move_block && (mt & move_block) == mt; 200 return move_block && (mt & move_block) == mt;
172 } 201 }
… …
175 { 204 {
176 return blocks (op->move_type); 205 return blocks (op->move_type);
177 } 206 }
178}; 207};
179 208
180// a rectangular area of a map 209// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
181struct maprect 210struct maprect
182{ 211{
183 maptile *m; 212 maptile *m;
184 int x0, y0; 213 int x0, y0;
185 int x1, y1; 214 int x1, y1;
186 int dx, dy; // offset to go from local coordinates to original tile */ 215 int dx, dy; // offset to go from local coordinates to original tile */
187}; 216};
217
218//+GPL
188 219
189struct shopitems : zero_initialised 220struct shopitems : zero_initialised
190{ 221{
191 const char *name; /* name of the item in question, null if it is the default item */ 222 const char *name; /* name of the item in question, null if it is the default item */
192 const char *name_pl; /* plural name */ 223 const char *name_pl; /* plural name */
… …
250 static sint8 outdoor_darkness; /* the global darkness level outside */ 281 static sint8 outdoor_darkness; /* the global darkness level outside */
251 282
252 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 283 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
253 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 284 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
254 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 285 oblinkpt *buttons; /* Linked list of linked lists of buttons */
255 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
256 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
257 sint8 ACC (RW, humid); /* humitidy of this tile */
258 sint8 ACC (RW, windspeed); /* windspeed of this tile */
259 sint8 ACC (RW, winddir); /* direction of wind */
260 sint8 ACC (RW, sky); /* sky conditions */
261 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
262 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 286 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
263 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 287 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
264 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 288 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
265 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 289 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
266 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 290 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
267 shstr ACC (RW, msg); /* Message map creator may have left */ 291 shstr ACC (RW, msg); /* Message map creator may have left */
268 shstr ACC (RW, maplore); /* Map lore information */ 292 shstr ACC (RW, maplore); /* Map lore information */
269 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 293 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
270 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 294 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
271 shstr ACC (RW, path); /* Filename of the map */ 295 shstr ACC (RW, path); /* Filename of the map */
272 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
273 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 296 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
297 int ACC (RW, max_items); // maximum number of items on a mapspace
298
299//-GPL
274 300
275 // the maptile:: is neccessary here for the perl interface to work 301 // the maptile:: is neccessary here for the perl interface to work
276 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 302 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
277 { 303 {
278 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 304 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
… …
286 // allocates all (empty) mapspace 312 // allocates all (empty) mapspace
287 MTH void alloc (); 313 MTH void alloc ();
288 // deallocates the mapspaces (and destroys all objects) 314 // deallocates the mapspaces (and destroys all objects)
289 MTH void clear (); 315 MTH void clear ();
290 316
317 MTH void post_load (); // update cached values in mapspaces etc.
291 MTH void fix_auto_apply (); 318 MTH void fix_auto_apply ();
292 MTH void do_decay_objects (); 319 MTH void do_decay_objects ();
293 MTH void update_buttons (); 320 MTH void update_buttons ();
294 MTH int change_map_light (int change); 321 MTH int change_map_light (int change);
295 MTH int estimate_difficulty () const; 322 MTH int estimate_difficulty () const;
296 323
297 MTH void play_sound (faceidx sound, int x, int y) const; 324 MTH void play_sound (faceidx sound, int x, int y) const;
325 MTH void say_msg (const_utf8_string msg, int x, int y) const;
326
327 // connected links
328 oblinkpt *find_link (shstr_tmp id);
329 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
298 330
299 // set the given flag on all objects in the map 331 // set the given flag on all objects in the map
300 MTH void set_object_flag (int flag, int value = 1); 332 MTH void set_object_flag (int flag, int value = 1);
301 MTH void post_load_original (); 333 MTH void post_load_original ();
302 334
… …
316 bool _load_objects (object_thawer &thawer); 348 bool _load_objects (object_thawer &thawer);
317 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 349 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
318 350
319 // save objects into the given file (uses IO_ flags) 351 // save objects into the given file (uses IO_ flags)
320 bool _save_objects (object_freezer &freezer, int flags); 352 bool _save_objects (object_freezer &freezer, int flags);
321 MTH bool _save_objects (const char *path, int flags); 353 MTH bool _save_objects (const_octet_string path, int flags);
322 354
323 // save the header pseudo object _only_ 355 // save the header pseudo object _only_
324 bool _save_header (object_freezer &freezer); 356 bool _save_header (object_freezer &freezer);
325 MTH bool _save_header (const char *path); 357 MTH bool _save_header (const_octet_string path);
326 358
327 maptile (); 359 maptile ();
328 maptile (int w, int h); 360 maptile (int w, int h);
329 ~maptile (); 361 ~maptile ();
330 362
… …
357 } 389 }
358 390
359 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 391 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
360 bool generate_random_map (random_map_params *RP); 392 bool generate_random_map (random_map_params *RP);
361 393
362 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 394 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
363 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 395 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
364 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 396 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
365 object *pick_random_object (rand_gen &gen = rndm) const; 397 object *pick_random_object (rand_gen &gen = rndm) const;
366 398
367 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 399 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
368 400
369 // return an array of maprects corresponding 401 // return an array of maprects corresponding
370 // to the given rectangular area. the last rect will have 402 // to the given rectangular area. the last rect will have
371 // a 0 map pointer. 403 // 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); 404 maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
375}; 405};
406
407//+GPL
376 408
377/* This is used by get_rangevector to determine where the other 409/* This is used by get_rangevector to determine where the other
378 * creature is. get_rangevector takes into account map tiling, 410 * creature is. get_rangevector takes into account map tiling,
379 * so you just can not look the the map coordinates and get the 411 * so you just can not look the the map coordinates and get the
380 * righte value. distance_x/y are distance away, which 412 * righte value. distance_x/y are distance away, which
… …
397// and so on. 429// and so on.
398int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 430int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
399int out_of_map (maptile *m, int x, int y); 431int out_of_map (maptile *m, int x, int y);
400maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 432maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
401void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 433void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
402void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 434void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
403int on_same_map (const object *op1, const object *op2); 435int on_same_map (const object *op1, const object *op2);
404int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 436int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
405 437
406// adjust map, x and y for tiled maps and return true if the position is valid at all 438// adjust map, x and y for tiled maps and return true if the position is valid at all
407static inline bool 439static inline bool
… …
412 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height)) 444 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
413 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP); 445 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
414} 446}
415// comaptibility cruft end 447// comaptibility cruft end
416 448
449//-GPL
450
417inline mapspace & 451inline mapspace &
418object::ms () const 452object::ms () const
419{ 453{
420 return map->at (x, y); 454 return map->at (x, y);
421} 455}
… …
488// can be used as a single statement, but both iterate macros 522// can be used as a single statement, but both iterate macros
489// invocations must not be followed by a ";" 523// invocations must not be followed by a ";"
490// see common/los.C for usage example 524// see common/los.C for usage example
491// the walk will be ordered, outer loop x, inner loop y 525// 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 526// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
527// "continue" will skip to the next space
493#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \ 528#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
494 for (int dx = (dx0); dx <= (dx1); ++dx) \ 529 for (int dx = (dx0); dx <= (dx1); ++dx) \
495 { \ 530 { \
496 sint16 nx, ny; \ 531 sint16 nx, ny; \
497 maptile *m = 0; \ 532 maptile *m = 0; \
… …
502 /* if not, do it the slow way */ \ 537 /* if not, do it the slow way */ \
503 if (!m || ++ny >= m->height) \ 538 if (!m || ++ny >= m->height) \
504 { \ 539 { \
505 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ 540 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
506 \ 541 \
507 if (xy_normalise (m, nx, ny)) \ 542 if (!xy_normalise (m, nx, ny)) \
508 m->touch (); \
509 else \
510 m = 0; \ 543 m = 0; \
511 } 544 }
512 545
513#define ordered_mapwalk_end \ 546#define ordered_mapwalk_end \
514 } \ 547 } \
515 } 548 }
516 549
550extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
551
517// loop over every space in the given maprect, 552// 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 553// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
519// the iterator code must be a single statement following this macro call, similar to "if" 554// the iterator code must be a single statement following this macro call, similar to "if"
555// "continue" will skip to the next space
520#define rect_mapwalk(rect,dx0,dy0) \ 556#define rect_mapwalk(rect,dx0,dy0) \
521 statementvar (maptile *, m, (rect)->m) \ 557 statementvar (maptile *, m, (rect)->m) \
522 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \ 558 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
523 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \ 559 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
524 statementvar (int, dx, nx + (rect)->dx - (dx0)) \ 560 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
525 statementvar (int, dy, ny + (rect)->dy - (dy0)) 561 statementvar (int, dy, ny + (rect)->dy - (dy0))
526 562
527// same as above, but the walk will not follow any particular 563// same as ordered_mapwalk, but the walk will not follow any particular
528// order (unorded), but is likely faster. 564// 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 565// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
566// "continue" will skip to the next space
530#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 567#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
531 for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \ 568 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
532 (op)->x + (dx0) , (op)->y + (dy0) , \ 569 (ox) + (dx0) , (oy) + (dy0) , \
533 (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \ 570 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
534 r_e_c_t->m; \ 571 r_e_c_t->m; \
535 ++r_e_c_t) \ 572 ++r_e_c_t) \
536 rect_mapwalk (r_e_c_t, (op)->x, (op)->y) 573 rect_mapwalk (r_e_c_t, (ox), (oy))
574
575#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
576 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
537 577
538#endif 578#endif
539 579

Diff Legend

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