From db54671af1f255d5f886ff79ffe8b2232585f1c3 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 19 Nov 2008 16:22:01 +0000 Subject: Fix 2307176: Bladehanded butcher not respecting gloves being melded. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7500 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/food.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 8c3a54f8cd..55dc1bc1e1 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -475,13 +475,14 @@ bool butchery(int which_corpse) && you.species != SP_VAMPIRE); bool barehand_butcher = (transform_can_butcher_barehanded(transform) - || you.has_claws()) && you.equip[EQ_GLOVES] == -1; + || you.has_claws()) + && !player_wearing_slot(EQ_GLOVES); - bool gloved_butcher = (you.has_claws() && you.equip[EQ_GLOVES] != -1 + bool gloved_butcher = (you.has_claws() && player_wearing_slot(EQ_GLOVES) && !item_cursed(you.inv[you.equip[EQ_GLOVES]])); - bool can_butcher = teeth_butcher || barehand_butcher - || (you.weapon() && can_cut_meat(*you.weapon())); + bool can_butcher = (teeth_butcher || barehand_butcher + || you.weapon() && can_cut_meat(*you.weapon())); if (!Options.easy_butcher && !can_butcher) { -- cgit v1.2.3-54-g00ecf