--- deliantra/server/server/gods.C 2008/09/25 04:09:57 1.38 +++ deliantra/server/server/gods.C 2008/09/29 10:20:49 1.39 @@ -194,14 +194,12 @@ && same_string (tmp->name, item->name) && same_string (tmp->title, item->title) && same_string (tmp->msg, item->msg) && same_string (tmp->slaying, item->slaying)) { - /* message */ - if (tmp->nrof > 1) - new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumble to dust!", query_short_name (tmp)); - else - new_draw_info_format (NDI_UNIQUE, 0, op, "The %s crumbles to dust!", query_short_name (tmp)); + new_draw_info_format (NDI_UNIQUE, 0, op, + tmp->nrof > 1 ? "The %s crumble to dust!" : "The %s crumbles to dust!", + query_short_name (tmp)); - tmp->destroy (); + tmp->destroy (true); } if (tmp->inv) @@ -440,7 +438,7 @@ } player_unready_range_ob (op->contr, item); - item->destroy (); + item->destroy (true); } } @@ -854,7 +852,7 @@ tmp = get_archetype (HOLY_POSSESSION); cast_change_ability (op, op, tmp, 0, 1); - tmp->destroy (); + tmp->destroy (true); return; } @@ -901,7 +899,7 @@ { object *tmp = archetype::get (item->slaying); int success = cast_heal (op, op, tmp, 0); - tmp->destroy (); + tmp->destroy (true); if (success) return; @@ -950,7 +948,7 @@ if (depl->stats.stat (i)) new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); - depl->destroy (); + depl->destroy (true); op->update_stats (); return; } @@ -1157,7 +1155,7 @@ else LOG (llevError, "BUG: tailor_god_spell(): no god\n"); - spellop->destroy (); + spellop->destroy (true); return 0; }