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.116 by root, Thu Nov 5 15:57:15 2009 UTC vs.
Revision 1.138 by root, Wed May 4 07:36:40 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.
… …
48 * map pointers. 48 * map pointers.
49 */ 49 */
50#define MAGIC_MAP_SIZE 50 50#define MAGIC_MAP_SIZE 50
51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
52 52
53#define MAP_LAYERS 3 53#define MAP_LAYERS 3
54 54
55// tile map index 55// tile map index
56enum { 56enum {
57 TILE_UP = 0, 57 TILE_NORTH,
58 TILE_RIGHT = 1, 58 TILE_EAST,
59 TILE_SOUTH,
60 TILE_WEST,
61 TILE_UP,
59 TILE_DOWN = 2, 62 TILE_DOWN,
60 TILE_LEFT = 3, 63 TILE_NUM,
61}; 64};
62 65
63/* Values for in_memory below */ 66/* Values for in_memory below */
64enum { 67enum {
65 MAP_ACTIVE, 68 MAP_SWAPPED, // header loaded, nothing else
66 MAP_INACTIVE, // not used atm. 69 MAP_INACTIVE, // in memory, linkable, but not active
67 MAP_SWAPPED, 70 MAP_ACTIVE, // running!
68 MAP_LOADING,
69 MAP_SAVING,
70}; 71};
71 72
72/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 73/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
73 * really be used, as it is multi tile aware. However, there are some cases 74 * really be used, as it is multi tile aware. However, there are some cases
74 * where it is known the map is not tiled or the values are known 75 * where it is known the map is not tiled or the values are known
… …
93/* These are used in the MapLook flags element. They are not used in 94/* These are used in the MapLook flags element. They are not used in
94 * in the object flags structure. 95 * in the object flags structure.
95 */ 96 */
96#define P_BLOCKSVIEW 0x01 97#define P_BLOCKSVIEW 0x01
97#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ 98#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
98#define P_PLAYER 0x04 /* a player (or something seeing these objects) is on this mapspace */ 99#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
99#define P_SAFE 0x08 /* If this is set the map tile is a safe space, 100#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
100 * that means, nothing harmful can be done, 101 * that means, nothing harmful can be done,
101 * such as: bombs, potion usage, alchemy, spells 102 * such as: bombs, potion usage, alchemy, spells
102 * this was introduced to make shops safer 103 * this was introduced to make shops safer
103 * but is useful in other situations */ 104 * but is useful in other situations */
105
106#define P_PLAYER 0x10 /* a player (or something seeing these objects) is on this mapspace */
104#define P_IS_ALIVE 0x10 /* something alive is on this space */ 107#define P_IS_ALIVE 0x20 /* something alive is on this space */
105#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
106
107#define P_UPTODATE 0x80 /* this space is up to date */ 108#define P_UPTODATE 0x80 // this space is up to date
108 109
109/* The following two values are not stored in the MapLook flags, but instead 110/* The following two values are not stored in the MapLook flags, but instead
110 * used in the get_map_flags value - that function is used to return 111 * used in the get_map_flags value - that function is used to return
111 * the flag value, as well as other conditions - using a more general 112 * the flag value, as well as other conditions - using a more general
112 * function that does more of the work can hopefully be used to replace 113 * function that does more of the work can hopefully be used to replace
… …
123 */ 124 */
124INTERFACE_CLASS (mapspace) 125INTERFACE_CLASS (mapspace)
125struct mapspace 126struct mapspace
126{ 127{
127 object *ACC (RW, bot); 128 object *ACC (RW, bot);
128 object *ACC (RW, top); /* lowest/highest object on this space */ 129 object *ACC (RW, top); /* lowest/highest object on this space */
129 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ 130 object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
130 uint32_t smell; // the last count a player was seen here, or 0
131 static uint32_t smellcount; // global smell counter
132 uint8 flags_; /* flags about this space (see the P_ values above) */ 131 uint8 flags_; /* flags about this space (see the P_ values above) */
133 sint8 ACC (RW, light); /* How much light this space provides */ 132 sint8 ACC (RW, light); /* How much light this space provides */
134 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 133 MoveType ACC (RW, move_block); /* What movement types this space blocks */
135 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 134 MoveType ACC (RW, move_slow); /* What movement types this space slows */
136 MoveType ACC (RW, move_on); /* What movement types are activated */ 135 MoveType ACC (RW, move_on); /* What movement types are activated */
137 MoveType ACC (RW, move_off); /* What movement types are activated */ 136 MoveType ACC (RW, move_off); /* What movement types are activated */
137 uint16_t ACC (RW, items_); // saturates at 64k
138 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
139 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
140 static uint32_t ACC (RW, smellcount); // global smell counter
141
142 uint32_t pad1_; // pad to 64 bytes on 64 bit systems
138 143
139//-GPL 144//-GPL
140 145
141 void update_ (); 146 void update_ ();
142 MTH void update () 147 MTH void update ()
143 { 148 {
144 if (expect_false (!(flags_ & P_UPTODATE))) 149 // we take advantage of the fact that 0x80 is the sign bit
150 // to generate more efficient code on many cpus
151 assert (sint8 (P_UPTODATE) < 0);
152 assert (sint8 (-1 & ~P_UPTODATE) >= 0);
153
154 if (expect_false (sint8 (flags_) >= 0))
145 update_ (); 155 update_ ();
156
157 // must be true by now (gcc seems content with only the second test)
158 assume (sint8 (flags_) < 0);
159 assume (flags_ & P_UPTODATE);
146 } 160 }
147 161
148 MTH uint8 flags () 162 MTH uint8 flags ()
149 { 163 {
150 update (); 164 update ();
… …
167 op = 0; 181 op = 0;
168 182
169 return op; 183 return op;
170 } 184 }
171 185
186 MTH uint32 items()
187 {
188 update ();
189 return items_;
190 }
191
172 // return the item volume on this mapspace in cm³ 192 // return the item volume on this mapspace in cm³
173 MTH uint64 volume () const; 193 MTH uint64 volume ()
194 {
195 update ();
196 return volume_ * 1024;
197 }
174 198
175 bool blocks (MoveType mt) const 199 bool blocks (MoveType mt) const
176 { 200 {
177 return move_block && (mt & move_block) == mt; 201 return move_block && (mt & move_block) == mt;
178 } 202 }
… …
181 { 205 {
182 return blocks (op->move_type); 206 return blocks (op->move_type);
183 } 207 }
184}; 208};
185 209
186// a rectangular area of a map 210// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
187struct maprect 211struct maprect
188{ 212{
189 maptile *m; 213 maptile *m;
190 int x0, y0; 214 int x0, y0;
191 int x1, y1; 215 int x1, y1;
… …
258 static sint8 outdoor_darkness; /* the global darkness level outside */ 282 static sint8 outdoor_darkness; /* the global darkness level outside */
259 283
260 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 284 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
261 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 285 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
262 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 286 oblinkpt *buttons; /* Linked list of linked lists of buttons */
263 sint16 ACC (RW, temp); /* base temperature of this tile (F) */
264 sint16 ACC (RW, pressure); /* barometric pressure (mb) */
265 sint8 ACC (RW, humid); /* humitidy of this tile */
266 sint8 ACC (RW, windspeed); /* windspeed of this tile */
267 sint8 ACC (RW, winddir); /* direction of wind */
268 sint8 ACC (RW, sky); /* sky conditions */
269 int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
270 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ 287 struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
271 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ 288 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
272 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 289 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
273 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 290 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
274 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 291 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
275 shstr ACC (RW, msg); /* Message map creator may have left */ 292 shstr ACC (RW, msg); /* Message map creator may have left */
276 shstr ACC (RW, maplore); /* Map lore information */ 293 shstr ACC (RW, maplore); /* Map lore information */
277 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 294 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
278 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 295 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
279 shstr ACC (RW, path); /* Filename of the map */ 296 shstr ACC (RW, path); /* Filename of the map */
280 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
281 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 297 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
298 int ACC (RW, max_items); // maximum number of items on a mapspace
282 299
283//-GPL 300//-GPL
284 301
285 // the maptile:: is neccessary here for the perl interface to work 302 // the maptile:: is neccessary here for the perl interface to work
286 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 303 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
… …
296 // allocates all (empty) mapspace 313 // allocates all (empty) mapspace
297 MTH void alloc (); 314 MTH void alloc ();
298 // deallocates the mapspaces (and destroys all objects) 315 // deallocates the mapspaces (and destroys all objects)
299 MTH void clear (); 316 MTH void clear ();
300 317
318 MTH void post_load (); // update cached values in mapspaces etc.
301 MTH void fix_auto_apply (); 319 MTH void fix_auto_apply ();
302 MTH void do_decay_objects (); 320 MTH void do_decay_objects ();
303 MTH void update_buttons (); 321 MTH void update_buttons ();
304 MTH int change_map_light (int change); 322 MTH int change_map_light (int change);
305 MTH int estimate_difficulty () const; 323 MTH int estimate_difficulty () const;
306 324
307 MTH void play_sound (faceidx sound, int x, int y) const; 325 MTH void play_sound (faceidx sound, int x, int y) const;
308 MTH void say_msg (const char *msg, int x, int y) const; 326 MTH void say_msg (const_utf8_string msg, int x, int y) const;
309 327
310 // connected links 328 // connected links
311 oblinkpt *find_link (shstr_tmp id); 329 oblinkpt *find_link (shstr_tmp id);
312 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0); 330 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
313 331
… …
331 bool _load_objects (object_thawer &thawer); 349 bool _load_objects (object_thawer &thawer);
332 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 350 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
333 351
334 // save objects into the given file (uses IO_ flags) 352 // save objects into the given file (uses IO_ flags)
335 bool _save_objects (object_freezer &freezer, int flags); 353 bool _save_objects (object_freezer &freezer, int flags);
336 MTH bool _save_objects (const char *path, int flags); 354 MTH bool _save_objects (const_octet_string path, int flags);
337 355
338 // save the header pseudo object _only_ 356 // save the header pseudo object _only_
339 bool _save_header (object_freezer &freezer); 357 bool _save_header (object_freezer &freezer);
340 MTH bool _save_header (const char *path); 358 MTH bool _save_header (const_octet_string path);
341 359
342 maptile (); 360 maptile ();
343 maptile (int w, int h); 361 maptile (int w, int h);
362 void init ();
344 ~maptile (); 363 ~maptile ();
345 364
346 void do_destroy (); 365 void do_destroy ();
347 void gather_callbacks (AV *&callbacks, event_type event) const; 366 void gather_callbacks (AV *&callbacks, event_type event) const;
367
368 MTH bool linkable () { return in_memory >= MAP_INACTIVE; }
348 369
349 MTH int size () const { return width * height; } 370 MTH int size () const { return width * height; }
350 371
351 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);
352 373
… …
369 { 390 {
370 if (!spaces) 391 if (!spaces)
371 do_load_sync (); 392 do_load_sync ();
372 } 393 }
373 394
374 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);
375 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
376 397
377 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
378 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 399 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
379 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
380 object *pick_random_object (rand_gen &gen = rndm) const; 401 object *pick_random_object (rand_gen &gen = rndm) const;
381 402
382 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 403 mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
383 404
384 // return an array of maprects corresponding 405 // return an array of maprects corresponding
385 // to the given rectangular area. the last rect will have 406 // to the given rectangular area. the last rect will have
386 // a 0 map pointer. 407 // a 0 map pointer.
387 // the array will be stored in a static memory area,
388 // so recursion is not atm. supported
389 maprect *split_to_tiles (int x0, int y0, int x1, int y1); 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;
390}; 411};
412
413inline bool
414object::is_in_shop () const
415{
416 return is_on_map ()
417 && map->is_in_shop (x, y);
418}
391 419
392//+GPL 420//+GPL
393 421
394/* This is used by get_rangevector to determine where the other 422/* This is used by get_rangevector to determine where the other
395 * creature is. get_rangevector takes into account map tiling, 423 * creature is. get_rangevector takes into account map tiling,
… …
414// and so on. 442// and so on.
415int 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);
416int out_of_map (maptile *m, int x, int y); 444int out_of_map (maptile *m, int x, int y);
417maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 445maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
418void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 446void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
419void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); 447void get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
420int on_same_map (const object *op1, const object *op2); 448int on_same_map (const object *op1, const object *op2);
421int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 449int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
422 450
423// 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
424static inline bool 452static inline bool
425xy_normalise (maptile *&map, sint16 &x, sint16 &y) 453xy_normalise (maptile *&map, sint16 &x, sint16 &y)
426{ 454{
… …
530 558
531#define ordered_mapwalk_end \ 559#define ordered_mapwalk_end \
532 } \ 560 } \
533 } 561 }
534 562
563extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
564
535// loop over every space in the given maprect, 565// loop over every space in the given maprect,
536// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 566// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
537// the iterator code must be a single statement following this macro call, similar to "if" 567// the iterator code must be a single statement following this macro call, similar to "if"
538// "continue" will skip to the next space 568// "continue" will skip to the next space
539#define rect_mapwalk(rect,dx0,dy0) \ 569#define rect_mapwalk(rect,dx0,dy0) \
… …
545 575
546// same as ordered_mapwalk, but the walk will not follow any particular 576// same as ordered_mapwalk, but the walk will not follow any particular
547// order (unorded), but is likely faster. 577// order (unorded), but is likely faster.
548// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op 578// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
549// "continue" will skip to the next space 579// "continue" will skip to the next space
550#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 580#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
551 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 581 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
552 (ox) + (dx0) , (oy) + (dy0) , \ 582 (ox) + (dx0) , (oy) + (dy0) , \
553 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 583 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
554 r_e_c_t->m; \ 584 r_e_c_t->m; \
555 ++r_e_c_t) \ 585 ++r_e_c_t) \
556 rect_mapwalk (r_e_c_t, (ox), (oy)) 586 rect_mapwalk (r_e_c_t, (ox), (oy))
557 587
558#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 588#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
559 unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) 589 unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
560 590
561#endif 591#endif
562 592

Diff Legend

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