If there's no warning prompt for attacking, attack by default.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5245 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 1 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index edb81aba5d..e7e8405c53 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -3002,6 +3002,7 @@ std::string your_hand(bool plural)
 bool stop_attack_prompt(const monsters *mon, bool beam_attack,
                         bool beam_target)
 {
+    bool retval = false;
     bool prompt = false;
 
     const bool inSanctuary   = (is_sanctuary(you.x_pos, you.y_pos)
@@ -3048,5 +3049,8 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack,
         prompt = true;
     }
 
-    return !(you.confused() || (prompt && yesno(info, false, 'n')));
+    if (!you.confused() && prompt)
+        retval = !yesno(info, false, 'n');
+
+    return retval;
 }