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.105 by root, Sat Dec 27 02:31:19 2008 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
… …
28 29
29#ifndef MAP_H 30#ifndef MAP_H
30#define MAP_H 31#define MAP_H
31 32
32#include <tr1/unordered_map> 33#include <tr1/unordered_map>
34
35//+GPL
33 36
34#include "region.h" 37#include "region.h"
35#include "cfperl.h" 38#include "cfperl.h"
36 39
37/* We set this size - this is to make magic map work properly on 40/* We set this size - this is to make magic map work properly on
… …
45 * map pointers. 48 * map pointers.
46 */ 49 */
47#define MAGIC_MAP_SIZE 50 50#define MAGIC_MAP_SIZE 50
48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49 52
50#define MAP_LAYERS 3 53#define MAP_LAYERS 3
51 54
52// tile map index 55// tile map index
53enum { 56enum
54 TILE_UP = 0, 57{
55 TILE_RIGHT = 1, 58 TILE_NORTH,
59 TILE_EAST,
60 TILE_SOUTH,
61 TILE_WEST,
62 TILE_UP,
56 TILE_DOWN = 2, 63 TILE_DOWN,
57 TILE_LEFT = 3, 64 TILE_NUM,
58}; 65};
59 66
60/* Values for in_memory below */ 67/* Values for state below */
61enum { 68enum
62 MAP_ACTIVE, 69{
63 MAP_INACTIVE, // not used atm. 70 MAP_SWAPPED, // header loaded, nothing else
64 MAP_SWAPPED, 71 MAP_INACTIVE, // in memory, linkable, but not active
65 MAP_LOADING, 72 MAP_ACTIVE, // running!
66 MAP_SAVING,
67}; 73};
68 74
69/* 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
70 * 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
71 * 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
… …
85 * 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
86 * map tiling. 92 * map tiling.
87 */ 93 */
88#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)))
89 95
90/* 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
91 * in the object flags structure. 97 * in the object flags structure.
92 */ 98 */
93#define P_BLOCKSVIEW 0x01 99#define P_BLOCKSVIEW 0x01
94#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 */
95#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 */
96#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,
97 * that means, nothing harmful can be done, 103 * that means, nothing harmful can be done,
98 * such as: bombs, potion usage, alchemy, spells 104 * such as: bombs, potion usage, alchemy, spells
99 * this was introduced to make shops safer 105 * this was introduced to make shops safer
100 * 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 */
101#define P_IS_ALIVE 0x10 /* something alive is on this space */ 109#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 */ 110#define P_UPTODATE 0x80 // this space is up to date
105 111
106/* 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
107 * 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
108 * 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
109 * 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
110 * lots of duplicate checks currently in the code. 116 * lots of duplicate checks currently in the code.
111 */ 117 */
112#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 */
113#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 */
114 120
121// persistent flags (pflags) in mapspace
122enum
123{
124 PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace
125};
126
115/* Instead of having numerous arrays that have information on a 127/* Instead of having numerous arrays that have information on a
116 * particular space (was map, floor, floor2, map_ob), 128 * particular space (was map, floor, floor2, map_ob),
117 * have this structure take care of that information. 129 * have this structure take care of that information.
118 * 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
119 * to extend information about a space. 131 * to extend information about a space.
120 */ 132 */
121INTERFACE_CLASS (mapspace) 133INTERFACE_CLASS (mapspace)
122struct mapspace 134struct mapspace
123{ 135{
124 object *ACC (RW, bot); 136 object *ACC (RW, bot);
125 object *ACC (RW, top); /* lowest/highest object on this space */ 137 object *ACC (RW, top); /* lowest/highest object on this space */
126 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 */
127 tick_t smell; // the last ptick a player was seen here, or 0
128 uint8 flags_; /* flags about this space (see the P_ values above) */ 139 uint8 flags_; /* flags about this space (see the P_ values above) */
129 sint8 ACC (RW, light); /* How much light this space provides */ 140 sint8 ACC (RW, light); /* How much light this space provides */
130 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 141 MoveType ACC (RW, move_block); /* What movement types this space blocks */
131 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 142 MoveType ACC (RW, move_slow); /* What movement types this space slows */
132 MoveType ACC (RW, move_on); /* What movement types are activated */ 143 MoveType ACC (RW, move_on); /* What movement types are activated */
133 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
134 154
135 void update_ (); 155 void update_ ();
136 MTH void update () 156 MTH void update ()
137 { 157 {
138 if (!(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))
139 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);
140 } 169 }
141 170
142 MTH uint8 flags () 171 MTH uint8 flags ()
143 { 172 {
144 update (); 173 update ();
… …
161 op = 0; 190 op = 0;
162 191
163 return op; 192 return op;
164 } 193 }
165 194
195 MTH uint32 items()
196 {
197 update ();
198 return items_;
199 }
200
166 // return the item volume on this mapspace in cm³ 201 // return the item volume on this mapspace in cm³
167 MTH uint64 volume () const; 202 MTH uint64 volume ()
203 {
204 update ();
205 return volume_ * 1024;
206 }
168 207
169 bool blocks (MoveType mt) const 208 bool blocks (MoveType mt) const
170 { 209 {
171 return move_block && (mt & move_block) == mt; 210 return move_block && (mt & move_block) == mt;
172 } 211 }
… …
175 { 214 {
176 return blocks (op->move_type); 215 return blocks (op->move_type);
177 } 216 }
178}; 217};
179 218
180// a rectangular area of a map 219// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
181struct maprect 220struct maprect
182{ 221{
183 maptile *m; 222 maptile *m;
184 int x0, y0; 223 int x0, y0;
185 int x1, y1; 224 int x1, y1;
186 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 */
187}; 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
188 241
189struct shopitems : zero_initialised 242struct shopitems : zero_initialised
190{ 243{
191 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 */
192 const char *name_pl; /* plural name */ 245 const char *name_pl; /* plural name */
… …
232 bool ACC (RW, dirty); /* if true, something was inserted or removed */ 285 bool ACC (RW, dirty); /* if true, something was inserted or removed */
233 bool ACC (RW, no_reset); // must not reset this map 286 bool ACC (RW, no_reset); // must not reset this map
234 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
235 * players entering/exiting map 288 * players entering/exiting map
236 */ 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 */
237 sint32 ACC (RW, timeout); /* swapout is set to this */ 293 sint32 ACC (RW, timeout); /* swapout is set to this */
238 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 */
239 uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
240 * be loaded before used. The map,omap and map_ob
241 * arrays will be allocated when the map is loaded */
242 sint16 players; /* How many players are on this map right now */ 295 sint16 players; /* How many players are on this map right now */
243 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 */
244 297
245 bool ACC (RW, per_player); 298 bool ACC (RW, per_player);
246 bool ACC (RW, per_party); 299 bool ACC (RW, per_party);
… …
250 static sint8 outdoor_darkness; /* the global darkness level outside */ 303 static sint8 outdoor_darkness; /* the global darkness level outside */
251 304
252 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 */
253 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 */
254 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 307 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 */ 308 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 */ 309 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
264 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 310 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
265 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 311 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
266 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 312 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
267 shstr ACC (RW, msg); /* Message map creator may have left */ 313 shstr ACC (RW, msg); /* Message map creator may have left */
268 shstr ACC (RW, maplore); /* Map lore information */ 314 shstr ACC (RW, maplore); /* Map lore information */
269 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 315 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
270 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 316 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
271 shstr ACC (RW, path); /* Filename of the map */ 317 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 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);
274 328
275 // the maptile:: is neccessary here for the perl interface to work 329 // the maptile:: is neccessary here for the perl interface to work
276 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 330 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
277 { 331 {
278 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 332 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
279 } 333 }
280 334
281 static void adjust_daylight (); 335 static void adjust_daylight ();
282 336
283 MTH void activate (); 337 MTH void activate ();
338 MTH void activate_physics ();
284 MTH void deactivate (); 339 MTH void deactivate ();
285 340
286 // allocates all (empty) mapspace 341 // allocates all (empty) mapspace
287 MTH void alloc (); 342 MTH void alloc ();
288 // deallocates the mapspaces (and destroys all objects) 343 // deallocates the mapspaces (and destroys all objects)
289 MTH void clear (); 344 MTH void clear ();
290 345
346 MTH void post_load (); // update cached values in mapspaces etc.
291 MTH void fix_auto_apply (); 347 MTH void fix_auto_apply ();
292 MTH void do_decay_objects (); 348 MTH void do_decay_objects ();
293 MTH void update_buttons (); 349 MTH void update_buttons ();
294 MTH int change_map_light (int change); 350 MTH int change_map_light (int change);
295 MTH int estimate_difficulty () const; 351 MTH int estimate_difficulty () const;
296 352
297 MTH void play_sound (faceidx sound, int x, int y) const; 353 MTH void play_sound (faceidx sound, int x, int y) const;
354 MTH void say_msg (const_utf8_string msg, int x, int y) const;
355
356 // connected links
357 oblinkpt *find_link (shstr_tmp id);
358 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
298 359
299 // set the given flag on all objects in the map 360 // set the given flag on all objects in the map
300 MTH void set_object_flag (int flag, int value = 1); 361 MTH void set_object_flag (int flag, int value = 1);
301 MTH void post_load_original (); 362 MTH void post_load_original ();
302 363
… …
316 bool _load_objects (object_thawer &thawer); 377 bool _load_objects (object_thawer &thawer);
317 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 378 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
318 379
319 // save objects into the given file (uses IO_ flags) 380 // save objects into the given file (uses IO_ flags)
320 bool _save_objects (object_freezer &freezer, int flags); 381 bool _save_objects (object_freezer &freezer, int flags);
321 MTH bool _save_objects (const char *path, int flags); 382 MTH bool _save_objects (const_octet_string path, int flags);
322 383
323 // save the header pseudo object _only_ 384 // save the header pseudo object _only_
324 bool _save_header (object_freezer &freezer); 385 bool _save_header (object_freezer &freezer);
325 MTH bool _save_header (const char *path); 386 MTH bool _save_header (const_octet_string path);
326 387
327 maptile (); 388 maptile ();
328 maptile (int w, int h); 389 maptile (int w, int h);
390 void init ();
329 ~maptile (); 391 ~maptile ();
330 392
331 void do_destroy (); 393 void do_destroy ();
332 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; }
333 397
334 MTH int size () const { return width * height; } 398 MTH int size () const { return width * height; }
335 399
336 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);
337 401
… …
354 { 418 {
355 if (!spaces) 419 if (!spaces)
356 do_load_sync (); 420 do_load_sync ();
357 } 421 }
358 422
359 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);
360 bool generate_random_map (random_map_params *RP); 424 bool generate_random_map (random_map_params *RP);
361 425
362 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
363 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 427 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 428 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; 429 object *pick_random_object (rand_gen &gen = rndm) const;
366 430
367 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]; }
368 432
369 // return an array of maprects corresponding 433 // return an array of maprects corresponding
370 // to the given rectangular area. the last rect will have 434 // to the given rectangular area. the last rect will have
371 // a 0 map pointer. 435 // 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); 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;
375}; 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
376 449
377/* This is used by get_rangevector to determine where the other 450/* This is used by get_rangevector to determine where the other
378 * creature is. get_rangevector takes into account map tiling, 451 * creature is. get_rangevector takes into account map tiling,
379 * 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
380 * righte value. distance_x/y are distance away, which 453 * righte value. distance_x/y are distance away, which
… …
397// and so on. 470// and so on.
398int 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);
399int out_of_map (maptile *m, int x, int y); 472int out_of_map (maptile *m, int x, int y);
400maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 473maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
401void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 474void 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); 475void get_rangevector_from_mapcoord (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); 476int on_same_map (const object *op1, const object *op2);
404int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 477int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
405 478
406// 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
407static inline bool 480static inline bool
408xy_normalise (maptile *&map, sint16 &x, sint16 &y) 481xy_normalise (maptile *&map, sint16 &x, sint16 &y)
409{ 482{
… …
412 (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))
413 || !(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);
414} 487}
415// comaptibility cruft end 488// comaptibility cruft end
416 489
490//-GPL
491
417inline mapspace & 492inline mapspace &
418object::ms () const 493object::ms () const
419{ 494{
420 return map->at (x, y); 495 return map->at (x, y);
421} 496}
… …
488// can be used as a single statement, but both iterate macros 563// can be used as a single statement, but both iterate macros
489// invocations must not be followed by a ";" 564// invocations must not be followed by a ";"
490// see common/los.C for usage example 565// see common/los.C for usage example
491// the walk will be ordered, outer loop x, inner loop y 566// 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 567// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
568// "continue" will skip to the next space
493#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \ 569#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
494 for (int dx = (dx0); dx <= (dx1); ++dx) \ 570 for (int dx = (dx0); dx <= (dx1); ++dx) \
495 { \ 571 { \
496 sint16 nx, ny; \ 572 sint16 nx, ny; \
497 maptile *m = 0; \ 573 maptile *m = 0; \
… …
502 /* if not, do it the slow way */ \ 578 /* if not, do it the slow way */ \
503 if (!m || ++ny >= m->height) \ 579 if (!m || ++ny >= m->height) \
504 { \ 580 { \
505 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ 581 nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
506 \ 582 \
507 if (xy_normalise (m, nx, ny)) \ 583 if (!xy_normalise (m, nx, ny)) \
508 m->touch (); \
509 else \
510 m = 0; \ 584 m = 0; \
511 } 585 }
512 586
513#define ordered_mapwalk_end \ 587#define ordered_mapwalk_end \
514 } \ 588 } \
515 } 589 }
516 590
591extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
592
517// loop over every space in the given maprect, 593// 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 594// 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" 595// the iterator code must be a single statement following this macro call, similar to "if"
596// "continue" will skip to the next space
520#define rect_mapwalk(rect,dx0,dy0) \ 597#define rect_mapwalk(rect,dx0,dy0) \
521 statementvar (maptile *, m, (rect)->m) \ 598 statementvar (maptile *, m, (rect)->m) \
522 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \ 599 for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
523 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \ 600 for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
524 statementvar (int, dx, nx + (rect)->dx - (dx0)) \ 601 statementvar (int, dx, nx + (rect)->dx - (dx0)) \
525 statementvar (int, dy, ny + (rect)->dy - (dy0)) 602 statementvar (int, dy, ny + (rect)->dy - (dy0))
526 603
527// same as above, but the walk will not follow any particular 604// same as ordered_mapwalk, but the walk will not follow any particular
528// order (unorded), but is likely faster. 605// 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 606// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
607// "continue" will skip to the next space
530#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 608#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
531 for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \ 609 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
532 (op)->x + (dx0) , (op)->y + (dy0) , \ 610 (ox) + (dx0) , (oy) + (dy0) , \
533 (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \ 611 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
534 r_e_c_t->m; \ 612 r_e_c_t->m; \
535 ++r_e_c_t) \ 613 ++r_e_c_t) \
536 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)
537 618
538#endif 619#endif
539 620

Diff Legend

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