[crawl-ref-commits] master branch updated: 0.9-a1-615-g9e0420f

[<gi...@cr...>]

       via  9e0420f9bb3e0afcea5964e36f909ac81c1cbf76 (commit)
      from  28b7f70794d9e3b99fd8f7c6023099e7c16b6e38 (commit)

-----------------------------------------------------------------------
commit 9e0420f9bb3e0afcea5964e36f909ac81c1cbf76
Author: Raphael Langella <rap...@gm...>
Date:   Fri Jun 17 15:01:23 2011 +0000

    Fix spider form being able to butcher with the knife (#4143).

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/food.cc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 0137491..84fd135 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -381,7 +381,7 @@ bool butchery(int which_corpse, bool bottle_blood)
     bool gloved_butcher   = (you.has_claws() && player_wearing_slot(EQ_GLOVES)
                              && !you.inv[you.equip[EQ_GLOVES]].cursed());
 
-    bool knife_butcher    = !barehand_butcher && !you.weapon();
+    bool knife_butcher    = !barehand_butcher && !you.weapon() && form_can_wield();
 
     bool can_butcher      = (teeth_butcher || barehand_butcher
                              || birdie_butcher || knife_butcher
@@ -443,7 +443,7 @@ bool butchery(int which_corpse, bool bottle_blood)
 
     if (!can_butcher)
     {
-        if (you.weapon()->cursed() && gloved_butcher)
+        if (you.weapon() && you.weapon()->cursed() && gloved_butcher)
             removed_gloves = true;
         else
             wpn_switch = true;


-- 
Dungeon Crawl Stone Soup