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.131 by root, Sun Apr 4 02:51:56 2010 UTC vs.
Revision 1.135 by root, Fri Apr 22 06:10:33 2011 UTC

… …
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,
… …
288 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ 291 double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
289 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */ 292 sint64 ACC (RW, shopmin); /* minimum price a shop will trade for */
290 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ 293 sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
291 shstr ACC (RW, msg); /* Message map creator may have left */ 294 shstr ACC (RW, msg); /* Message map creator may have left */
292 shstr ACC (RW, maplore); /* Map lore information */ 295 shstr ACC (RW, maplore); /* Map lore information */
293 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 296 shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
294 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 297 maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
295 shstr ACC (RW, path); /* Filename of the map */ 298 shstr ACC (RW, path); /* Filename of the map */
296 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
297 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
298 301
299//-GPL 302//-GPL
… …
356 bool _save_header (object_freezer &freezer); 359 bool _save_header (object_freezer &freezer);
357 MTH bool _save_header (const_octet_string path); 360 MTH bool _save_header (const_octet_string path);
358 361
359 maptile (); 362 maptile ();
360 maptile (int w, int h); 363 maptile (int w, int h);
364 void init ();
361 ~maptile (); 365 ~maptile ();
362 366
363 void do_destroy (); 367 void do_destroy ();
364 void gather_callbacks (AV *&callbacks, event_type event) const; 368 void gather_callbacks (AV *&callbacks, event_type event) const;
365 369
… …
386 { 390 {
387 if (!spaces) 391 if (!spaces)
388 do_load_sync (); 392 do_load_sync ();
389 } 393 }
390 394
391 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);
392 bool generate_random_map (random_map_params *RP); 396 bool generate_random_map (random_map_params *RP);
393 397
394 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL 398 static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
395 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL 399 static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
396 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL 400 static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
… …
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{

Diff Legend

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