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.118 by root, Sun Nov 8 16:13:45 2009 UTC vs.
Revision 1.157 by root, Sat Nov 17 23:40:01 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/* 26/*
26 * The maptile is allocated each time a new map is opened. 27 * The maptile is allocated each time a new map is opened.
… …
48 * map pointers. 49 * map pointers.
49 */ 50 */
50#define MAGIC_MAP_SIZE 50 51#define MAGIC_MAP_SIZE 50
51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 52#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
52 53
53#define MAP_LAYERS 3 54#define MAP_LAYERS 3
54 55
55// tile map index 56// tile map index - toggling the lowest bit reverses direction
56enum { 57enum
57 TILE_UP = 0, 58{
58 TILE_RIGHT = 1, 59 TILE_NORTH,
60 TILE_SOUTH,
61 TILE_WEST,
62 TILE_EAST,
63 TILE_UP,
59 TILE_DOWN = 2, 64 TILE_DOWN,
60 TILE_LEFT = 3, 65 TILE_NUM
61}; 66};
62 67
68#define REVERSE_TILE_DIR(dir) ((dir) ^ 1)
69
63/* Values for in_memory below */ 70/* Values for state below */
64enum { 71enum
65 MAP_ACTIVE, 72{
66 MAP_INACTIVE, // not used atm. 73 MAP_SWAPPED, // header loaded, nothing else
67 MAP_SWAPPED, 74 MAP_INACTIVE, // in memory, linkable, but not active
68 MAP_LOADING, 75 MAP_ACTIVE, // running!
69 MAP_SAVING,
70}; 76};
71 77
72/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 78/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
73 * really be used, as it is multi tile aware. However, there are some cases 79 * really be used, as it is multi tile aware. However, there are some cases
74 * where it is known the map is not tiled or the values are known 80 * where it is known the map is not tiled or the values are known
… …
88 * should almost always be using out_of_map instead, which takes into account 94 * should almost always be using out_of_map instead, which takes into account
89 * map tiling. 95 * map tiling.
90 */ 96 */
91#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) 97#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
92 98
93/* These are used in the MapLook flags element. They are not used in 99/* These are used in the mapspace flags element. They are not used in
94 * in the object flags structure. 100 * in the object flags structure.
95 */ 101 */
96#define P_BLOCKSVIEW 0x01 102#define P_BLOCKSVIEW 0x01
97#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ 103#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
98#define P_NO_CLERIC 0x04 /* no clerical spells cast here */ 104#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
… …
112 * function that does more of the work can hopefully be used to replace 118 * function that does more of the work can hopefully be used to replace
113 * lots of duplicate checks currently in the code. 119 * lots of duplicate checks currently in the code.
114 */ 120 */
115#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 121#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
116#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ 122#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
123
124// persistent flags (pflags) in mapspace
125enum
126{
127 PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace
128};
117 129
118/* Instead of having numerous arrays that have information on a 130/* Instead of having numerous arrays that have information on a
119 * particular space (was map, floor, floor2, map_ob), 131 * particular space (was map, floor, floor2, map_ob),
120 * have this structure take care of that information. 132 * have this structure take care of that information.
121 * This puts it all in one place, and should also make it easier 133 * This puts it all in one place, and should also make it easier
… …
131 sint8 ACC (RW, light); /* How much light this space provides */ 143 sint8 ACC (RW, light); /* How much light this space provides */
132 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 144 MoveType ACC (RW, move_block); /* What movement types this space blocks */
133 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 145 MoveType ACC (RW, move_slow); /* What movement types this space slows */
134 MoveType ACC (RW, move_on); /* What movement types are activated */ 146 MoveType ACC (RW, move_on); /* What movement types are activated */
135 MoveType ACC (RW, move_off); /* What movement types are activated */ 147 MoveType ACC (RW, move_off); /* What movement types are activated */
136 uint16_t ACC (RW, nrof_); // saturates at 64k 148 uint16_t ACC (RW, items_); // saturates at 64k
137 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) 149 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
138 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 150 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
139 static uint32_t ACC (RW, smellcount); // global smell counter 151 static uint32_t ACC (RW, smellcount); // global smell counter
140 152
141 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems 153 uint8_t pflags; // additional, persistent flags
154 uint8_t pad [3]; // pad to 64 bytes on LP64 systems
142 155
143//-GPL 156//-GPL
144 157
145 void update_ (); 158 void update_ ();
146 MTH void update () 159 MTH void update ()
147 { 160 {
148 // we take advantage of the fact that 0x80 is the sign bit 161 // we take advantage of the fact that 0x80 is the sign bit
149 // to generate more efficient code on many cpus 162 // to generate more efficient code on many cpus
150 assert (sint8 (P_UPTODATE) < 0); 163 //assert (sint8 (P_UPTODATE) < 0);
151 assert (sint8 (-1 & ~P_UPTODATE) >= 0); 164 //assert (sint8 (-1 & ~P_UPTODATE) >= 0);
152 165
153 if (expect_false (sint8 (flags_) >= 0)) 166 if (expect_false (sint8 (flags_) >= 0))
154 update_ (); 167 update_ ();
155 168
156 // must be true by now 169 // must be true by now (gcc seems content with only the second test)
157 assume (sint8 (flags_) < 0); 170 ecb_assume (sint8 (flags_) < 0);
158 assume (flags_ & P_UPTODATE); 171 ecb_assume (flags_ & P_UPTODATE);
159 } 172 }
160 173
161 MTH uint8 flags () 174 MTH uint8 flags ()
162 { 175 {
163 update (); 176 update ();
164 return flags_; 177 return flags_;
165 } 178 }
166 179
180 MTH void update_up ();
181
167 MTH void invalidate () 182 MTH void invalidate ()
168 { 183 {
169 flags_ = 0; 184 flags_ = 0;
170 } 185
186 if (pflags)
187 update_up ();
171 188 }
189
172 MTH object *player () 190 MTH object *player ()
173 { 191 {
174 object *op; 192 object *op;
175 193
176 if (flags () & P_PLAYER) 194 if (flags () & P_PLAYER)
… …
180 op = 0; 198 op = 0;
181 199
182 return op; 200 return op;
183 } 201 }
184 202
185 MTH uint32 nrof () 203 MTH uint32 items()
186 { 204 {
187 update (); 205 update ();
188 return nrof_; 206 return items_;
189 } 207 }
190 208
191 // return the item volume on this mapspace in cm³ 209 // return the item volume on this mapspace in cm³
192 MTH uint64 volume () 210 MTH volume_t volume ()
193 { 211 {
194 update (); 212 update ();
195 return volume_ * 1024; 213 return volume_ * 1024;
196 } 214 }
197 215
… …
204 { 222 {
205 return blocks (op->move_type); 223 return blocks (op->move_type);
206 } 224 }
207}; 225};
208 226
209// a rectangular area of a map 227// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
210struct maprect 228struct maprect
211{ 229{
212 maptile *m; 230 maptile *m;
213 int x0, y0; 231 int x0, y0;
214 int x1, y1; 232 int x1, y1;
215 int dx, dy; // offset to go from local coordinates to original tile */ 233 int dx, dy; // offset to go from local coordinates to original tile */
216}; 234};
217 235
236// (refcounted) list of objects on this map that need physics processing
237struct physics_queue
238: unordered_vector<object *>
239{
240 int i; // already processed
241 physics_queue ();
242 ~physics_queue ();
243 object *pop ();
244};
245
246#define PHYSICS_QUEUES 16 // "activity" at least every 16 ticks
247
218//+GPL 248//+GPL
219 249
220struct shopitems : zero_initialised 250struct shopitems : zero_initialised
221{ 251{
222 const char *name; /* name of the item in question, null if it is the default item */ 252 const char *name; /* name of the item in question, null if it is the default item */
223 const char *name_pl; /* plural name */ 253 const char *name_pl; /* plural name */
224 int typenum; /* itemtype number we need to match 0 if it is the default price */ 254 int typenum; /* itemtype number we need to match 0 if it is the default price */
225 sint8 strength; /* the degree of specialisation the shop has in this item, 255 sint8 strength; /* the degree of specialisation the shop has in this item,
226 * as a percentage from -100 to 100 */ 256 * as a percentage from -100 to 100 */
227 int index; /* being the size of the shopitems array. */ 257 int index; /* being the size of the shopitems array. */
228}; 258};
229 259
230// map I/O, what to load/save 260// map I/O, what to load/save
… …
232 IO_HEADER = 0x01, // the "arch map" pseudo object 262 IO_HEADER = 0x01, // the "arch map" pseudo object
233 IO_OBJECTS = 0x02, // the non-unique objects 263 IO_OBJECTS = 0x02, // the non-unique objects
234 IO_UNIQUES = 0x04, // unique objects 264 IO_UNIQUES = 0x04, // unique objects
235}; 265};
236 266
237/* In general, code should always use the macros 267/* In general, code should always use the macros
238 * above (or functions in map.c) to access many of the 268 * above (or functions in map.c) to access many of the
239 * values in the map structure. Failure to do this will 269 * values in the map structure. Failure to do this will
240 * almost certainly break various features. You may think 270 * almost certainly break various features. You may think
241 * it is safe to look at width and height values directly 271 * it is safe to look at width and height values directly
242 * (or even through the macros), but doing so will completely 272 * (or even through the macros), but doing so will completely
243 * break map tiling. 273 * break map tiling.
… …
251 region_ptr *regionmap; /* index to region */ 281 region_ptr *regionmap; /* index to region */
252 282
253 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 283 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
254 284
255 shstr ACC (RW, name); /* Name of map as given by its creator */ 285 shstr ACC (RW, name); /* Name of map as given by its creator */
256 region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by 286 region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
257 * points to the struct containing all the properties of 287 * points to the struct containing all the properties of
258 * the region */ 288 * the region */
259 double ACC (RW, reset_time); 289 double ACC (RW, reset_time);
260 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map 290 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
261 * should be reset 291 * should be reset
262 */ 292 */
263 bool ACC (RW, dirty); /* if true, something was inserted or removed */ 293 bool ACC (RW, dirty); /* if true, something was inserted or removed */
264 bool ACC (RW, no_reset); // must not reset this map 294 bool ACC (RW, no_reset); // must not reset this map
265 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by 295 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
266 * players entering/exiting map 296 * players entering/exiting map
267 */ 297 */
298 uint8 ACC (RW, state); /* If not true, the map has been freed and must
299 * be loaded before used. The map,omap and map_ob
300 * arrays will be allocated when the map is loaded */
268 sint32 ACC (RW, timeout); /* swapout is set to this */ 301 sint32 ACC (RW, timeout); /* swapout is set to this */
269 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ 302 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
270 uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
271 * be loaded before used. The map,omap and map_ob
272 * arrays will be allocated when the map is loaded */
273 sint16 players; /* How many players are on this map right now */ 303 sint16 players; /* How many players are on this map right now */
274 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 304 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
275 305
276 bool ACC (RW, per_player); 306 bool ACC (RW, per_player);
277 bool ACC (RW, per_party); 307 bool ACC (RW, per_party);
… …
281 static sint8 outdoor_darkness; /* the global darkness level outside */ 311 static sint8 outdoor_darkness; /* the global darkness level outside */
282 312
283 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 313 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
284 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 314 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
285 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 315 oblinkpt *buttons; /* Linked list of linked lists of buttons */
286 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
287 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
288 sint8 ACC (RW, humid); /* humitidy of this tile */
289 sint8 ACC (RW, windspeed); /* windspeed of this tile */
290 sint8 ACC (RW, winddir); /* direction of wind */
291 sint8 ACC (RW, sky); /* sky conditions */
292 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
293 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 316 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
294 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 317 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
295 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 318 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
296 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 319 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
297 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 320 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
298 shstr ACC (RW, msg); /* Message map creator may have left */ 321 shstr ACC (RW, msg); /* Message map creator may have left */
299 shstr ACC (RW, maplore); /* Map lore information */ 322 shstr ACC (RW, maplore); /* Map lore information */
300 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 323 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
301 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 324 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
302 shstr ACC (RW, path); /* Filename of the map */ 325 shstr ACC (RW, path); /* Filename of the map */
303 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
304 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 326 volume_t ACC (RW, max_volume); // maximum volume for all items on a mapspace
305 int ACC (RW, max_items); // maximum number of items on a mapspace 327 int ACC (RW, max_items); // maximum number of items on a mapspace
306 328
307//-GPL 329//-GPL
330
331 physics_queue pq[PHYSICS_QUEUES];
332 MTH void queue_physics (object *ob, int after = 0);
333 MTH void queue_physics_at (int x, int y);
334 MTH int run_physics (tick_t tick, int max_objects);
335 MTH void activate_physics ();
308 336
309 // the maptile:: is neccessary here for the perl interface to work 337 // the maptile:: is neccessary here for the perl interface to work
310 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 338 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
311 { 339 {
312 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 340 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
… …
320 // allocates all (empty) mapspace 348 // allocates all (empty) mapspace
321 MTH void alloc (); 349 MTH void alloc ();
322 // deallocates the mapspaces (and destroys all objects) 350 // deallocates the mapspaces (and destroys all objects)
323 MTH void clear (); 351 MTH void clear ();
324 352
353 MTH void post_load (); // update cached values in mapspaces etc.
325 MTH void fix_auto_apply (); 354 MTH void fix_auto_apply ();
326 MTH void do_decay_objects (); 355 MTH void do_decay_objects ();
327 MTH void update_buttons (); 356 MTH void update_buttons ();
328 MTH int change_map_light (int change); 357 MTH int change_map_light (int change);
329 MTH int estimate_difficulty () const; 358 MTH int estimate_difficulty () const;
330 359
331 MTH void play_sound (faceidx sound, int x, int y) const; 360 MTH void play_sound (faceidx sound, int x, int y) const;
332 MTH void say_msg (const char *msg, int x, int y) const; 361 MTH void say_msg (const_utf8_string msg, int x, int y) const;
333 362
334 // connected links 363 // connected links
335 oblinkpt *find_link (shstr_tmp id); 364 oblinkpt *find_link (shstr_tmp id);
336 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0); 365 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
337 366
… …
355 bool _load_objects (object_thawer &thawer); 384 bool _load_objects (object_thawer &thawer);
356 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 385 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
357 386
358 // save objects into the given file (uses IO_ flags) 387 // save objects into the given file (uses IO_ flags)
359 bool _save_objects (object_freezer &freezer, int flags); 388 bool _save_objects (object_freezer &freezer, int flags);
360 MTH bool _save_objects (const char *path, int flags); 389 MTH bool _save_objects (const_octet_string path, int flags);
361 390
362 // save the header pseudo object _only_ 391 // save the header pseudo object _only_
363 bool _save_header (object_freezer &freezer); 392 bool _save_header (object_freezer &freezer);
364 MTH bool _save_header (const char *path); 393 MTH bool _save_header (const_octet_string path);
365 394
366 maptile (); 395 maptile ();
367 maptile (int w, int h); 396 maptile (int w, int h);
397 void init ();
368 ~maptile (); 398 ~maptile ();
369 399
370 void do_destroy (); 400 void do_destroy ();
371 void gather_callbacks (AV *&callbacks, event_type event) const; 401 void gather_callbacks (AV *&callbacks, event_type event) const;
372 402
403 MTH bool linkable () { return state >= MAP_INACTIVE; }
404
373 MTH int size () const { return width * height; } 405 MTH int size () const { return width * height; }
374 406
375 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 407 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
376 408
377 MTH void touch () { last_access = runtime; } 409 MTH void touch () { last_access = runtime; }
378 410
411 // returns the map at given direction. if the map isn't linked yet,
412 // it will either return false (if load is false), or otherwise try to link
413 // it - if linking fails because the map is not loaded yet, it will
414 // start loading the map and return 0.
415 // thus, if you get 0, the map exists and load is true, then some later
416 // call (some tick or so later...) will eventually succeed.
379 MTH maptile *tile_available (int dir, bool load = true); 417 MTH maptile *tile_available (int dir, bool load = true);
380 418
381 // find the map that is at coordinate x|y relative to this map 419 // find the map that is at coordinate x|y relative to this map
382 // TODO: need a better way than passing by reference 420 // TODO: need a better way than passing by reference
383 // TODO: make perl interface 421 // TODO: make perl interface
… …
393 { 431 {
394 if (!spaces) 432 if (!spaces)
395 do_load_sync (); 433 do_load_sync ();
396 } 434 }
397 435
398 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 436 void make_map_floor (char **layout, const char *floorstyle, random_map_params *RP);
399 bool generate_random_map (random_map_params *RP); 437 bool generate_random_map (random_map_params *RP);
400 438
401 static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL 439 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
402 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 440 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
403 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL 441 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
404 object *pick_random_object (rand_gen &gen = rndm) const; 442 object *pick_random_object (rand_gen &gen = rndm) const;
405 443
406 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 444 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
407 445
408 // return an array of maprects corresponding 446 // return an array of maprects corresponding
409 // to the given rectangular area. the last rect will have 447 // to the given rectangular area. the last rect will have
410 // a 0 map pointer. 448 // a 0 map pointer.
411 // the array will be stored in a static memory area,
412 // so recursion is not atm. supported
413 maprect *split_to_tiles (int x0, int y0, int x1, int y1); 449 maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
450
451 MTH bool is_in_shop (int x, int y) const;
414}; 452};
453
454inline bool
455object::is_in_shop () const
456{
457 return is_on_map ()
458 && map->is_in_shop (x, y);
459}
415 460
416//+GPL 461//+GPL
417 462
418/* This is used by get_rangevector to determine where the other 463/* This is used by get_rangevector to determine where the other
419 * creature is. get_rangevector takes into account map tiling, 464 * creature is. get_rangevector takes into account map tiling,
… …
438// and so on. 483// and so on.
439int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 484int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
440int out_of_map (maptile *m, int x, int y); 485int out_of_map (maptile *m, int x, int y);
441maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 486maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
442void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 487void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
443void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); 488void get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
444int on_same_map (const object *op1, const object *op2); 489int on_same_map (const object *op1, const object *op2);
445int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 490int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
446 491
447// adjust map, x and y for tiled maps and return true if the position is valid at all 492// adjust map, x and y for tiled maps and return true if the position is valid at all
448static inline bool 493static inline bool
449xy_normalise (maptile *&map, sint16 &x, sint16 &y) 494xy_normalise (maptile *&map, sint16 &x, sint16 &y)
450{ 495{
… …
483 return *this; 528 return *this;
484 } 529 }
485 530
486 mapxy &move (int dir) 531 mapxy &move (int dir)
487 { 532 {
488 return move (freearr_x [dir], freearr_y [dir]); 533 return move (DIRX (dir), DIRY (dir));
489 } 534 }
490 535
491 operator void *() const { return (void *)m; } 536 operator void *() const { return (void *)m; }
492 mapxy &operator =(const object *op) 537 mapxy &operator =(const object *op)
493 { 538 {
… …
554 599
555#define ordered_mapwalk_end \ 600#define ordered_mapwalk_end \
556 } \ 601 } \
557 } 602 }
558 603
604extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
605
606// special "grave" map used to store all removed objects
607// till they can be destroyed - saves a lot of checks in the rest
608// of the code
609struct freed_map
610: maptile
611{
612 freed_map ()
613 : maptile (3, 3)
614 {
615 path = "<freed objects map>";
616 name = "/internal/freed_objects_map";
617 no_drop = 1;
618 no_reset = 1;
619
620 state = MAP_ACTIVE;
621 }
622
623 ~freed_map ()
624 {
625 destroy ();
626 }
627};
628
629// initialised in common/shstr.C, due to shstr usage we need defined
630// initialisation order!
631extern struct freed_map freed_map; // freed objects are moved here to avoid crashes
632
559// loop over every space in the given maprect, 633// loop over every space in the given maprect,
560// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 634// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
561// the iterator code must be a single statement following this macro call, similar to "if" 635// the iterator code must be a single statement following this macro call, similar to "if"
562// "continue" will skip to the next space 636// "continue" will skip to the next space
563#define rect_mapwalk(rect,dx0,dy0) \ 637#define rect_mapwalk(rect,dx0,dy0) \
… …
569 643
570// same as ordered_mapwalk, but the walk will not follow any particular 644// same as ordered_mapwalk, but the walk will not follow any particular
571// order (unorded), but is likely faster. 645// order (unorded), but is likely faster.
572// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op 646// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
573// "continue" will skip to the next space 647// "continue" will skip to the next space
574#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 648#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
575 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 649 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
576 (ox) + (dx0) , (oy) + (dy0) , \ 650 (ox) + (dx0) , (oy) + (dy0) , \
577 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 651 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
578 r_e_c_t->m; \ 652 r_e_c_t->m; \
579 ++r_e_c_t) \ 653 ++r_e_c_t) \
580 rect_mapwalk (r_e_c_t, (ox), (oy)) 654 rect_mapwalk (r_e_c_t, (ox), (oy))
581 655
582#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 656#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
583 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) 657 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
584 658
585#endif 659#endif
586 660

Diff Legend

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