--- deliantra/server/include/map.h 2007/02/01 19:15:39 1.64 +++ deliantra/server/include/map.h 2007/02/17 23:32:11 1.69 @@ -155,6 +155,9 @@ return 0; } + + // return the item volume on this mapspace in cm³ + uint64 volume () const; }; /* @@ -183,6 +186,7 @@ static region *default_region (); static region *find (const char *name); static region *find_fuzzy (const char *name); + static region *read (object_thawer &f); }; typedef object_vector regionvec; @@ -274,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 (); @@ -351,9 +357,10 @@ void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); bool generate_random_map (random_map_params *RP); - static maptile *find_sync (const char *path, maptile *original = 0);//PERL - // async prefetch static maptile *find_async (const char *path, maptile *original = 0);//PERL + static maptile *find_sync (const char *path, maptile *original = 0);//PERL + static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL + MTH object *pick_random_object () const; mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }