From e9b37524a6c75e84d3a7aef7a4157e51dd5d5e8d Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 30 Jun 2008 04:17:41 +0000 Subject: In the attack warning prompt, do the checks for unchivalric attacks and TSO's not minding your making unchivalric attacks in the right order. Maybe this fixes [2006092]? git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6240 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/misc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 163255ea2e..5d3e01675f 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2724,10 +2724,10 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack, prompt = true; } else if (inSanctuary || wontAttack - || is_good_god(you.religion) && (isNeutral || isHoly) - || you.religion == GOD_SHINING_ONE - && !tso_unchivalric_attack_safe_monster(mon) - && isUnchivalric) + || (isNeutral || isHoly) && is_good_god(you.religion) + || isUnchivalric + && you.religion == GOD_SHINING_ONE + && !tso_unchivalric_attack_safe_monster(mon)) { // "Really fire through the helpless neutral holy Daeva?" // was: "Really fire through this helpless neutral holy creature?" -- cgit v1.2.3-54-g00ecf