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.87 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.135 by root, Fri Apr 22 06:10:33 2011 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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,2009,2010 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 * Crossfire TRT 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 <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* 25/*
25 * The maptile is allocated each time a new map is opened. 26 * The maptile is allocated each time a new map is opened.
26 * It contains pointers (very indirectly) to all objects on the map. 27 * It contains pointers (very indirectly) to all objects on the map.
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. Should probably be an enumerations */ 55// tile map index
53enum { 56enum {
54 MAP_IN_MEMORY, 57 TILE_NORTH,
58 TILE_EAST,
59 TILE_SOUTH,
60 TILE_WEST,
61 TILE_UP,
62 TILE_DOWN,
63 TILE_NUM,
64};
65
66/* Values for in_memory below */
67enum {
68 MAP_ACTIVE,
69 MAP_INACTIVE, // not used atm.
55 MAP_SWAPPED, 70 MAP_SWAPPED,
56 MAP_LOADING, 71 MAP_LOADING,
57 MAP_SAVING, 72 MAP_SAVING,
58}; 73};
59 74
62 * 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
63 * consistent (eg, op->map, op->x, op->y) 78 * consistent (eg, op->map, op->x, op->y)
64 */ 79 */
65// all those macros are herewith declared legacy 80// all those macros are herewith declared legacy
66#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags () 81#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 82#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 83#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] 84#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 85#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 86#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
82/* These are used in the MapLook flags element. They are not used in 96/* These are used in the MapLook flags element. They are not used in
83 * in the object flags structure. 97 * in the object flags structure.
84 */ 98 */
85#define P_BLOCKSVIEW 0x01 99#define P_BLOCKSVIEW 0x01
86#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 */
87#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 */
88#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,
89 * that means, nothing harmful can be done, 103 * that means, nothing harmful can be done,
90 * such as: bombs, potion usage, alchemy, spells 104 * such as: bombs, potion usage, alchemy, spells
91 * this was introduced to make shops safer 105 * this was introduced to make shops safer
92 * 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 */
93#define P_IS_ALIVE 0x10 /* something alive is on this space */ 109#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 */ 110#define P_UPTODATE 0x80 // this space is up to date
97 111
98/* 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
99 * 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
100 * 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
101 * 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
102 * lots of duplicate checks currently in the code. 116 * lots of duplicate checks currently in the code.
103 */ 117 */
104#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 */
105#define P_NEW_MAP 0x20000 119#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 120
113/* Instead of having numerous arrays that have information on a 121/* Instead of having numerous arrays that have information on a
114 * particular space (was map, floor, floor2, map_ob), 122 * particular space (was map, floor, floor2, map_ob),
115 * have this structure take care of that information. 123 * have this structure take care of that information.
116 * This puts it all in one place, and should also make it easier 124 * This puts it all in one place, and should also make it easier
117 * to extend information about a space. 125 * to extend information about a space.
118 */ 126 */
127INTERFACE_CLASS (mapspace)
119struct mapspace 128struct mapspace
120{ 129{
130 object *ACC (RW, bot);
121 object *bot, *top; /* lowest/highest object on this space */ 131 object *ACC (RW, top); /* lowest/highest object on this space */
122 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 132 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
123 uint8 flags_; /* flags about this space (see the P_ values above) */ 133 uint8 flags_; /* flags about this space (see the P_ values above) */
124 sint8 light; /* How much light this space provides */ 134 sint8 ACC (RW, light); /* How much light this space provides */
125 MoveType move_block; /* What movement types this space blocks */ 135 MoveType ACC (RW, move_block); /* What movement types this space blocks */
126 MoveType move_slow; /* What movement types this space slows */ 136 MoveType ACC (RW, move_slow); /* What movement types this space slows */
127 MoveType move_on; /* What movement types are activated */ 137 MoveType ACC (RW, move_on); /* What movement types are activated */
128 MoveType move_off; /* What movement types are activated */ 138 MoveType ACC (RW, move_off); /* What movement types are activated */
139 uint16_t ACC (RW, items_); // saturates at 64k
140 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
141 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
142 static uint32_t ACC (RW, smellcount); // global smell counter
143
144 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
145
146//-GPL
129 147
130 void update_ (); 148 void update_ ();
131 void update () 149 MTH void update ()
132 { 150 {
133 if (!(flags_ & P_UPTODATE)) 151 // we take advantage of the fact that 0x80 is the sign bit
152 // to generate more efficient code on many cpus
153 assert (sint8 (P_UPTODATE) < 0);
154 assert (sint8 (-1 & ~P_UPTODATE) >= 0);
155
156 if (expect_false (sint8 (flags_) >= 0))
134 update_ (); 157 update_ ();
135 }
136 158
159 // must be true by now (gcc seems content with only the second test)
160 assume (sint8 (flags_) < 0);
161 assume (flags_ & P_UPTODATE);
162 }
163
137 uint8 flags () 164 MTH uint8 flags ()
138 { 165 {
139 update (); 166 update ();
140 return flags_; 167 return flags_;
141 } 168 }
169
170 MTH void invalidate ()
171 {
172 flags_ = 0;
173 }
142 174
143 // maybe only inline quick flags_ checking?
144 object *player () 175 MTH object *player ()
145 { 176 {
146 // search from the top, because players are usually on top 177 object *op;
147 // make usually == always and this non-amortized O(1) 178
148 // could gte rid of P_PLAYER, too, then
149 if (flags () & P_PLAYER) 179 if (flags () & P_PLAYER)
150 for (object *op = top; op; op = op->below) 180 for (op = top; op->type != PLAYER; op = op->below)
151 if (op->type == PLAYER) 181 ;
152 return op; 182 else
183 op = 0;
153 184
154 return 0; 185 return op;
186 }
187
188 MTH uint32 items()
189 {
190 update ();
191 return items_;
155 } 192 }
156 193
157 // return the item volume on this mapspace in cm³ 194 // return the item volume on this mapspace in cm³
158 uint64 volume () const; 195 MTH uint64 volume ()
196 {
197 update ();
198 return volume_ * 1024;
199 }
200
201 bool blocks (MoveType mt) const
202 {
203 return move_block && (mt & move_block) == mt;
204 }
205
206 bool blocks (object *op) const
207 {
208 return blocks (op->move_type);
209 }
159}; 210};
211
212// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
213struct maprect
214{
215 maptile *m;
216 int x0, y0;
217 int x1, y1;
218 int dx, dy; // offset to go from local coordinates to original tile */
219};
220
221//+GPL
160 222
161struct shopitems : zero_initialised 223struct shopitems : zero_initialised
162{ 224{
163 const char *name; /* name of the item in question, null if it is the default item */ 225 const char *name; /* name of the item in question, null if it is the default item */
164 const char *name_pl; /* plural name */ 226 const char *name_pl; /* plural name */
215 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 277 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
216 278
217 bool ACC (RW, per_player); 279 bool ACC (RW, per_player);
218 bool ACC (RW, per_party); 280 bool ACC (RW, per_party);
219 bool ACC (RW, outdoor); /* True if an outdoor map */ 281 bool ACC (RW, outdoor); /* True if an outdoor map */
220 bool ACC (RW, nodrop); /* avoid dropping anything on this map */ 282 bool ACC (RW, no_drop); /* avoid auto-dropping (on death) anything on this map */
221 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 283 sint8 ACC (RW, darkness); /* indicates level of darkness of map */
284 static sint8 outdoor_darkness; /* the global darkness level outside */
222 285
223 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 286 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
224 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 287 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
225 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 288 oblinkpt *buttons; /* Linked list of linked lists of buttons */
226 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
227 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
228 sint8 ACC (RW, humid); /* humitidy of this tile */
229 sint8 ACC (RW, windspeed); /* windspeed of this tile */
230 sint8 ACC (RW, winddir); /* direction of wind */
231 sint8 ACC (RW, sky); /* sky conditions */
232 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
233 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 289 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
234 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 290 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
235 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 291 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
236 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 292 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
237 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 293 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
238 shstr ACC (RW, msg); /* Message map creator may have left */ 294 shstr ACC (RW, msg); /* Message map creator may have left */
239 shstr ACC (RW, maplore); /* Map lore information */ 295 shstr ACC (RW, maplore); /* Map lore information */
240 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 296 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
241 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 297 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
242 shstr ACC (RW, path); /* Filename of the map */ 298 shstr ACC (RW, path); /* Filename of the map */
243 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
244 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 299 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
300 int ACC (RW, max_items); // maximum number of items on a mapspace
301
302//-GPL
303
304 // the maptile:: is neccessary here for the perl interface to work
305 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
306 {
307 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
308 }
309
310 static void adjust_daylight ();
245 311
246 MTH void activate (); 312 MTH void activate ();
247 MTH void deactivate (); 313 MTH void deactivate ();
248 314
249 // allocates all (empty) mapspace 315 // allocates all (empty) mapspace
250 MTH void alloc (); 316 MTH void alloc ();
251 // deallocates the mapspaces (and destroys all objects) 317 // deallocates the mapspaces (and destroys all objects)
252 MTH void clear (); 318 MTH void clear ();
253 319
320 MTH void post_load (); // update cached values in mapspaces etc.
254 MTH void fix_auto_apply (); 321 MTH void fix_auto_apply ();
255 MTH void do_decay_objects (); 322 MTH void do_decay_objects ();
256 MTH void update_buttons (); 323 MTH void update_buttons ();
257 MTH int change_map_light (int change); 324 MTH int change_map_light (int change);
258 static void change_all_map_light (int change); //PERL
259 MTH void set_darkness_map ();
260 MTH int estimate_difficulty () const; 325 MTH int estimate_difficulty () const;
261 326
262 MTH void play_sound (faceidx sound, int x, int y) const; 327 MTH void play_sound (faceidx sound, int x, int y) const;
328 MTH void say_msg (const_utf8_string msg, int x, int y) const;
329
330 // connected links
331 oblinkpt *find_link (shstr_tmp id);
332 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
263 333
264 // set the given flag on all objects in the map 334 // set the given flag on all objects in the map
265 MTH void set_object_flag (int flag, int value = 1); 335 MTH void set_object_flag (int flag, int value = 1);
336 MTH void post_load_original ();
266 337
267 MTH void link_multipart_objects (); 338 MTH void link_multipart_objects ();
268 MTH void clear_unique_items (); 339 MTH void clear_unique_items ();
269 340
270 MTH void clear_header (); 341 MTH void clear_header ();
280 bool _load_objects (object_thawer &thawer); 351 bool _load_objects (object_thawer &thawer);
281 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 352 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
282 353
283 // save objects into the given file (uses IO_ flags) 354 // save objects into the given file (uses IO_ flags)
284 bool _save_objects (object_freezer &freezer, int flags); 355 bool _save_objects (object_freezer &freezer, int flags);
285 MTH bool _save_objects (const char *path, int flags); 356 MTH bool _save_objects (const_octet_string path, int flags);
286 357
287 // save the header pseudo object _only_ 358 // save the header pseudo object _only_
288 bool _save_header (object_freezer &freezer); 359 bool _save_header (object_freezer &freezer);
289 MTH bool _save_header (const char *path); 360 MTH bool _save_header (const_octet_string path);
290 361
291 maptile (); 362 maptile ();
292 maptile (int w, int h); 363 maptile (int w, int h);
364 void init ();
293 ~maptile (); 365 ~maptile ();
294 366
295 void do_destroy (); 367 void do_destroy ();
296 void gather_callbacks (AV *&callbacks, event_type event) const; 368 void gather_callbacks (AV *&callbacks, event_type event) const;
297 369
299 371
300 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);
301 373
302 MTH void touch () { last_access = runtime; } 374 MTH void touch () { last_access = runtime; }
303 375
304 MTH bool tile_available (int dir, bool load = true); 376 MTH maptile *tile_available (int dir, bool load = true);
305 377
306 // 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
307 // TODO: need a better way than passing by reference 379 // TODO: need a better way than passing by reference
308 // TODO: make perl interface 380 // TODO: make perl interface
309 maptile *xy_find (sint16 &x, sint16 &y); 381 maptile *xy_find (sint16 &x, sint16 &y);
318 { 390 {
319 if (!spaces) 391 if (!spaces)
320 do_load_sync (); 392 do_load_sync ();
321 } 393 }
322 394
323 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);
324 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
325 397
326 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
327 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 399 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
328 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
329 MTH object *pick_random_object () const; 401 object *pick_random_object (rand_gen &gen = rndm) const;
330 402
331 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 403 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
332 mapspace &at (uint32 x, uint32 y) { 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;
333}; 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
334 421
335/* This is used by get_rangevector to determine where the other 422/* This is used by get_rangevector to determine where the other
336 * creature is. get_rangevector takes into account map tiling, 423 * creature is. get_rangevector takes into account map tiling,
337 * 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
338 * righte value. distance_x/y are distance away, which 425 * righte value. distance_x/y are distance away, which
348 int distance_y; 435 int distance_y;
349 int direction; 436 int direction;
350 object *part; 437 object *part;
351}; 438};
352 439
440// comaptibility cruft start
353//TODO: these should be refactored into things like xy_normalise 441//TODO: these should be refactored into things like xy_normalise
354// and so on. 442// and so on.
355int 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);
356int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
357int out_of_map (maptile *m, int x, int y); 444int out_of_map (maptile *m, int x, int y);
358maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 445maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
359void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 446void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
360void 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*/);
361int on_same_map (const object *op1, const object *op2); 448int on_same_map (const object *op1, const object *op2);
362int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 449int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
363 450
364// 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
365inline bool 452static inline bool
366xy_normalise (maptile *&map, sint16 &x, sint16 &y) 453xy_normalise (maptile *&map, sint16 &x, sint16 &y)
367{ 454{
368 // when in range, do a quick return, otherwise go the slow route 455 // when in range, do a quick return, otherwise go the slow route
369 return 456 return
370 (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))
371 || !(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);
372} 459}
460// comaptibility cruft end
461
462//-GPL
373 463
374inline mapspace & 464inline mapspace &
375object::ms () const 465object::ms () const
376{ 466{
377 return map->at (x, y); 467 return map->at (x, y);
378} 468}
379 469
380// not used anywhere *yet*
381struct mapxy { 470struct mapxy {
382 maptile *m; 471 maptile *m;
383 sint16 x, y; 472 sint16 x, y;
384 473
385 mapxy (maptile *m, sint16 x, sint16 y) 474 mapxy (maptile *m, sint16 x, sint16 y)
388 477
389 mapxy (object *op) 478 mapxy (object *op)
390 : m(op->map), x(op->x), y(op->y) 479 : m(op->map), x(op->x), y(op->y)
391 { } 480 { }
392 481
482 mapxy &move (int dx, int dy)
483 {
484 x += dx;
485 y += dy;
486
487 return *this;
488 }
489
393 mapxy &move (int dir) 490 mapxy &move (int dir)
394 { 491 {
395 x += freearr_x [dir]; 492 return move (freearr_x [dir], freearr_y [dir]);
396 y += freearr_y [dir];
397
398 return *this;
399 } 493 }
400 494
401 operator void *() const { return (void *)m; } 495 operator void *() const { return (void *)m; }
402 mapxy &operator =(const object *op) 496 mapxy &operator =(const object *op)
403 { 497 {
407 501
408 return *this; 502 return *this;
409 } 503 }
410 504
411 mapspace *operator ->() const { return &m->at (x, y); } 505 mapspace *operator ->() const { return &m->at (x, y); }
412 mapspace *operator * () const { return &m->at (x, y); } 506 mapspace &operator * () const { return m->at (x, y); }
413 507
414 bool normalise () 508 bool normalise ()
415 { 509 {
416 return xy_normalise (m, x, y); 510 return xy_normalise (m, x, y);
417 } 511 }
418 512
513 mapspace &ms () const
514 {
515 return m->at (x, y);
516 }
517
419 object *insert (object *op, object *originator = 0, int flags = 0) const 518 object *insert (object *op, object *originator = 0, int flags = 0) const
420 { 519 {
421 m->insert (op, x, y, originator, flags); 520 return m->insert (op, x, y, originator, flags);
422 } 521 }
423}; 522};
424 523
425inline const mapxy & 524inline const mapxy &
426object::operator =(const mapxy &pos) 525object::operator =(const mapxy &pos)
430 y = pos.y; 529 y = pos.y;
431 530
432 return pos; 531 return pos;
433} 532}
434 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
435#endif 591#endif
436 592

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines