diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-25 20:31:34 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-25 20:31:34 +0000 |
| commit | 3dd208ed66cd3ac333b3c06afe1c4aba53527ec7 (patch) | |
| tree | 782247c6cb78fc0e0e5df2030706f740bfe60806 /crawl-ref/source/religion.cc | |
| parent | 02163122859dddf97c5cce87c7441f7d27c27765 (diff) | |
| download | crawl-ref-3dd208ed66cd3ac333b3c06afe1c4aba53527ec7.tar.gz crawl-ref-3dd208ed66cd3ac333b3c06afe1c4aba53527ec7.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6989 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 8e0cc5fb4a..a3b4294c12 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2394,11 +2394,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; case DID_KILL_NATURAL_EVIL: - if (you.religion == GOD_SHINING_ONE) + if (you.religion == GOD_SHINING_ONE + && !god_hates_attacking_friend(you.religion, victim)) { - if (god_hates_attacking_friend(you.religion, victim)) - break; - simple_god_message(" accepts your kill."); ret = true; if (random2(level + 18) > 3) @@ -2407,11 +2405,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; case DID_KILL_CHAOTIC: - if (you.religion == GOD_ZIN) + if (you.religion == GOD_ZIN + && !god_hates_attacking_friend(you.religion, victim)) { - if (god_hates_attacking_friend(you.religion, victim)) - break; - simple_god_message(" appreciates your killing of a " "spawn of chaos."); ret = true; |