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.136 by root, Sat Apr 23 04:56:49 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_ACTIVE,
… …
131 sint8 ACC (RW, light); /* How much light this space provides */ 134 sint8 ACC (RW, light); /* How much light this space provides */
132 MoveType ACC (RW, move_block); /* What movement types this space blocks */ 135 MoveType ACC (RW, move_block); /* What movement types this space blocks */
133 MoveType ACC (RW, move_slow); /* What movement types this space slows */ 136 MoveType ACC (RW, move_slow); /* What movement types this space slows */
134 MoveType ACC (RW, move_on); /* What movement types are activated */ 137 MoveType ACC (RW, move_on); /* What movement types are activated */
135 MoveType ACC (RW, move_off); /* What movement types are activated */ 138 MoveType ACC (RW, move_off); /* What movement types are activated */
136 uint16_t ACC (RW, nrof_); // saturates at 64k 139 uint16_t ACC (RW, items_); // saturates at 64k
137 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) 140 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 141 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 142 static uint32_t ACC (RW, smellcount); // global smell counter
140 143
141 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems 144 uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
… …
151 assert (sint8 (-1 & ~P_UPTODATE) >= 0); 154 assert (sint8 (-1 & ~P_UPTODATE) >= 0);
152 155
153 if (expect_false (sint8 (flags_) >= 0)) 156 if (expect_false (sint8 (flags_) >= 0))
154 update_ (); 157 update_ ();
155 158
156 // must be true by now 159 // must be true by now (gcc seems content with only the second test)
157 assume (sint8 (flags_) < 0); 160 assume (sint8 (flags_) < 0);
158 assume (flags_ & P_UPTODATE); 161 assume (flags_ & P_UPTODATE);
159 } 162 }
160 163
161 MTH uint8 flags () 164 MTH uint8 flags ()
… …
180 op = 0; 183 op = 0;
181 184
182 return op; 185 return op;
183 } 186 }
184 187
185 MTH uint32 nrof () 188 MTH uint32 items()
186 { 189 {
187 update (); 190 update ();
188 return nrof_; 191 return items_;
189 } 192 }
190 193
191 // return the item volume on this mapspace in cm³ 194 // return the item volume on this mapspace in cm³
192 MTH uint64 volume () 195 MTH uint64 volume ()
193 { 196 {
… …
204 { 207 {
205 return blocks (op->move_type); 208 return blocks (op->move_type);
206 } 209 }
207}; 210};
208 211
209// a rectangular area of a map 212// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
210struct maprect 213struct maprect
211{ 214{
212 maptile *m; 215 maptile *m;
213 int x0, y0; 216 int x0, y0;
214 int x1, y1; 217 int x1, y1;
… …
281 static sint8 outdoor_darkness; /* the global darkness level outside */ 284 static sint8 outdoor_darkness; /* the global darkness level outside */
282 285
283 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 */
284 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 */
285 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 288 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 */ 289 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 */ 290 shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
295 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 291 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
296 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 292 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
297 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 293 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
298 shstr ACC (RW, msg); /* Message map creator may have left */ 294 shstr ACC (RW, msg); /* Message map creator may have left */
299 shstr ACC (RW, maplore); /* Map lore information */ 295 shstr ACC (RW, maplore); /* Map lore information */
300 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 296 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
301 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 297 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
302 shstr ACC (RW, path); /* Filename of the map */ 298 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 299 uint64 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 300 int ACC (RW, max_items); // maximum number of items on a mapspace
306 301
307//-GPL 302//-GPL
308 303
… …
320 // allocates all (empty) mapspace 315 // allocates all (empty) mapspace
321 MTH void alloc (); 316 MTH void alloc ();
322 // deallocates the mapspaces (and destroys all objects) 317 // deallocates the mapspaces (and destroys all objects)
323 MTH void clear (); 318 MTH void clear ();
324 319
320 MTH void post_load (); // update cached values in mapspaces etc.
325 MTH void fix_auto_apply (); 321 MTH void fix_auto_apply ();
326 MTH void do_decay_objects (); 322 MTH void do_decay_objects ();
327 MTH void update_buttons (); 323 MTH void update_buttons ();
328 MTH int change_map_light (int change); 324 MTH int change_map_light (int change);
329 MTH int estimate_difficulty () const; 325 MTH int estimate_difficulty () const;
330 326
331 MTH void play_sound (faceidx sound, int x, int y) const; 327 MTH void play_sound (faceidx sound, int x, int y) const;
332 MTH void say_msg (const char *msg, int x, int y) const; 328 MTH void say_msg (const_utf8_string msg, int x, int y) const;
333 329
334 // connected links 330 // connected links
335 oblinkpt *find_link (shstr_tmp id); 331 oblinkpt *find_link (shstr_tmp id);
336 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0); 332 MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
337 333
… …
355 bool _load_objects (object_thawer &thawer); 351 bool _load_objects (object_thawer &thawer);
356 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); } 352 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
357 353
358 // save objects into the given file (uses IO_ flags) 354 // save objects into the given file (uses IO_ flags)
359 bool _save_objects (object_freezer &freezer, int flags); 355 bool _save_objects (object_freezer &freezer, int flags);
360 MTH bool _save_objects (const char *path, int flags); 356 MTH bool _save_objects (const_octet_string path, int flags);
361 357
362 // save the header pseudo object _only_ 358 // save the header pseudo object _only_
363 bool _save_header (object_freezer &freezer); 359 bool _save_header (object_freezer &freezer);
364 MTH bool _save_header (const char *path); 360 MTH bool _save_header (const_octet_string path);
365 361
366 maptile (); 362 maptile ();
367 maptile (int w, int h); 363 maptile (int w, int h);
364 void init ();
368 ~maptile (); 365 ~maptile ();
369 366
370 void do_destroy (); 367 void do_destroy ();
371 void gather_callbacks (AV *&callbacks, event_type event) const; 368 void gather_callbacks (AV *&callbacks, event_type event) const;
372 369
… …
393 { 390 {
394 if (!spaces) 391 if (!spaces)
395 do_load_sync (); 392 do_load_sync ();
396 } 393 }
397 394
398 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);
399 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
400 397
401 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
402 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 399 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 400 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; 401 object *pick_random_object (rand_gen &gen = rndm) const;
405 402
406 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]; }
407 404
408 // return an array of maprects corresponding 405 // return an array of maprects corresponding
409 // to the given rectangular area. the last rect will have 406 // to the given rectangular area. the last rect will have
410 // a 0 map pointer. 407 // 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); 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;
414}; 411};
412
413inline bool
414object::is_in_shop () const
415{
416 return is_on_map ()
417 && map->is_in_shop (x, y);
418}
415 419
416//+GPL 420//+GPL
417 421
418/* This is used by get_rangevector to determine where the other 422/* This is used by get_rangevector to determine where the other
419 * creature is. get_rangevector takes into account map tiling, 423 * creature is. get_rangevector takes into account map tiling,
… …
438// and so on. 442// and so on.
439int 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);
440int out_of_map (maptile *m, int x, int y); 444int out_of_map (maptile *m, int x, int y);
441maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 445maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
442void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 446void 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*/); 447void 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); 448int on_same_map (const object *op1, const object *op2);
445int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 449int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
446 450
447// 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
448static inline bool 452static inline bool
449xy_normalise (maptile *&map, sint16 &x, sint16 &y) 453xy_normalise (maptile *&map, sint16 &x, sint16 &y)
450{ 454{
… …
554 558
555#define ordered_mapwalk_end \ 559#define ordered_mapwalk_end \
556 } \ 560 } \
557 } 561 }
558 562
563extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
564
559// loop over every space in the given maprect, 565// 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 566// 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" 567// the iterator code must be a single statement following this macro call, similar to "if"
562// "continue" will skip to the next space 568// "continue" will skip to the next space
563#define rect_mapwalk(rect,dx0,dy0) \ 569#define rect_mapwalk(rect,dx0,dy0) \
… …
569 575
570// 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
571// order (unorded), but is likely faster. 577// 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 578// 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 579// "continue" will skip to the next space
574#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ 580#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
575 for (maprect *r_e_c_t = (map)->split_to_tiles ( \ 581 for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
576 (ox) + (dx0) , (oy) + (dy0) , \ 582 (ox) + (dx0) , (oy) + (dy0) , \
577 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ 583 (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
578 r_e_c_t->m; \ 584 r_e_c_t->m; \
579 ++r_e_c_t) \ 585 ++r_e_c_t) \
580 rect_mapwalk (r_e_c_t, (ox), (oy)) 586 rect_mapwalk (r_e_c_t, (ox), (oy))
581 587
582#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ 588#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \
583 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)
584 590
585#endif 591#endif
586 592

Diff Legend

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