diff options
Diffstat (limited to 'src')
| -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 |
5 files changed, 6 insertions, 17 deletions
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 */ |