summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 3e4350ee6e..3db36c9e9a 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2870,12 +2870,11 @@ void melee_attack::player_stab_check()
if (stab_attempt && roll_needed)
stab_attempt = (random2(roll) <= you.skills[SK_STABBING] + you.dex);
- if (unchivalric && you.religion == GOD_SHINING_ONE)
+ if (unchivalric)
{
- // check for the would-be-stabbed monster's being alive, in case
- // it was abjured as a result of the attack
- bool cancel_stab = !defender->alive() ||
- (!tso_unchivalric_attack_safe_monster(defender)
+ bool cancel_stab =
+ (you.religion == GOD_SHINING_ONE
+ && !tso_unchivalric_attack_safe_monster(defender)
&& !yesno("Really attack this helpless creature?", false, 'n'));
if (cancel_stab)