Fix 2815574: Venom card not waking monsters.

Fix 2815185: Not updating wield display for rotting chunks.
Fix 2812496: Wrong message when attempting to chop with unwieldable
             weapons. (Small patch by rafalmaj.)
Fix 2811476: Turn autopickup back on when gaining see invisible
             (mutation, ring, artefact, spell).
Fix 2806314: Remove coinflip() for Sandblast range. Wielding rocks now
             guarantees range of 2.


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

1 files changed, 12 insertions, 5 deletions

diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index f756cfbe70..eaa1692654 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -251,11 +251,13 @@ static bool _find_butchering_implement(int &butcher_tool)
 
     if (!potential_candidate)
     {
-        mpr("You don't carry any weapon that could be used for butchering.");
+        mpr("You don't carry any weapon you could use for butchering.");
         if (Options.tutorial_left)
+        {
             mpr("You should pick up the first knife, dagger, sword or axe "
                 "you find so you can use it to butcher corpses.",
                 MSGCH_TUTORIAL);
+        }
 
         return (false);
     }
@@ -295,11 +297,16 @@ static bool _find_butchering_implement(int &butcher_tool)
 
     if (is_valid_item(you.inv[item_slot])
         && you.inv[item_slot].base_type == OBJ_WEAPONS
-        && can_cut_meat(you.inv[item_slot])
-        && can_wield(&you.inv[item_slot]))
+        && can_cut_meat(you.inv[item_slot]))
     {
-        butcher_tool = item_slot;
-        return (true);
+        if (can_wield(&you.inv[item_slot]))
+        {
+            butcher_tool = item_slot;
+            return (true);
+        }
+
+        mpr("You can't wield this item!");
+        return (false);
     }
 
     mpr("That item isn't sharp enough!");