diff options
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 7a0f3d5cb2..cf5d8aa06e 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2457,9 +2457,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } if (thing_done == DID_ATTACK_HOLY - && (victim->attitude == ATT_HOSTILE - && !testbits(victim->flags, MF_CREATED_FRIENDLY) - && !testbits(victim->flags, MF_WAS_NEUTRAL))) + && !testbits(victim->flags, MF_CREATED_FRIENDLY) + && !testbits(victim->flags, MF_WAS_NEUTRAL)) { break; } @@ -2747,8 +2746,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_ZIN: case GOD_SHINING_ONE: case GOD_ELYVILON: - if (victim->attitude == ATT_HOSTILE - && !testbits(victim->flags, MF_CREATED_FRIENDLY) + if (!testbits(victim->flags, MF_CREATED_FRIENDLY) && !testbits(victim->flags, MF_WAS_NEUTRAL)) { break; |