--- deliantra/server/common/map.C	2007/02/05 01:24:45	1.84
+++ deliantra/server/common/map.C	2007/02/07 23:50:01	1.85
@@ -22,12 +22,13 @@
  * The authors can be reached via e-mail at <crossfire@schmorp.de>
  */
 
-#include <global.h>
-#include <funcpoint.h>
-
-#include <loader.h>
 #include <unistd.h>
 
+#include "global.h"
+#include "funcpoint.h"
+
+#include "loader.h"
+
 #include "path.h"
 
 /*
@@ -570,14 +571,13 @@
   in_memory = MAP_SWAPPED;
 
   /* The maps used to pick up default x and y values from the
-   * map archetype.  Mimic that behaviour.
+   * map archetype. Mimic that behaviour.
    */
-  width         = 16;
-  height        = 16;
-  reset_timeout = 0;
-  timeout       = 300;
-  enter_x       = 0;
-  enter_y       = 0;
+  width      = 16;
+  height     = 16;
+  timeout    = 300;
+  max_nrof   = 1000;    // 1000 items of anything
+  max_volume = 2000000; // 2m³
 }
 
 maptile::maptile (int w, int h)
@@ -1278,6 +1278,17 @@
   faces [2] = floor;  faces_obj [2] = floor  != blank_face ? floor_obj  : 0;
 }
 
+uint64
+mapspace::volume () const
+{
+  uint64 vol = 0;
+
+  for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
+    vol += op->volume ();
+
+  return vol;
+}
+
 /* this updates the orig_map->tile_map[tile_num] value after finding
  * the map.  It also takes care of linking back the freshly found
  * maps tile_map values if it tiles back to this one.  It returns
@@ -1695,3 +1706,4 @@
   return ::region::default_region ();
 }
 
+