Remove some dedicated butchery conduct code.

It's not used anymore, and since the corpse offering mechanism has changed, is unlikely to be used again.

Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>

3 files changed, 1 insertions, 27 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 61f6b8a92b..55363ec84a 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -802,11 +802,6 @@ void handle_delay()
                                                    : "butchering"),
                  mitm[delay.parm1].name(DESC_PLAIN).c_str());
 
-            // Also for bottling blood - just in case.
-            if (you.duration[DUR_PRAYER] && god_hates_butchery(you.religion))
-                did_god_conduct(DID_DEDICATED_BUTCHERY, 10);
-            break;
-
         case DELAY_MEMORISE:
             mpr("You start memorising the spell.", MSGCH_MULTITURN_ACTION);
             break;
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index e44dc3accc..9f63ff75d9 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -736,7 +736,7 @@ enum conduct_type
     DID_STABBING,                         // unused
     DID_UNCHIVALRIC_ATTACK,
     DID_POISON,
-    DID_DEDICATED_BUTCHERY,
+    DID_DEDICATED_BUTCHERY,               // unused
     // killings need no longer be dedicated (JPEG)
     DID_KILL_LIVING,
     DID_KILL_UNDEAD,
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 46a2ea593b..b3f07ac612 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -2854,22 +2854,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
             }
             break;
 
-        case DID_DEDICATED_BUTCHERY:
-            switch (you.religion)
-            {
-            case GOD_ELYVILON:
-                simple_god_message(" does not appreciate your butchering the "
-                                   "dead during prayer!");
-                retval = true;
-                piety_change = -level;
-                penance = level;
-                break;
-
-            default:
-                break;
-            }
-            break;
-
         case DID_KILL_LIVING:
             switch (you.religion)
             {
@@ -5192,11 +5176,6 @@ bool god_likes_fresh_corpses(god_type god)
             || (god == GOD_KIKUBAAQUDGHA && you.piety >= piety_breakpoint(4)));
 }
 
-bool god_hates_butchery(god_type god)
-{
-    return (false);
-}
-
 harm_protection_type god_protects_from_harm(god_type god, bool actual)
 {
     const int min_piety = piety_breakpoint(0);