diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-20 23:51:46 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-20 23:51:46 +0000 |
commit | 94e6620656e106498e9f4cf9df0a45a4d6bbbc09 (patch) | |
tree | 1ae307301597c4a9d68b42a1741bfaa31909aaf1 /crawl-ref/source/religion.cc | |
parent | 37afbcd7f14b7ff1a849b31c04c72710f9b7171f (diff) | |
download | crawl-ref-94e6620656e106498e9f4cf9df0a45a4d6bbbc09.tar.gz crawl-ref-94e6620656e106498e9f4cf9df0a45a4d6bbbc09.zip |
Run through the god conducts for killing if we make a bad kill of a
summoned creature (e.g. a living kill while praying to Elyvilon).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5166 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r-- | crawl-ref/source/religion.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 1c868b6a3f..24d3de701b 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -5027,6 +5027,26 @@ std::string god_hates_your_god_reaction(god_type god, return ""; } +bool god_hates_killing(god_type god, const monsters* mon) +{ + bool retval = false; + const mon_holy_type holiness = mon->holiness(); + + switch (holiness) + { + case MH_HOLY: + retval = (is_good_god(god)); + break; + case MH_NATURAL: + retval = (god == GOD_ELYVILON); + break; + default: + break; + } + + return retval; +} + bool god_likes_butchery(god_type god) { return (god == GOD_OKAWARU |