--- deliantra/server/common/arch.C	2008/04/21 23:35:24	1.75
+++ deliantra/server/common/arch.C	2008/05/04 18:46:01	1.80
@@ -104,7 +104,7 @@
 
   for_all_archetypes (at)
     if (at->skill == skill_cmp && (type == -1 || type == at->type))
-      return arch_to_object (at);
+      return at->instance ();
 
   return 0;
 }
@@ -135,7 +135,7 @@
  * - a corresponding object if found; a singularity object if not found.
  * Note by MSW - it appears that it takes the full name and keeps
  * shortening it until it finds a match.  I re-wrote this so that it
- * doesn't malloc it each time - not that this function is used much,
+ * doesn't allocate it each time - not that this function is used much,
  * but it otherwise had a big memory leak.
  */
 object *
@@ -151,7 +151,7 @@
       tmpname[i] = 0;
 
       if (archetype *at = find_archetype_by_object_name (tmpname))
-        return arch_to_object (at);
+        return at->instance ();
     }
 
   return create_singularity (name);
@@ -513,11 +513,20 @@
       else
         {
           LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
-          assert (at->arch == at); // verify that refcnt == 1 is truely valid
+          assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
-          at->arch = 0;
-          at->more = 0;
+
+          // break chain
+          for (object *op = at->head_ (); op; )
+            {
+              object *next = op->more;
+              op->head = 0;
+              op->more = 0;
+              op = next;
+            }
+
           at->destroy ();
+          at->arch = 0;
         }
     }
   while (--cnt);
@@ -536,17 +545,15 @@
       return 0;
     }
 
-  object *op = at->clone ();
-  op->arch = at;
-  op->instantiate ();
-
-  return op;
+  return at->instance ();
 }
 
 object *
 archetype::instance ()
 {
-  return arch_to_object (this);
+  object *op = clone ();
+  op->instantiate ();
+  return op;
 }
 
 /*
@@ -563,11 +570,8 @@
   if (!strcmp (name, "bug"))
     abort ();
 
-  char buf[MAX_BUF];
-  sprintf (buf, "bug, please report (%s)", name);
-
-  object *op = get_archetype ("bug");
-  op->name = op->name_pl = buf;
+  object *op = archetype::get ("bug");
+  op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
 
   return op;
 }
@@ -579,12 +583,18 @@
 object *
 get_archetype (const char *name)
 {
-  archetype *at = archetype::find (name);
+  return archetype::get (name);
+}
+
+object *
+archetype::get (const char *name)
+{
+  archetype *at = find (name);
 
   if (!at)
     return create_singularity (name);
 
-  return arch_to_object (at);
+  return at->instance ();
 }
 
 /*
@@ -609,17 +619,15 @@
 object *
 clone_arch (int type)
 {
-  archetype *at;
+  archetype *at = type_to_archetype (type);
 
-  if ((at = type_to_archetype (type)) == NULL)
+  if (!at)
     {
       LOG (llevError, "Can't clone archetype %d\n", type);
       return 0;
     }
 
-  object *op = at->clone ();
-  op->instantiate ();
-  return op;
+  return at->instance ();
 }
 
 /*
@@ -632,7 +640,7 @@
 
   while (at)
     {
-      op = arch_to_object (at);
+      op = at->instance ();
 
       op->x = at->x;
       op->y = at->y;