diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-12 14:37:24 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-12 14:37:24 +0000 |
| commit | 1d8171ac356ddc2f4b855701ee8b4e9e3a7a7d67 (patch) | |
| tree | 784ba1cce984908abeae6452189165057932174c /crawl-ref/source/religion.cc | |
| parent | 0e291587ce7b90bb4e6a014fa4ee9162369e6989 (diff) | |
| download | crawl-ref-1d8171ac356ddc2f4b855701ee8b4e9e3a7a7d67.tar.gz crawl-ref-1d8171ac356ddc2f4b855701ee8b4e9e3a7a7d67.zip | |
Apply kotk's patch to make e.g. Zin properly care about ally deaths
again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10658 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, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 86f5051c5a..e526621b0f 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2873,10 +2873,14 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, // Converted allies (marked as TSOites) can be martyrs. if (victim->god == GOD_SHINING_ONE) break; + // fall through - case GOD_FEAWN: // plant god only cares about plants - if (!mons_is_plant(victim)) + case GOD_FEAWN: + // plant god only cares about plants + // double-check god because of fall-throughs from other gods + if (you.religion == GOD_FEAWN && !mons_is_plant(victim)) break; + // fall through case GOD_OKAWARU: piety_change = -level; |