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.77 by root, Thu Jun 7 19:12:22 2007 UTC vs.
Revision 1.116 by root, Thu Nov 5 15:57:15 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 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 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* 25/*
26 * The maptile is allocated each time a new map is opened. 26 * The maptile is allocated each time a new map is opened.
27 * It contains pointers (very indirectly) to all objects on the map. 27 * It contains pointers (very indirectly) to all objects on the map.
30#ifndef MAP_H 30#ifndef MAP_H
31#define MAP_H 31#define MAP_H
32 32
33#include <tr1/unordered_map> 33#include <tr1/unordered_map>
34 34
35//+GPL
36
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
38 * tiled maps. There is no requirement that this matches the 41 * tiled maps. There is no requirement that this matches the
39 * tiled maps size - it just seemed like a reasonable value. 42 * tiled maps size - it just seemed like a reasonable value.
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/* Values for in_memory below. Should probably be an enumerations */ 55// tile map index
53enum { 56enum {
54 MAP_IN_MEMORY, 57 TILE_UP = 0,
58 TILE_RIGHT = 1,
59 TILE_DOWN = 2,
60 TILE_LEFT = 3,
61};
62
63/* Values for in_memory below */
64enum {
65 MAP_ACTIVE,
66 MAP_INACTIVE, // not used atm.
55 MAP_SWAPPED, 67 MAP_SWAPPED,
56 MAP_LOADING, 68 MAP_LOADING,
57 MAP_SAVING, 69 MAP_SAVING,
58}; 70};
59 71
62 * where it is known the map is not tiled or the values are known 74 * where it is known the map is not tiled or the values are known
63 * consistent (eg, op->map, op->x, op->y) 75 * consistent (eg, op->map, op->x, op->y)
64 */ 76 */
65// all those macros are herewith declared legacy 77// all those macros are herewith declared legacy
66#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags () 78#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()
67#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
68#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot 79#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot
69#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top 80#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
70#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L] 81#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
71#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block 82#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
72#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow 83#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
99 * 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
100 * 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
101 * 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
102 * lots of duplicate checks currently in the code. 113 * lots of duplicate checks currently in the code.
103 */ 114 */
104#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 */
105#define P_NEW_MAP 0x20000 116#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
106 /* Coordinates passed result in a new tiled map */
107
108/* P_NO_PASS is used for ob_blocked() return value. It needs
109 * to be here to make sure the bits don't match with anything.
110 */
111#define P_NO_PASS 0x80000
112 117
113/* Instead of having numerous arrays that have information on a 118/* Instead of having numerous arrays that have information on a
114 * particular space (was map, floor, floor2, map_ob), 119 * particular space (was map, floor, floor2, map_ob),
115 * have this structure take care of that information. 120 * have this structure take care of that information.
116 * 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
117 * to extend information about a space. 122 * to extend information about a space.
118 */ 123 */
124INTERFACE_CLASS (mapspace)
119struct mapspace 125struct mapspace
120{ 126{
127 object *ACC (RW, bot);
121 object *bot, *top; /* lowest/highest object on this space */ 128 object *ACC (RW, top); /* lowest/highest object on this space */
122 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 129 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
123 uint8 flags_; /* flags about this space (see the P_ values above) */ 132 uint8 flags_; /* flags about this space (see the P_ values above) */
124 sint8 light; /* How much light this space provides */ 133 sint8 ACC (RW, light); /* How much light this space provides */
125 MoveType move_block; /* What movement types this space blocks */ 134 MoveType ACC (RW, move_block); /* What movement types this space blocks */
126 MoveType move_slow; /* What movement types this space slows */ 135 MoveType ACC (RW, move_slow); /* What movement types this space slows */
127 MoveType move_on; /* What movement types are activated */ 136 MoveType ACC (RW, move_on); /* What movement types are activated */
128 MoveType move_off; /* What movement types are activated */ 137 MoveType ACC (RW, move_off); /* What movement types are activated */
138
139//-GPL
129 140
130 void update_ (); 141 void update_ ();
131 void update () 142 MTH void update ()
132 { 143 {
133 if (!(flags_ & P_UPTODATE)) 144 if (expect_false (!(flags_ & P_UPTODATE)))
134 update_ (); 145 update_ ();
135 } 146 }
136 147
137 uint8 flags () 148 MTH uint8 flags ()
138 { 149 {
139 update (); 150 update ();
140 return flags_; 151 return flags_;
141 } 152 }
153
154 MTH void invalidate ()
155 {
156 flags_ = 0;
157 }
142 158
143 // maybe only inline quick flags_ checking?
144 object *player () 159 MTH object *player ()
145 { 160 {
146 // search from the top, because players are usually on top 161 object *op;
147 // make usually == always and this non-amortized O(1) 162
148 // could gte rid of P_PLAYER, too, then
149 if (flags () & P_PLAYER) 163 if (flags () & P_PLAYER)
150 for (object *op = top; op; op = op->below) 164 for (op = top; op->type != PLAYER; op = op->below)
151 if (op->type == PLAYER) 165 ;
152 return op; 166 else
167 op = 0;
153 168
154 return 0; 169 return op;
155 } 170 }
156 171
157 // return the item volume on this mapspace in cm³ 172 // return the item volume on this mapspace in cm³
158 uint64 volume () const; 173 MTH uint64 volume () const;
174
175 bool blocks (MoveType mt) const
176 {
177 return move_block && (mt & move_block) == mt;
178 }
179
180 bool blocks (object *op) const
181 {
182 return blocks (op->move_type);
183 }
159}; 184};
185
186// a rectangular area of a map
187struct maprect
188{
189 maptile *m;
190 int x0, y0;
191 int x1, y1;
192 int dx, dy; // offset to go from local coordinates to original tile */
193};
194
195//+GPL
160 196
161struct shopitems : zero_initialised 197struct shopitems : zero_initialised
162{ 198{
163 const char *name; /* name of the item in question, null if it is the default item */ 199 const char *name; /* name of the item in question, null if it is the default item */
164 const char *name_pl; /* plural name */ 200 const char *name_pl; /* plural name */
187struct maptile : zero_initialised, attachable 223struct maptile : zero_initialised, attachable
188{ 224{
189 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ 225 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
190 struct mapspace *spaces; /* Array of spaces on this map */ 226 struct mapspace *spaces; /* Array of spaces on this map */
191 uint8 *regions; /* region index per mapspace, if != 0 */ 227 uint8 *regions; /* region index per mapspace, if != 0 */
192 struct region **regionmap; /* index to region */ 228 region_ptr *regionmap; /* index to region */
193 229
194 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 230 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
195 231
196 shstr ACC (RW, name); /* Name of map as given by its creator */ 232 shstr ACC (RW, name); /* Name of map as given by its creator */
197 struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by 233 region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
198 * points to the struct containing all the properties of 234 * points to the struct containing all the properties of
199 * the region */ 235 * the region */
200 double ACC (RW, reset_time); 236 double ACC (RW, reset_time);
201 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map 237 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
202 * should be reset 238 * should be reset
212 * be loaded before used. The map,omap and map_ob 248 * be loaded before used. The map,omap and map_ob
213 * arrays will be allocated when the map is loaded */ 249 * arrays will be allocated when the map is loaded */
214 sint16 players; /* How many players are on this map right now */ 250 sint16 players; /* How many players are on this map right now */
215 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 251 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216 252
217 bool ACC (RW, active); // wether this map is active or not
218 bool ACC (RW, per_player); 253 bool ACC (RW, per_player);
219 bool ACC (RW, per_party); 254 bool ACC (RW, per_party);
220 bool ACC (RW, outdoor); /* True if an outdoor map */ 255 bool ACC (RW, outdoor); /* True if an outdoor map */
221 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 256 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
222 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 257 sint8 ACC (RW, darkness); /* indicates level of darkness of map */
258 static sint8 outdoor_darkness; /* the global darkness level outside */
223 259
224 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 260 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
225 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 261 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
226 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 262 oblinkpt *buttons; /* Linked list of linked lists of buttons */
227 sint16 ACC (RW, temp); /* base temperature of this tile (F) */ 263 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
242 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 278 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
243 shstr ACC (RW, path); /* Filename of the map */ 279 shstr ACC (RW, path); /* Filename of the map */
244 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace 280 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
245 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 281 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
246 282
283//-GPL
284
285 // the maptile:: is neccessary here for the perl interface to work
286 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
287 {
288 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
289 }
290
291 static void adjust_daylight ();
292
247 MTH void activate (); 293 MTH void activate ();
248 MTH void deactivate (); 294 MTH void deactivate ();
249 295
250 // allocates all (empty) mapspace 296 // allocates all (empty) mapspace
251 MTH void alloc (); 297 MTH void alloc ();
254 300
255 MTH void fix_auto_apply (); 301 MTH void fix_auto_apply ();
256 MTH void do_decay_objects (); 302 MTH void do_decay_objects ();
257 MTH void update_buttons (); 303 MTH void update_buttons ();
258 MTH int change_map_light (int change); 304 MTH int change_map_light (int change);
259 static void change_all_map_light (int change); //PERL
260 MTH void set_darkness_map ();
261 MTH int estimate_difficulty () const; 305 MTH int estimate_difficulty () const;
306
307 MTH void play_sound (faceidx sound, int x, int y) const;
308 MTH void say_msg (const char *msg, int x, int y) const;
309
310 // connected links
311 oblinkpt *find_link (shstr_tmp id);
312 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
262 313
263 // set the given flag on all objects in the map 314 // set the given flag on all objects in the map
264 MTH void set_object_flag (int flag, int value = 1); 315 MTH void set_object_flag (int flag, int value = 1);
316 MTH void post_load_original ();
265 317
266 MTH void link_multipart_objects (); 318 MTH void link_multipart_objects ();
267 MTH void clear_unique_items (); 319 MTH void clear_unique_items ();
268 320
269 MTH void clear_header (); 321 MTH void clear_header ();
270 MTH void clear_links_to (maptile *m); 322 MTH void clear_links_to (maptile *m);
271 323
272 MTH struct region *region (int x, int y) const; 324 MTH struct region *region (int x, int y) const;
273 325
274 // loas the header pseudo-object 326 // load the header pseudo-object
275 bool _load_header (object_thawer &thawer); 327 bool _load_header (object_thawer &thawer);
276 MTH bool _load_header (const char *path); 328 MTH bool _load_header (object_thawer *thawer) { return _load_header (*thawer); }
277 329
278 // load objects into the map 330 // load objects into the map
279 bool _load_objects (object_thawer &thawer); 331 bool _load_objects (object_thawer &thawer);
280 MTH bool _load_objects (const char *path, bool skip_header = true); 332 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
281 333
282 // save objects into the given file (uses IO_ flags) 334 // save objects into the given file (uses IO_ flags)
283 bool _save_objects (object_freezer &freezer, int flags); 335 bool _save_objects (object_freezer &freezer, int flags);
284 MTH bool _save_objects (const char *path, int flags); 336 MTH bool _save_objects (const char *path, int flags);
285 337
297 MTH int size () const { return width * height; } 349 MTH int size () const { return width * height; }
298 350
299 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 351 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
300 352
301 MTH void touch () { last_access = runtime; } 353 MTH void touch () { last_access = runtime; }
354
355 MTH maptile *tile_available (int dir, bool load = true);
302 356
303 // find the map that is at coordinate x|y relative to this map 357 // find the map that is at coordinate x|y relative to this map
304 // TODO: need a better way than passing by reference 358 // TODO: need a better way than passing by reference
305 // TODO: make perl interface 359 // TODO: make perl interface
306 maptile *xy_find (sint16 &x, sint16 &y); 360 maptile *xy_find (sint16 &x, sint16 &y);
318 } 372 }
319 373
320 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 374 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
321 bool generate_random_map (random_map_params *RP); 375 bool generate_random_map (random_map_params *RP);
322 376
323 static maptile *find_async (const char *path, maptile *original = 0);//PERL 377 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
324 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 378 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
325 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 379 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
326 MTH object *pick_random_object () const; 380 object *pick_random_object (rand_gen &gen = rndm) const;
327 381
328 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 382 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
329 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 383
384 // return an array of maprects corresponding
385 // to the given rectangular area. the last rect will have
386 // 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);
330}; 390};
391
392//+GPL
331 393
332/* This is used by get_rangevector to determine where the other 394/* This is used by get_rangevector to determine where the other
333 * creature is. get_rangevector takes into account map tiling, 395 * creature is. get_rangevector takes into account map tiling,
334 * so you just can not look the the map coordinates and get the 396 * so you just can not look the the map coordinates and get the
335 * righte value. distance_x/y are distance away, which 397 * righte value. distance_x/y are distance away, which
345 int distance_y; 407 int distance_y;
346 int direction; 408 int direction;
347 object *part; 409 object *part;
348}; 410};
349 411
412// comaptibility cruft start
350//TODO: these should be refactored into things like xy_normalise 413//TODO: these should be refactored into things like xy_normalise
351// and so on. 414// and so on.
352int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 415int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
353int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
354int out_of_map (maptile *m, int x, int y); 416int out_of_map (maptile *m, int x, int y);
355maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 417maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
356void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 418void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
357void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const 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*/);
358int on_same_map (const object *op1, const object *op2); 420int on_same_map (const object *op1, const object *op2);
359int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 421int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
360 422
361// adjust map, x and y for tiled maps and return true if the position is valid at all 423// adjust map, x and y for tiled maps and return true if the position is valid at all
362inline bool 424static inline bool
363xy_normalise (maptile *&map, sint16 &x, sint16 &y) 425xy_normalise (maptile *&map, sint16 &x, sint16 &y)
364{ 426{
365 // when in range, do a quick return, otherwise go the slow route 427 // when in range, do a quick return, otherwise go the slow route
366 return 428 return
367 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height)) 429 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
368 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP); 430 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
369} 431}
432// comaptibility cruft end
433
434//-GPL
370 435
371inline mapspace & 436inline mapspace &
372object::ms () const 437object::ms () const
373{ 438{
374 return map->at (x, y); 439 return map->at (x, y);
375} 440}
376 441
442struct mapxy {
443 maptile *m;
444 sint16 x, y;
445
446 mapxy (maptile *m, sint16 x, sint16 y)
447 : m(m), x(x), y(y)
448 { }
449
450 mapxy (object *op)
451 : m(op->map), x(op->x), y(op->y)
452 { }
453
454 mapxy &move (int dx, int dy)
455 {
456 x += dx;
457 y += dy;
458
459 return *this;
460 }
461
462 mapxy &move (int dir)
463 {
464 return move (freearr_x [dir], freearr_y [dir]);
465 }
466
467 operator void *() const { return (void *)m; }
468 mapxy &operator =(const object *op)
469 {
470 m = op->map;
471 x = op->x;
472 y = op->y;
473
474 return *this;
475 }
476
477 mapspace *operator ->() const { return &m->at (x, y); }
478 mapspace &operator * () const { return m->at (x, y); }
479
480 bool normalise ()
481 {
482 return xy_normalise (m, x, y);
483 }
484
485 mapspace &ms () const
486 {
487 return m->at (x, y);
488 }
489
490 object *insert (object *op, object *originator = 0, int flags = 0) const
491 {
492 return m->insert (op, x, y, originator, flags);
493 }
494};
495
496inline const mapxy &
497object::operator =(const mapxy &pos)
498{
499 map = pos.m;
500 x = pos.x;
501 y = pos.y;
502
503 return pos;
504}
505
506// iterate over a rectangular area relative to op
507// can be used as a single statement, but both iterate macros
508// invocations must not be followed by a ";"
509// see common/los.C for usage example
510// the walk will be ordered, outer loop x, inner loop y
511// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
512// "continue" will skip to the next space
513#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
514 for (int dx = (dx0); dx <= (dx1); ++dx) \
515 { \
516 sint16 nx, ny; \
517 maptile *m = 0; \
518 \
519 for (int dy = (dy0); dy <= (dy1); ++dy) \
520 { \
521 /* check to see if we can simply go one down quickly, */ \
522 /* if not, do it the slow way */ \
523 if (!m || ++ny >= m->height) \
524 { \
525 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
526 \
527 if (!xy_normalise (m, nx, ny)) \
528 m = 0; \
529 }
530
531#define ordered_mapwalk_end \
532 } \
533 }
534
535// 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
537// the iterator code must be a single statement following this macro call, similar to "if"
538// "continue" will skip to the next space
539#define rect_mapwalk(rect,dx0,dy0) \
540 statementvar (maptile *, m, (rect)->m) \
541 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
542 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
543 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
544 statementvar (int, dy, ny + (rect)->dy - (dy0))
545
546// same as ordered_mapwalk, but the walk will not follow any particular
547// 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
549// "continue" will skip to the next space
550#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \
551 for (maprect *r_e_c_t = (map)->split_to_tiles ( \
552 (ox) + (dx0) , (oy) + (dy0) , \
553 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
554 r_e_c_t->m; \
555 ++r_e_c_t) \
556 rect_mapwalk (r_e_c_t, (ox), (oy))
557
558#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
559 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1)
560
377#endif 561#endif
378 562

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines