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.114 by root, Mon Oct 12 14:00:58 2009 UTC vs.
Revision 1.144 by root, Sat May 7 17:12:28 2011 UTC

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

Diff Legend

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