--- deliantra/server/include/object.h	2007/11/08 19:43:24	1.153
+++ deliantra/server/include/object.h	2008/04/20 23:25:09	1.163
@@ -67,6 +67,9 @@
 
 extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
 
+#define NUM_COINS 4             /* number of coin types */
+extern const char *const coins[NUM_COINS + 1];
+
 /*
  * Each object (this also means archetypes!) could have a few of these
  * "dangling" from it; this could also end up containing 'parse errors'.
@@ -87,15 +90,36 @@
 {
   uint64 seq;
 
+  static UUID cur; // last uuid generated
+  static void init ();
+  static UUID gen ();
+
   UUID () { }
   UUID (uint64 seq) : seq(seq) { }
   operator uint64() { return seq; }
   void operator =(uint64 seq) { this->seq = seq; }
-};
 
-extern void init_uuid ();
-extern UUID gen_uuid ();
-extern const uint64 UUID_SKIP;
+  typedef char BUF [32];
+
+  bool parse (const char *s)
+  {
+    return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
+  }
+
+  const char *c_str (char *buf, int len) const
+  {
+    snprintf (buf, len, "<1.%" PRIx64 ">", seq);
+
+    return buf;
+  }
+
+  const char *c_str () const
+  {
+    static BUF buf;
+
+    return c_str (buf, sizeof (buf));
+  }
+};
 
 /* Definition for WILL_APPLY values.  Replaces having harcoded values
  * sprinkled in the code.  Note that some of these also replace fields
@@ -355,21 +379,23 @@
   MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
   const char *flag_desc (char *desc, int len) const;
 
-  int number_of () const
+  MTH int number_of () const
   {
     return nrof ? nrof : 1;
   }
 
-  uint64 total_weight () const
+  MTH sint32 total_weight () const
   {
-    return weight * number_of ();
+    return weight * number_of () + carrying;
   }
 
+  MTH void update_weight ();
+
   // return the dominant material of this item, always return something
   const materialtype_t *dominant_material () const;
 
   // return the volume of this object in cm³
-  uint64 volume () const
+  MTH uint64 volume () const
   {
     return total_weight ()
            * 1000
@@ -403,6 +429,14 @@
    */
   MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
 
+  // returns the outermost environment, never returns 0
+  MTH object *outer_env ()
+  {
+    for (object *op = this; ; op = op->env)
+      if (!op->env)
+        return op;
+  }
+
   // returns the player that has this object in his inventory, or 0
   MTH object *in_player () const
   {
@@ -447,7 +481,7 @@
   MTH void activate_recursive   ();
   MTH void deactivate_recursive ();
 
-  // set the givne flag on all objects in the inventory recursively
+  // set the given flag on all objects in the inventory recursively
   MTH void set_flag_inv (int flag, int value = 1);
 
   void enter_exit (object *exit);//Perl
@@ -550,7 +584,7 @@
 typedef struct oblinkpt
 {				/* Used to link together several object links */
   struct oblnk *link;
-  long value;			/* Used as connected value in buttons/gates */
+  sint32 value;			/* Used as connected value in buttons/gates */
   struct oblinkpt *next;
 } oblinkpt;
 
@@ -570,13 +604,13 @@
 INTERFACE_CLASS (archetype)
 struct archetype : object
 {
+  static arch_ptr empty; // the empty_archetype
+  MTH static void gc ();
+
   archetype (const char *name);
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  static archetype *read (object_thawer &f);
-
-  MTH static archetype *get  (const_utf8_string name); // find or create
   MTH static archetype *find (const_utf8_string name);
 
   MTH void link   ();
@@ -586,10 +620,14 @@
 
   object_vector_index ACC (RW, archid);         // index in archvector
   shstr ACC (RW, archname);		   	/* More definite name, like "generate_kobold" */
-  bool ACC (RW, stub);                          // if true, this is an invalid archetype
 
   sint8 ACC (RW, min_x), ACC (RW, min_y);       /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
   sint8 ACC (RW, max_x), ACC (RW, max_y);       
+
+  // support for archetype loading
+  static archetype *read (object_thawer &f);
+  MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
+  static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone  other_arch reference */
 };
 
 inline void