summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 90879d3d75..fadc4b16b3 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2721,6 +2721,9 @@ std::string your_hand(bool plural)
bool stop_attack_prompt(const monsters *mon, bool beam_attack,
bool beam_target)
{
+ if (you.confused())
+ return (false);
+
bool retval = false;
bool prompt = false;
@@ -2734,7 +2737,7 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack,
if (isFriendly)
{
- // listed in the form: "your rat", "Blork the orc"
+ // Listed in the form: "your rat", "Blork the orc".
snprintf(info, INFO_SIZE, "Really %s %s%s?",
(beam_attack) ? (beam_target) ? "fire at"
: "fire through"
@@ -2769,7 +2772,7 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack,
prompt = true;
}
- if (!you.confused() && prompt)
+ if (prompt)
retval = !yesno(info, false, 'n');
return (retval);