diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-16 00:02:54 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-16 00:02:54 +0000 |
| commit | 3ac377c1d12efdc4bb8ab217aa2d4089f12542ec (patch) | |
| tree | e30ba0e565e0d1ac3256f80a43821efca5ff5011 /crawl-ref/source/religion.cc | |
| parent | 2687b83ea619355a067a72c5033ee973999ac307 (diff) | |
| download | crawl-ref-3ac377c1d12efdc4bb8ab217aa2d4089f12542ec.tar.gz crawl-ref-3ac377c1d12efdc4bb8ab217aa2d4089f12542ec.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9777 c06c8d41-db1a-0410-9941-cceddc491573
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; |