--- deliantra/server/common/arch.C 2008/05/04 18:46:01 1.80 +++ deliantra/server/common/arch.C 2008/10/05 14:54:05 1.86 @@ -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); @@ -532,22 +532,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 +554,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;