From 1d8171ac356ddc2f4b855701ee8b4e9e3a7a7d67 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 12 Sep 2009 14:37:24 +0000 Subject: 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 --- crawl-ref/source/religion.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/religion.cc') 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; -- cgit v1.2.3-54-g00ecf