--- deliantra/server/common/arch.C 2008/05/04 18:46:01 1.80 +++ deliantra/server/common/arch.C 2008/09/29 10:20:48 1.83 @@ -525,29 +525,14 @@ op = next; } - at->destroy (); + op->destroy_inv (false); + at->destroy (true); at->arch = 0; } } 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;