Removed overly spammy visual messages (specifically, monsters lashing their

tails).

Fixed butcher weapon-swap crash (David).

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

2 files changed, 13 insertions, 13 deletions

diff --git a/crawl-ref/source/dat/shout.txt b/crawl-ref/source/dat/shout.txt
index 977b32e689..3c00797c17 100644
--- a/crawl-ref/source/dat/shout.txt
+++ b/crawl-ref/source/dat/shout.txt
@@ -212,11 +212,11 @@ Wanderer player ghost
 %%%%
 'a'
 
-@The_monster@ twitches @possessive@ antennas in your direction.
+@The_monster@ twitches @possessive@ antennae in your direction.
 %%%%
 'cap-B'
 
-@The_monster@ twitches @possessive@ antennas in your direction.
+@The_monster@ twitches @possessive@ antennae in your direction.
 %%%%
 # Giant spores have their own visual, this is only for the eyeball
 # related ones.
@@ -227,14 +227,6 @@ Wanderer player ghost
 'cap-J'
 
 @The_monster@ quivers.
-%%%%
-'l'
-
-@The_monster@ angrily lashes @possessive@ tail.
-%%%%
-'r'
-
-@The_monster@ angrily lashes @possessive@ tail.
 ########################################
 # Shouts for specific monsters
 ########################################
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 845c0bd7f0..e0252c502b 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -139,6 +139,9 @@ void stop_delay( void )
         delay.type == DELAY_BUTCHER
         && (you.delay_queue.size() >= 2
             && you.delay_queue[1].type == DELAY_WEAPON_SWAP);
+
+    const int butcher_swap_weapon =
+        butcher_swap_warn? you.delay_queue[1].parm1 : -10;
     
     // At the very least we can remove any queued delays, right 
     // now there is no problem with doing this... note that
@@ -154,10 +157,15 @@ void stop_delay( void )
         // Corpse keeps track of work in plus2 field, see handle_delay() -- bwr
         if (butcher_swap_warn)
         {
-            int swapwpn = you.delay_queue[1].parm1;
+            std::string weapon;
+            if (butcher_swap_weapon == -1)
+                weapon = "unarmed combat";
+            else
+                weapon = "your " +
+                    you.inv[butcher_swap_weapon].name(DESC_BASENAME);
             mprf(MSGCH_WARN, "You stop butchering the corpse; not switching "
-                 "back to your %s.",
-                 you.inv[swapwpn].name(DESC_BASENAME).c_str());
+                 "back to %s.",
+                 weapon.c_str());
         }
         else
             mpr( "You stop butchering the corpse." );