diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-19 16:22:01 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-19 16:22:01 +0000 |
| commit | db54671af1f255d5f886ff79ffe8b2232585f1c3 (patch) | |
| tree | d770ab3500b2e7a56b3b060c588a052783db2415 /crawl-ref/source/food.cc | |
| parent | a87a8f0e1c4c02708532762f6a6cd7eb1690782c (diff) | |
| download | crawl-ref-db54671af1f255d5f886ff79ffe8b2232585f1c3.tar.gz crawl-ref-db54671af1f255d5f886ff79ffe8b2232585f1c3.zip | |
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
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 9 |
1 files changed, 5 insertions, 4 deletions
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) { |