--- deliantra/server/include/object.h	2009/11/09 03:08:24	1.218
+++ deliantra/server/include/object.h	2009/11/10 05:05:22	1.220
@@ -167,9 +167,8 @@
   bool ACC (RW, flag[NUM_FLAGS]);
 #endif
 
-  shstr ACC (RW, materialname);	/* specific material name */
+  materialtype_t *material;	// What material this object consists of //TODO, make perl-accessible
   shstr ACC (RW, skill);	/* Name of the skill this object uses/grants */
-//  materialtype_t *ACC (RW, material);	/* What material this object consists of */
   object_ptr ACC (RW, owner);	/* Pointer to the object which controls this one */
   object_ptr ACC (RW, enemy);	/* Monster/player to follow even if not closest */
   object_ptr ACC (RW, attacked_by);	/* This object start to attack us! only player & monster */
@@ -491,15 +490,18 @@
   MTH void update_weight ();
 
   // return the dominant material of this item, always return something
-  const materialtype_t *dominant_material () const;
+  const materialtype_t *dominant_material () const
+  {
+    return material;
+  }
 
   // return the volume of this object in cm³
   MTH uint64 volume () const
   {
     return (uint64)total_weight ()
-           * 1000
-           * (type == CONTAINER ? 1000 : 1)
-           / dominant_material ()->density;
+           * 1024 // 1000 actually
+           * (type == CONTAINER ? 128 : 1)
+           / dominant_material ()->density; // ugh, division
   }
 
   MTH bool is_arch   () const { return this == (const object *)(const archetype *)arch; }