--- deliantra/server/common/arch.C	2008/05/02 16:16:02	1.78
+++ deliantra/server/common/arch.C	2009/10/12 14:00:57	1.89
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -104,7 +105,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;
 }
@@ -151,7 +152,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);
@@ -260,7 +261,7 @@
       else if (strcasecmp (cp, op->name) == 0 && !count)
         retval = 4;
       /* Check for partial custom name, but give a real low priority */
-      else if (op->custom_name && strstr (op->custom_name, cp))
+      else if (op->custom_name.contains (cp))
         retval = 3;
 
       if (retval)
@@ -442,7 +443,7 @@
 
 fail:
   for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy (true);
+    (*p)->destroy ();
 
   return 0;
 }
@@ -512,8 +513,8 @@
         ++idx;
       else
         {
-          LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
-          assert (at->arch == at); // verify that refcnt == 1 is truely valid
+          LOG (llevDebug, "garbage collect arch %s", &at->archname);
+          assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
 
           // break chain
@@ -532,32 +533,14 @@
   while (--cnt);
 }
 
-/*
- * Creates and returns a new object which is a copy of the given archetype.
- * This function returns NULL on failure.
- */
 object *
-arch_to_object (archetype *at)
+archetype::instance ()
 {
-  if (!at)
-    {
-      LOG (llevError, "Couldn't find archetype.\n");
-      return 0;
-    }
-
-  object *op = at->clone ();
-  op->arch = at;
+  object *op = clone ();
   op->instantiate ();
-
   return op;
 }
 
-object *
-archetype::instance ()
-{
-  return arch_to_object (this);
-}
-
 /*
  * Creates an object.  This function is called by get_archetype()
  * if it fails to find the appropriate archetype.
@@ -572,11 +555,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 (shstr_bug);
+  op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
 
   return op;
 }
@@ -588,18 +568,18 @@
 object *
 get_archetype (const char *name)
 {
-  archetype *at = archetype::find (name);
-
-  if (!at)
-    return create_singularity (name);
-
-  return arch_to_object (at);
+  return archetype::get (name);
 }
 
 object *
 archetype::get (const char *name)
 {
-  return get_archetype (name);
+  archetype *at = find (name);
+
+  if (!at)
+    return create_singularity (name);
+
+  return at->instance ();
 }
 
 /*
@@ -624,17 +604,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 ();
 }
 
 /*
@@ -647,7 +625,7 @@
 
   while (at)
     {
-      op = arch_to_object (at);
+      op = at->instance ();
 
       op->x = at->x;
       op->y = at->y;