summaryrefslogtreecommitdiff
path: root/src/cmd2.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:58 +0100
commite9d57ecb0090655ec46a780dc450bc170abd9068 (patch)
tree731199beac7033acd5c06017c97dbab50a167118 /src/cmd2.cc
parent2714df02ad4a4b47745caa149561e3a8c821df45 (diff)
Remove easy_{disarm,tunnel,open}
We behave is if the options (in the old code) were set to their defaults, *except* for easy_disarm which is rather dangerous. Because of the dangerousness we behave as if easy_disarm==FALSE, except for picking the "obvious" choice if there is one when using the (D)isarm command.
Diffstat (limited to 'src/cmd2.cc')
-rw-r--r--src/cmd2.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cmd2.cc b/src/cmd2.cc
index aa4371ac..aa98533a 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -1105,8 +1105,7 @@ void do_cmd_open(void)
return;
}
- /* Option: Pick a direction */
- if (easy_open)
+ /* Pick a direction if there's an obvious target */
{
int num_doors, num_chests;
@@ -1272,8 +1271,7 @@ void do_cmd_close(void)
bool_ more = FALSE;
- /* Option: Pick a direction */
- if (easy_open)
+ /* Pick a direction if there's an obvious choice */
{
int num_doors;
@@ -2122,8 +2120,7 @@ void do_cmd_disarm(void)
bool_ more = FALSE;
- /* Option: Pick a direction */
- if (easy_disarm)
+ /* Pick a direction if there's an obvious choice */
{
int num_traps, num_chests;