Clean up Animate Dead. Also fix messaging.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8853 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 10 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 73f9b9ff86..5f0d9f7e13 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -525,22 +525,18 @@ void stop_delay( bool stop_stair_travel )
         update_turn_count();
 }
 
-void stop_butcher_delay()
-{
-    if (current_delay_action() == DELAY_BUTCHER
-        || current_delay_action() == DELAY_BOTTLE_BLOOD
-        || current_delay_action() == DELAY_OFFER_CORPSE)
-    {
-        stop_delay();
-    }
-}
-
 static bool _is_butcher_delay(int delay)
 {
     return (delay == DELAY_BUTCHER || delay == DELAY_BOTTLE_BLOOD
             || delay == DELAY_OFFER_CORPSE);
 }
 
+void stop_butcher_delay()
+{
+    if (_is_butcher_delay(current_delay_action()))
+        stop_delay();
+}
+
 void handle_interrupted_swap(bool swap_if_safe, bool force_unsafe,
                              bool transform)
 {