--- deliantra/server/include/object.h	2008/04/20 00:44:12	1.160
+++ deliantra/server/include/object.h	2008/04/20 22:03:21	1.162
@@ -386,7 +386,7 @@
 
   uint64 total_weight () const
   {
-    return weight * number_of ();
+    return weight * number_of () + carrying;
   }
 
   // return the dominant material of this item, always return something
@@ -594,7 +594,8 @@
 INTERFACE_CLASS (archetype)
 struct archetype : object
 {
-  static archetype *empty; // the empty_archetype
+  static arch_ptr empty; // the empty_archetype
+  MTH static void gc ();
 
   archetype (const char *name);
   ~archetype ();