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.101 by root, Tue Dec 23 01:51:28 2008 UTC vs.
Revision 1.139 by root, Wed May 4 07:41:14 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/* Values for in_memory below */ 55// tile map index
53enum { 56enum {
54 MAP_ACTIVE, 57 TILE_NORTH,
55 MAP_INACTIVE, // not used atm. 58 TILE_EAST,
56 MAP_SWAPPED, 59 TILE_SOUTH,
57 MAP_LOADING, 60 TILE_WEST,
58 MAP_SAVING, 61 TILE_UP,
62 TILE_DOWN,
63 TILE_NUM,
64};
65
66/* Values for state below */
67enum {
68 MAP_SWAPPED, // header loaded, nothing else
69 MAP_INACTIVE, // in memory, linkable, but not active
70 MAP_ACTIVE, // running!
59}; 71};
60 72
61/* 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
62 * 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
63 * 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
… …
82/* 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
83 * in the object flags structure. 95 * in the object flags structure.
84 */ 96 */
85#define P_BLOCKSVIEW 0x01 97#define P_BLOCKSVIEW 0x01
86#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 */
87#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 */
88#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,
89 * that means, nothing harmful can be done, 101 * that means, nothing harmful can be done,
90 * such as: bombs, potion usage, alchemy, spells 102 * such as: bombs, potion usage, alchemy, spells
91 * this was introduced to make shops safer 103 * this was introduced to make shops safer
92 * 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 */
93#define P_IS_ALIVE 0x10 /* something alive is on this space */ 107#define P_IS_ALIVE 0x20 /* something alive is on this space */
94#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
95
96#define P_UPTODATE 0x80 /* this space is up to date */ 108#define P_UPTODATE 0x80 // this space is up to date
97 109
98/* 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
99 * 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
100 * 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
101 * 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
102 * lots of duplicate checks currently in the code. 114 * lots of duplicate checks currently in the code.
103 */ 115 */
104#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 116#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
105#define P_NEW_MAP 0x20000 117#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
106 /* Coordinates passed result in a new tiled map */
107 118
108/* Instead of having numerous arrays that have information on a 119/* Instead of having numerous arrays that have information on a
109 * particular space (was map, floor, floor2, map_ob), 120 * particular space (was map, floor, floor2, map_ob),
110 * have this structure take care of that information. 121 * have this structure take care of that information.
111 * This puts it all in one place, and should also make it easier 122 * This puts it all in one place, and should also make it easier
… …
113 */ 124 */
114INTERFACE_CLASS (mapspace) 125INTERFACE_CLASS (mapspace)
115struct mapspace 126struct mapspace
116{ 127{
117 object *ACC (RW, bot); 128 object *ACC (RW, bot);
118 object *ACC (RW, top); /* lowest/highest object on this space */ 129 object *ACC (RW, top); /* lowest/highest object on this space */
119 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 */
120 uint8 flags_; /* flags about this space (see the P_ values above) */ 131 uint8 flags_; /* flags about this space (see the P_ values above) */
121 sint8 ACC (RW, light); /* How much light this space provides */ 132 sint8 ACC (RW, light); /* How much light this space provides */
122 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 133 MoveType ACC (RW, move_block); /* What movement types this space blocks */
123 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 134 MoveType ACC (RW, move_slow); /* What movement types this space slows */
124 MoveType ACC (RW, move_on); /* What movement types are activated */ 135 MoveType ACC (RW, move_on); /* What movement types are activated */
125 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
126 145
127 void update_ (); 146 void update_ ();
128 MTH void update () 147 MTH void update ()
129 { 148 {
130 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))
131 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);
132 } 160 }
133 161
134 MTH uint8 flags () 162 MTH uint8 flags ()
135 { 163 {
136 update (); 164 update ();
… …
153 op = 0; 181 op = 0;
154 182
155 return op; 183 return op;
156 } 184 }
157 185
186 MTH uint32 items()
187 {
188 update ();
189 return items_;
190 }
191
158 // return the item volume on this mapspace in cm³ 192 // return the item volume on this mapspace in cm³
159 MTH uint64 volume () const; 193 MTH uint64 volume ()
194 {
195 update ();
196 return volume_ * 1024;
197 }
160 198
161 bool blocks (MoveType mt) const 199 bool blocks (MoveType mt) const
162 { 200 {
163 return move_block && (mt & move_block) == mt; 201 return move_block && (mt & move_block) == mt;
164 } 202 }
… …
166 bool blocks (object *op) const 204 bool blocks (object *op) const
167 { 205 {
168 return blocks (op->move_type); 206 return blocks (op->move_type);
169 } 207 }
170}; 208};
209
210// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
211struct maprect
212{
213 maptile *m;
214 int x0, y0;
215 int x1, y1;
216 int dx, dy; // offset to go from local coordinates to original tile */
217};
218
219//+GPL
171 220
172struct shopitems : zero_initialised 221struct shopitems : zero_initialised
173{ 222{
174 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 */
175 const char *name_pl; /* plural name */ 224 const char *name_pl; /* plural name */
… …
215 bool ACC (RW, dirty); /* if true, something was inserted or removed */ 264 bool ACC (RW, dirty); /* if true, something was inserted or removed */
216 bool ACC (RW, no_reset); // must not reset this map 265 bool ACC (RW, no_reset); // must not reset this map
217 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by 266 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
218 * players entering/exiting map 267 * players entering/exiting map
219 */ 268 */
269 uint8 ACC (RW, state); /* If not true, the map has been freed and must
270 * be loaded before used. The map,omap and map_ob
271 * arrays will be allocated when the map is loaded */
220 sint32 ACC (RW, timeout); /* swapout is set to this */ 272 sint32 ACC (RW, timeout); /* swapout is set to this */
221 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ 273 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
222 uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
223 * be loaded before used. The map,omap and map_ob
224 * arrays will be allocated when the map is loaded */
225 sint16 players; /* How many players are on this map right now */ 274 sint16 players; /* How many players are on this map right now */
226 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 275 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
227 276
228 bool ACC (RW, per_player); 277 bool ACC (RW, per_player);
229 bool ACC (RW, per_party); 278 bool ACC (RW, per_party);
… …
233 static sint8 outdoor_darkness; /* the global darkness level outside */ 282 static sint8 outdoor_darkness; /* the global darkness level outside */
234 283
235 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 */
236 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 */
237 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 286 oblinkpt *buttons; /* Linked list of linked lists of buttons */
238 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
239 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
240 sint8 ACC (RW, humid); /* humitidy of this tile */
241 sint8 ACC (RW, windspeed); /* windspeed of this tile */
242 sint8 ACC (RW, winddir); /* direction of wind */
243 sint8 ACC (RW, sky); /* sky conditions */
244 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
245 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 */
246 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 288 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
247 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 289 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
248 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 290 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
249 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 291 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
250 shstr ACC (RW, msg); /* Message map creator may have left */ 292 shstr ACC (RW, msg); /* Message map creator may have left */
251 shstr ACC (RW, maplore); /* Map lore information */ 293 shstr ACC (RW, maplore); /* Map lore information */
252 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 294 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
253 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 295 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
254 shstr ACC (RW, path); /* Filename of the map */ 296 shstr ACC (RW, path); /* Filename of the map */
255 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
256 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
257 299
258 MTH sint8 darklevel () const 300//-GPL
301
302 // the maptile:: is neccessary here for the perl interface to work
303 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
259 { 304 {
260 return clamp (outdoor ? darkness + outdoor_darkness : darkness, 0, MAX_DARKNESS); 305 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
261 } 306 }
307
308 static void adjust_daylight ();
262 309
263 MTH void activate (); 310 MTH void activate ();
264 MTH void deactivate (); 311 MTH void deactivate ();
265 312
266 // allocates all (empty) mapspace 313 // allocates all (empty) mapspace
267 MTH void alloc (); 314 MTH void alloc ();
268 // deallocates the mapspaces (and destroys all objects) 315 // deallocates the mapspaces (and destroys all objects)
269 MTH void clear (); 316 MTH void clear ();
270 317
318 MTH void post_load (); // update cached values in mapspaces etc.
271 MTH void fix_auto_apply (); 319 MTH void fix_auto_apply ();
272 MTH void do_decay_objects (); 320 MTH void do_decay_objects ();
273 MTH void update_buttons (); 321 MTH void update_buttons ();
274 MTH int change_map_light (int change); 322 MTH int change_map_light (int change);
275 static void change_all_map_light (int change); //PERL
276 MTH void set_darkness_map ();
277 MTH int estimate_difficulty () const; 323 MTH int estimate_difficulty () const;
278 324
279 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);
280 331
281 // set the given flag on all objects in the map 332 // set the given flag on all objects in the map
282 MTH void set_object_flag (int flag, int value = 1); 333 MTH void set_object_flag (int flag, int value = 1);
283 MTH void post_load_original (); 334 MTH void post_load_original ();
284 335
… …
298 bool _load_objects (object_thawer &thawer); 349 bool _load_objects (object_thawer &thawer);
299 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 350 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
300 351
301 // save objects into the given file (uses IO_ flags) 352 // save objects into the given file (uses IO_ flags)
302 bool _save_objects (object_freezer &freezer, int flags); 353 bool _save_objects (object_freezer &freezer, int flags);
303 MTH bool _save_objects (const char *path, int flags); 354 MTH bool _save_objects (const_octet_string path, int flags);
304 355
305 // save the header pseudo object _only_ 356 // save the header pseudo object _only_
306 bool _save_header (object_freezer &freezer); 357 bool _save_header (object_freezer &freezer);
307 MTH bool _save_header (const char *path); 358 MTH bool _save_header (const_octet_string path);
308 359
309 maptile (); 360 maptile ();
310 maptile (int w, int h); 361 maptile (int w, int h);
362 void init ();
311 ~maptile (); 363 ~maptile ();
312 364
313 void do_destroy (); 365 void do_destroy ();
314 void gather_callbacks (AV *&callbacks, event_type event) const; 366 void gather_callbacks (AV *&callbacks, event_type event) const;
315 367
368 MTH bool linkable () { return state >= MAP_INACTIVE; }
369
316 MTH int size () const { return width * height; } 370 MTH int size () const { return width * height; }
317 371
318 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);
319 373
320 MTH void touch () { last_access = runtime; } 374 MTH void touch () { last_access = runtime; }
321 375
322 MTH bool tile_available (int dir, bool load = true); 376 MTH maptile *tile_available (int dir, bool load = true);
323 377
324 // find the map that is at coordinate x|y relative to this map 378 // find the map that is at coordinate x|y relative to this map
325 // TODO: need a better way than passing by reference 379 // TODO: need a better way than passing by reference
326 // TODO: make perl interface 380 // TODO: make perl interface
327 maptile *xy_find (sint16 &x, sint16 &y); 381 maptile *xy_find (sint16 &x, sint16 &y);
… …
336 { 390 {
337 if (!spaces) 391 if (!spaces)
338 do_load_sync (); 392 do_load_sync ();
339 } 393 }
340 394
341 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);
342 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
343 397
344 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
345 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 399 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
346 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
347 object *pick_random_object (rand_gen &gen = rndm) const; 401 object *pick_random_object (rand_gen &gen = rndm) const;
348 402
349 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]; }
404
405 // return an array of maprects corresponding
406 // to the given rectangular area. the last rect will have
407 // a 0 map pointer.
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;
350}; 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
351 421
352/* This is used by get_rangevector to determine where the other 422/* This is used by get_rangevector to determine where the other
353 * creature is. get_rangevector takes into account map tiling, 423 * creature is. get_rangevector takes into account map tiling,
354 * 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
355 * righte value. distance_x/y are distance away, which 425 * righte value. distance_x/y are distance away, which
… …
372// and so on. 442// and so on.
373int 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);
374int out_of_map (maptile *m, int x, int y); 444int out_of_map (maptile *m, int x, int y);
375maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 445maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
376void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 446void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
377void 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*/);
378int on_same_map (const object *op1, const object *op2); 448int on_same_map (const object *op1, const object *op2);
379int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 449int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
380 450
381// 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
382static inline bool 452static inline bool
383xy_normalise (maptile *&map, sint16 &x, sint16 &y) 453xy_normalise (maptile *&map, sint16 &x, sint16 &y)
384{ 454{
… …
387 (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))
388 || !(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);
389} 459}
390// comaptibility cruft end 460// comaptibility cruft end
391 461
462//-GPL
463
392inline mapspace & 464inline mapspace &
393object::ms () const 465object::ms () const
394{ 466{
395 return map->at (x, y); 467 return map->at (x, y);
396} 468}
… …
457 y = pos.y; 529 y = pos.y;
458 530
459 return pos; 531 return pos;
460} 532}
461 533
534// iterate over a rectangular area relative to op
535// can be used as a single statement, but both iterate macros
536// invocations must not be followed by a ";"
537// see common/los.C for usage example
538// the walk will be ordered, outer loop x, inner loop y
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
541#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
542 for (int dx = (dx0); dx <= (dx1); ++dx) \
543 { \
544 sint16 nx, ny; \
545 maptile *m = 0; \
546 \
547 for (int dy = (dy0); dy <= (dy1); ++dy) \
548 { \
549 /* check to see if we can simply go one down quickly, */ \
550 /* if not, do it the slow way */ \
551 if (!m || ++ny >= m->height) \
552 { \
553 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
554 \
555 if (!xy_normalise (m, nx, ny)) \
556 m = 0; \
557 }
558
559#define ordered_mapwalk_end \
560 } \
561 }
562
563extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
564
565// loop over every space in the given maprect,
566// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
567// the iterator code must be a single statement following this macro call, similar to "if"
568// "continue" will skip to the next space
569#define rect_mapwalk(rect,dx0,dy0) \
570 statementvar (maptile *, m, (rect)->m) \
571 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
572 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
573 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
574 statementvar (int, dy, ny + (rect)->dy - (dy0))
575
576// same as ordered_mapwalk, but the walk will not follow any particular
577// order (unorded), but is likely faster.
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
580#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
581 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
582 (ox) + (dx0) , (oy) + (dy0) , \
583 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
584 r_e_c_t->m; \
585 ++r_e_c_t) \
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)
590
462#endif 591#endif
463 592

Diff Legend

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