diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 20:18:14 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 20:18:14 +0000 |
| commit | eba8d5fc45bccf678b43e75f6f8657c74da3ba49 (patch) | |
| tree | 63066d498509f224fbce233f0c7454811afe28bb /crawl-ref/source/misc.cc | |
| parent | 05f88f06a2e406d12ce5acecf52764406e31cb2c (diff) | |
| download | crawl-ref-eba8d5fc45bccf678b43e75f6f8657c74da3ba49.tar.gz crawl-ref-eba8d5fc45bccf678b43e75f6f8657c74da3ba49.zip | |
Fix the attack warning prompt's showing up for unchivalric attacks on
monsters that TSO doesn't care about unchivalric attacks on.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6152 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index bc66970127..b0632097e3 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2725,7 +2725,9 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack, } else if (inSanctuary || wontAttack || is_good_god(you.religion) && (isNeutral || isHoly) - || you.religion == GOD_SHINING_ONE && isUnchivalric) + || you.religion == GOD_SHINING_ONE + && !tso_unchivalric_attack_safe_monster(mon) + && isUnchivalric) { // "Really fire through the helpless neutral holy Daeva?" // was: "Really fire through this helpless neutral holy creature?" |