--- deliantra/server/common/map.C 2010/04/15 21:49:15 1.187 +++ deliantra/server/common/map.C 2010/04/16 02:32:25 1.188 @@ -424,30 +424,35 @@ return freezer.save (path); } -maptile::maptile () +void +maptile::init () { in_memory = MAP_SWAPPED; /* The maps used to pick up default x and y values from the * map archetype. Mimic that behaviour. */ - width = 16; - height = 16; - timeout = 300; - max_items = MAX_ITEM_PER_ACTION; - max_volume = 2000000; // 2m³ + width = 16; + height = 16; + timeout = 300; + max_items = MAX_ITEM_PER_ACTION; + max_volume = 2000000; // 2m³ + reset_timeout = 0; + enter_x = 0; + enter_y = 0; +} + +maptile::maptile () +{ + init (); } maptile::maptile (int w, int h) { - in_memory = MAP_SWAPPED; + init (); - width = w; - height = h; - reset_timeout = 0; - timeout = 300; - enter_x = 0; - enter_y = 0; + width = w; + height = h; alloc (); }