--- deliantra/server/common/arch.C	2008/05/04 18:46:01	1.80
+++ 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>
  */
@@ -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,7 +513,7 @@
         ++idx;
       else
         {
-          LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
+          LOG (llevDebug, "garbage collect arch %s", &at->archname);
           assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
 
@@ -532,22 +533,6 @@
   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)
-{
-  if (!at)
-    {
-      LOG (llevError, "Couldn't find archetype.\n");
-      return 0;
-    }
-
-  return at->instance ();
-}
-
 object *
 archetype::instance ()
 {
@@ -570,7 +555,7 @@
   if (!strcmp (name, "bug"))
     abort ();
 
-  object *op = archetype::get ("bug");
+  object *op = archetype::get (shstr_bug);
   op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
 
   return op;