--- deliantra/server/include/map.h 2007/01/18 16:19:34 1.54 +++ deliantra/server/include/map.h 2007/02/15 21:07:49 1.67 @@ -49,13 +49,6 @@ #define MAP_LAYERS 3 -/* options passed to ready_map_name and load_original_map */ -#define MAP_FLUSH 0x01 -#define MAP_PLAYER_UNIQUE 0x02 -#define MAP_BLOCK 0x04 -#define MAP_STYLE 0x08 -#define MAP_OVERLAY 0x10 - /* Values for in_memory below. Should probably be an enumerations */ enum { MAP_IN_MEMORY, @@ -85,7 +78,7 @@ * should almost always be using out_of_map instead, which takes into account * map tiling. */ -#define OUT_OF_REAL_MAP(M,X,Y) !(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)) +#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) /* These are used in the MapLook flags element. They are not used in * in the object flags structure. @@ -127,7 +120,7 @@ struct mapspace { object *bot, *top; /* lowest/highest object on this space */ - New_Face *faces[MAP_LAYERS]; /* faces for the 3 layers */ + facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */ object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ uint8 flags_; /* flags about this space (see the P_ values above) */ sint8 light; /* How much light this space provides */ @@ -162,6 +155,9 @@ return 0; } + + // return the item volume on this mapspace in cm³ + uint64 volume () const; }; /* @@ -171,30 +167,36 @@ INTERFACE_CLASS (region) struct region : zero_initialised { - struct region *ACC (RW, next); /* pointer to next region, NULL for the last one */ - char *ACC (RW, name); /* Shortend name of the region as maps refer to it */ - char *ACC (RW, parent_name); /* - * So that parent and child regions can be defined in - * any order, we keep hold of the parent_name during - * initialisation, and the children get assigned to their - * parents later. (before runtime on the server though) - * nothing outside the init code should ever use this value. - */ - struct region *ACC (RW, parent); /* + shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */ + region *ACC (RW, parent); /* * Pointer to the region that is a parent of the current * region, if a value isn't defined in the current region * we traverse this series of pointers until it is. */ - char *ACC (RW, longname); /* Official title of the region, this might be defined + shstr ACC (RW, longname); /* Official title of the region, this might be defined * to be the same as name*/ - char *ACC (RW, msg); /* the description of the region */ + shstr ACC (RW, msg); /* the description of the region */ + shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ + int ACC (RW, index); uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ - sint8 ACC (RW, fallback); /* whether, in the event of a region not existing, - * this should be the one we fall back on as the default */ - char *ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ + bool ACC (RW, fallback); /* whether, in the event of a region not existing, + * this should be the one we fall back on as the default */ + + static region *default_region (); + static region *find (const char *name); + static region *find_fuzzy (const char *name); + static region *load (object_thawer &f); }; +typedef object_vector regionvec; + +extern regionvec regions; + +#define for_all_regions(var) \ + for (int _i = 0; _i < regions.size (); ++_i) \ + declvar (region *, var, regions [_i]) + struct shopitems : zero_initialised { const char *name; /* name of the item in question, null if it is the default item */ @@ -225,11 +227,13 @@ { sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ struct mapspace *spaces; /* Array of spaces on this map */ + uint8 *regions; /* region index per mapspace, if != 0 */ + struct region **regionmap; /* index to region */ tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ shstr ACC (RW, name); /* Name of map as given by its creator */ - struct region *ACC (RW, region); /* What jurisdiction in the game world this map is ruled by + struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by * points to the struct containing all the properties of * the region */ double ACC (RW, reset_time); @@ -251,6 +255,7 @@ bool ACC (RW, per_player); bool ACC (RW, per_party); bool ACC (RW, outdoor); /* True if an outdoor map */ + bool ACC (RW, nodrop); /* avoid dropping anything on this map */ uint8 ACC (RW, darkness); /* indicates level of darkness of map */ uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ @@ -273,6 +278,8 @@ shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ shstr ACC (RW, path); /* Filename of the map */ + int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace + uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace MTH void activate (); MTH void deactivate (); @@ -299,6 +306,8 @@ MTH void clear_header (); MTH void clear_links_to (maptile *m); + MTH struct region *region (int x, int y) const; + // loas the header pseudo-object bool _load_header (object_thawer &thawer); MTH bool _load_header (const char *path); @@ -376,13 +385,14 @@ //TODO: these should be refactored into things like xy_normalise // and so on. -int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); -int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); -int out_of_map(maptile *m, int x, int y); -maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); -void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); -void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); -int on_same_map(const object *op1, const object *op2); +int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); +int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y); +int out_of_map (maptile *m, int x, int y); +maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); +void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); +void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); +int on_same_map (const object *op1, const object *op2); +int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); // adjust map, x and y for tiled maps and return true if the position is valid at all inline bool