--- deliantra/server/common/arch.C	2008/09/29 10:20:48	1.83
+++ deliantra/server/common/arch.C	2009/01/01 11:41:17	1.87
@@ -260,7 +260,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 && op->custom_name.contains (cp))
         retval = 3;
 
       if (retval)
@@ -442,7 +442,7 @@
 
 fail:
   for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy (true);
+    (*p)->destroy ();
 
   return 0;
 }
@@ -512,7 +512,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);
 
@@ -525,8 +525,7 @@
               op = next;
             }
 
-          op->destroy_inv (false);
-          at->destroy (true);
+          at->destroy ();
           at->arch = 0;
         }
     }