--- src-orig/squelch.c Wed Jul 24 15:19:18 2002 +++ src/squelch.c Wed Jan 1 04:12:03 2003 @@ -733,6 +733,7 @@ void destroy_squelched_items(void) int floor_num, floor_list[24]; int n; int count=0; + char o_name[80]; object_type *o_ptr; @@ -754,6 +755,9 @@ void destroy_squelched_items(void) if (item_tester_okay(o_ptr)) { + object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0); + message_format(MSG_SUCCEED, 0, "The %s squelched on floor.", o_name); + /* Destroy item */ floor_item_increase(floor_list[n], -o_ptr->number); floor_item_optimize(floor_list[n]); @@ -781,6 +785,9 @@ void destroy_squelched_items(void) /* Give this item slot a shot at death */ if (item_tester_okay(o_ptr)) { + object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0); + message_format(MSG_SUCCEED, 0, "The %s squelched in inventory.", o_name); + /* Destroy item */ inven_item_increase(n, -o_ptr->number); inven_item_optimize(n); @@ -792,18 +799,12 @@ void destroy_squelched_items(void) item_tester_hook = NULL; - /* message */ if (count > 0) { - message_format(MSG_SUCCEED, 0, "%d item%s squelched.", - count, ((count > 1) ? "s" : "")); - /* Combine / Reorder the pack (later) */ p_ptr->notice |= (PN_COMBINE | PN_REORDER); } - else message(MSG_FAIL, 0, "No squelched items to destroy."); - return; } - +