--- deliantra/server/common/map.C	2009/11/08 16:13:45	1.171
+++ deliantra/server/common/map.C	2009/11/08 20:55:39	1.172
@@ -451,7 +451,7 @@
   height     = 16;
   timeout    = 300;
   max_nrof   = 1000;    // 1000 items of anything
-  max_items  = 25;
+  max_items  = MAX_ITEM_PER_ACTION;
   max_volume = 2000000; // 2m³
 }
 
@@ -1034,7 +1034,7 @@
   sint8 light = 0;
   MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
   uint64_t volume = 0;
-  uint32_t nrof = 0;
+  uint32_t items = 0;
   object *anywhere = 0;
 
   //object *middle = 0;
@@ -1075,13 +1075,13 @@
                   top    = 0;
                   floor  = tmp;
                   volume = 0;
-                  nrof   = 0;
+                  items  = 0;
                 }
               else
                 {
                   if (expect_true (!tmp->flag [FLAG_NO_PICK]))
                     {
-                      ++nrof;
+                      ++items;
                       volume += tmp->volume ();
                     }
 
@@ -1126,8 +1126,8 @@
   this->move_on    = move_on;
   this->move_off   = move_off;
   this->move_slow  = move_slow;
-  this->volume_    = volume / 1024;
-  this->nrof_      = upos_min (nrof, 65535); // assume nrof <= 2**31
+  this->volume_    = (volume + 1023) / 1024;
+  this->items_     = upos_min (items, 65535); // assume nrof <= 2**31
 
   /* At this point, we have a floor face (if there is a floor),
    * and the floor is set - we are not going to touch it at