--- deliantra/server/common/map.C 2008/09/29 10:20:48 1.147 +++ deliantra/server/common/map.C 2008/09/29 10:32:50 1.149 @@ -353,8 +353,7 @@ else { f.parse_warn (format ("object %s out of range", op->debug_desc ())); - op->destroy_inv (false); // be explicit about dropping - op->destroy (true); + op->destroy (); } } @@ -715,10 +714,7 @@ unique = 1; if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) - { - op->destroy_inv (false); - op->destroy (true); - } + op->destroy (); op = above; } @@ -816,14 +812,11 @@ object *head = op->head_ (); if (op == head) - { - op->destroy_inv (false); - op->destroy (true); - } + op->destroy (); else if (head->map != op->map) { LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); - head->destroy (true); + head->destroy (); } } @@ -939,7 +932,7 @@ /* adjust overall chance below */ if (destroy && rndm (0, 1)) - op->destroy (true); + op->destroy (); } }