diff options
-rw-r--r-- | lib/help/command.txt | 3 | ||||
-rw-r--r-- | lib/help/option.txt | 7 | ||||
-rw-r--r-- | lib/mods/theme/help/command.txt | 3 | ||||
-rw-r--r-- | lib/mods/theme/help/option.txt | 7 | ||||
-rw-r--r-- | lib/mods/theme/user/all.prf | 3 | ||||
-rw-r--r-- | src/cmd3.cc | 9 | ||||
-rw-r--r-- | src/externs.h | 1 | ||||
-rw-r--r-- | src/spells2.cc | 9 | ||||
-rw-r--r-- | src/tables.cc | 3 | ||||
-rw-r--r-- | src/variable.cc | 1 |
10 files changed, 8 insertions, 38 deletions
diff --git a/lib/help/command.txt b/lib/help/command.txt index b7632f0a..6d457697 100644 --- a/lib/help/command.txt +++ b/lib/help/command.txt @@ -518,8 +518,7 @@ for a quantity will convert any "letters" into the maximal legal value. [[[[[GDestroy an item (k) or Destroy an item (^D)] This destroys an item in your inventory or on the dungeon floor. If the selected pile contains multiple objects, you may specify - a quantity. You must always verify this command, unless the item - is cursed or worthless and the option "auto_destroy" is set. + a quantity. You must always verify this command. ~~~~~42 [[[[[GWear/Wield equipment (w)] To wear or wield an object in your inventory, use this command. diff --git a/lib/help/option.txt b/lib/help/option.txt index 4807fe10..c953a0a5 100644 --- a/lib/help/option.txt +++ b/lib/help/option.txt @@ -180,13 +180,6 @@ off at will during the course of the game. dies. If this option is not selected, the "You die." message is displayed instead. -#####GNo query to destroy known worthless items [auto_destroy] - It can sometimes be annoying that the Destroy command asks for confirmation - when you are attempting to destroy a Broken sword {cursed}. If this option - is set, no confirmation will be asked if you attempt to destroy an object - which you know to be worthless. Of course, cursed artifacts cannot be - destroyed even if this option is set. - #####GConfirm to wear/wield known cursed items [confirm_wear] Some players may occasionally, due to a typing mistake, find themselves wearing an item which they knew was cursed. If this option is set, you diff --git a/lib/mods/theme/help/command.txt b/lib/mods/theme/help/command.txt index b7632f0a..6d457697 100644 --- a/lib/mods/theme/help/command.txt +++ b/lib/mods/theme/help/command.txt @@ -518,8 +518,7 @@ for a quantity will convert any "letters" into the maximal legal value. [[[[[GDestroy an item (k) or Destroy an item (^D)] This destroys an item in your inventory or on the dungeon floor. If the selected pile contains multiple objects, you may specify - a quantity. You must always verify this command, unless the item - is cursed or worthless and the option "auto_destroy" is set. + a quantity. You must always verify this command. ~~~~~42 [[[[[GWear/Wield equipment (w)] To wear or wield an object in your inventory, use this command. diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt index 7ff99da6..e98e5c31 100644 --- a/lib/mods/theme/help/option.txt +++ b/lib/mods/theme/help/option.txt @@ -180,13 +180,6 @@ off at will during the course of the game. dies. If this option is not selected, the "You die." message is displayed instead. -#####GNo query to destroy known worthless items [auto_destroy] - It can sometimes be annoying that the Destroy command asks for confirmation - when you are attempting to destroy a Broken sword {cursed}. If this option - is set, no confirmation will be asked if you attempt to destroy an object - which you know to be worthless. Of course, cursed artifacts cannot be - destroyed even if this option is set. - #####GConfirm to wear/wield known cursed items [confirm_wear] Some players may occasionally, due to a typing mistake, find themselves wearing an item which they knew was cursed. If this option is set, you diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf index 6447c1b9..5d036e39 100644 --- a/lib/mods/theme/user/all.prf +++ b/lib/mods/theme/user/all.prf @@ -83,9 +83,6 @@ Y:alert_failure # Option 'Get last words when the character dies' Y:last_words -# Option 'No query to destroy known worthless items' -Y:auto_destroy - # Option 'Confirm to wear/wield known cursed items' Y:confirm_wear diff --git a/src/cmd3.cc b/src/cmd3.cc index acb0ac73..efb17cf2 100644 --- a/src/cmd3.cc +++ b/src/cmd3.cc @@ -617,12 +617,9 @@ void do_cmd_destroy(void) /* Verify unless quantity given */ if (!force) { - if (!((auto_destroy) && (object_value(o_ptr) < 1))) - { - /* Make a verification */ - strnfmt(out_val, 160, "Really destroy %s? ", o_name); - if (!get_check(out_val)) return; - } + /* Make a verification */ + strnfmt(out_val, 160, "Really destroy %s? ", o_name); + if (!get_check(out_val)) return; } /* Take no time, just like the automatizer */ diff --git a/src/externs.h b/src/externs.h index cd8f31d0..c5fd4c73 100644 --- a/src/externs.h +++ b/src/externs.h @@ -211,7 +211,6 @@ extern bool_ view_yellow_lite; extern bool_ view_bright_lite; extern bool_ view_granite_lite; extern bool_ view_special_lite; -extern bool_ auto_destroy; extern bool_ wear_confirm; extern bool_ confirm_stairs; extern bool_ disturb_pets; diff --git a/src/spells2.cc b/src/spells2.cc index 3f12b613..a5add8d4 100644 --- a/src/spells2.cc +++ b/src/spells2.cc @@ -626,12 +626,9 @@ bool_ alchemy(void) /* Turns an object into gold, gain some of its value in a sh /* Verify unless quantity given */ if (!force) { - if (!((auto_destroy) && (object_value(o_ptr) < 1))) - { - /* Make a verification */ - sprintf(out_val, "Really turn %s to gold? ", o_name); - if (!get_check(out_val)) return FALSE; - } + /* Make a verification */ + sprintf(out_val, "Really turn %s to gold? ", o_name); + if (!get_check(out_val)) return FALSE; } /* Artifacts cannot be destroyed */ diff --git a/src/tables.cc b/src/tables.cc index 6aeaaf43..8bf250e7 100644 --- a/src/tables.cc +++ b/src/tables.cc @@ -1445,9 +1445,6 @@ option_type option_info[] = { &last_words, TRUE, 2, 12, "last_words", "Get last words when the character dies" }, - { &auto_destroy, TRUE, 2, 14, - "auto_destroy", "No query to destroy known worthless items" }, - { &wear_confirm, TRUE, 2, 15, "confirm_wear", "Confirm to wear/wield known cursed items" }, diff --git a/src/variable.cc b/src/variable.cc index 23fd9923..f812243a 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -206,7 +206,6 @@ bool_ small_levels; /* Allow unusually small dungeon levels */ bool_ empty_levels; /* Allow empty 'arena' levels */ bool_ always_small_level; /* Small levels */ bool_ player_symbols; /* Use varying symbols for the player char */ -bool_ auto_destroy; /* Known worthless items are destroyed without confirmation */ bool_ confirm_stairs; /* Prompt before staircases... */ bool_ wear_confirm; /* Confirm before putting on known cursed items */ bool_ disturb_pets; /* Pets moving nearby disturb us */ |