diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 12:33:36 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 12:33:36 +0000 |
| commit | 6e44de32ed92d31968e1490c7d10ba27e98ee392 (patch) | |
| tree | 41970a37d7fc853521bb09642048d8b0404694ed /crawl-ref/source/misc.cc | |
| parent | cebfd4f93efdfe6cc517f1bda0a59699a8149d3e (diff) | |
| download | crawl-ref-6e44de32ed92d31968e1490c7d10ba27e98ee392.tar.gz crawl-ref-6e44de32ed92d31968e1490c7d10ba27e98ee392.zip | |
Apply Abyss unlinked item fix and the changes to the starting equipment
to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6456 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, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 2ebe2153f9..7e23bd12e7 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2730,8 +2730,8 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack, else if (inSanctuary || wontAttack || (isNeutral || isHoly) && is_good_god(you.religion) || isUnchivalric - && you.religion == GOD_SHINING_ONE - && !tso_unchivalric_attack_safe_monster(mon)) + && 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?" |