From 51f25d2d403aa80c5d6e5ae221992b0ddc546866 Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 3 Nov 2008 18:47:36 +0000
Subject: Add more conduct handling fixes.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7364 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/religion.cc | 10 ++++++++--
 1 file changed, 8 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 a275fef8a8..2d693329c7 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2841,8 +2841,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
         break;
 
     case DID_DESTROY_ORCISH_IDOL:
-        beogh_idol_revenge();
-
         if (you.religion == GOD_BEOGH)
         {
             piety_change = -level * 2;
@@ -2894,6 +2892,14 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
     }
 #endif
 
+    if (thing_done == DID_DESTROY_ORCISH_IDOL)
+        beogh_idol_revenge();
+    else if (thing_done == DID_KILL_HOLY
+        || thing_done == DID_HOLY_KILLED_BY_SERVANT)
+    {
+        tso_holy_revenge();
+    }
+
     return (ret);
 }
 
-- 
cgit v1.2.3-54-g00ecf