--- deliantra/server/server/time.C 2008/09/29 10:31:32 1.81 +++ deliantra/server/server/time.C 2008/09/29 10:32:51 1.82 @@ -151,7 +151,7 @@ return; } - op->destroy (true); + op->destroy (); } void @@ -173,7 +173,7 @@ op->env->update_stats (); } - op->destroy (true); + op->destroy (); } void @@ -190,7 +190,7 @@ op->env->update_stats (); } - op->destroy (true); + op->destroy (); } void @@ -198,7 +198,7 @@ { if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0) { - op->destroy (true); + op->destroy (); return; } @@ -214,7 +214,7 @@ new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now."); } - op->destroy (true); + op->destroy (); return; } @@ -545,7 +545,7 @@ return NULL; payload->remove (); - op->destroy (true); + op->destroy (); return payload; } @@ -582,7 +582,7 @@ if (rndm (0, 99) < op->stats.food) { /* Small chance of breaking */ - op->destroy (true); + op->destroy (); return NULL; } @@ -638,7 +638,7 @@ payload->owner = 0; insert_ob_in_map (payload, op->map, payload, 0); - op->destroy (true); + op->destroy (); } else { @@ -659,7 +659,7 @@ if (!op->map) { LOG (llevError, "BUG: Arrow had no map.\n"); - op->destroy (true); + op->destroy (); return; } @@ -676,7 +676,7 @@ */ if (!op->inv) { - op->destroy (true); + op->destroy (); return; } @@ -865,7 +865,7 @@ { j = find_first_free_spot (tmp, op->map, op->x, op->y); if (j < 0) /* No free spot */ - tmp->destroy (true); + tmp->destroy (); else { mapxy pos (op); pos.move (j); @@ -876,7 +876,7 @@ } } - op->destroy (true); + op->destroy (); } void @@ -923,7 +923,7 @@ if (out_of_map (head->map, EXIT_X (head), EXIT_Y (head))) { LOG (llevError, "Removed illegal teleporter.\n"); - head->destroy (true); + head->destroy (); return; } @@ -1127,7 +1127,7 @@ if (op->other_arch->archname == tmp->arch->archname) { if (op->level <= 0) - tmp->destroy (true); + tmp->destroy (); else { uint64 new_nrof = (uint64) tmp->nrof * op->level; @@ -1233,7 +1233,7 @@ { /* remove an old force with a slaying field == op->name */ if (object *force = tmp->force_find (op->name)) - force->destroy (true); + force->destroy (); if (!tmp->force_find (op->slaying)) { @@ -1249,7 +1249,7 @@ if (op->stats.hp == 0) { /* marker expires--granted mark number limit */ - op->destroy (true); + op->destroy (); return; } }