--- deliantra/server/common/object.C 2008/09/29 09:04:50 1.258 +++ deliantra/server/common/object.C 2008/09/29 10:32:50 1.259 @@ -911,7 +911,7 @@ || ms ().move_block == MOVE_ALL) { while (inv) - inv->destroy (true); + inv->destroy (); } else { /* Put objects in inventory onto this space */ @@ -925,7 +925,7 @@ || op->type == TRAP || op->flag [FLAG_IS_A_TEMPLATE] || op->flag [FLAG_DESTROY_ON_DEATH]) - op->destroy (true); + op->destroy (); else map->insert (op, x, y); } @@ -985,7 +985,7 @@ if (more) { - more->destroy (true); + more->destroy (); more = 0; } @@ -1193,7 +1193,7 @@ op->weight = 0; // cancel the addition above op->carrying = 0; // must be 0 already - op->destroy (true); + op->destroy (); return top; } @@ -1288,7 +1288,7 @@ */ if (!xy_normalise (m, op->x, op->y)) { - op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found + op->head_ ()->destroy ();// remove head_ once all tail object destroyers found return 0; } @@ -1311,7 +1311,7 @@ // but some caller surely breaks when we return tmp // from here :/ op->nrof += tmp->nrof; - tmp->destroy (true); + tmp->destroy (); } CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ @@ -1496,7 +1496,7 @@ for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ - tmp->destroy (true); + tmp->destroy (); object *tmp = arch_to_object (archetype::find (arch_string)); @@ -1629,7 +1629,7 @@ adjust_weight (this, op->total_weight ()); - op->destroy (true); + op->destroy (); op = tmp; goto inserted; } @@ -2488,7 +2488,7 @@ // remove the "Close old_container" object. if (object *closer = old_container->inv) if (closer->type == CLOSE_CON) - closer->destroy (true); + closer->destroy (); #endif // make sure the container is available @@ -2554,7 +2554,7 @@ object::force_add (const shstr name, int duration) { if (object *force = force_find (name)) - force->destroy (true); + force->destroy (); object *force = get_archetype (FORCE_NAME);