diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-25 22:22:32 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-25 22:22:32 +0000 |
| commit | 88ba23f99ec325592a506e3c874204a492f9ef76 (patch) | |
| tree | 287257e7736cb9f643637a93d5f5d45e139ce7b1 | |
| parent | 762f4ba09fd51aeae98351d5556b84883fbe66a4 (diff) | |
| download | crawl-ref-88ba23f99ec325592a506e3c874204a492f9ef76.tar.gz crawl-ref-88ba23f99ec325592a506e3c874204a492f9ef76.zip | |
Fixed barehanded butchery according to bug 1563815.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@121 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/food.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 3d4b1d20a6..3381d55993 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -163,13 +163,13 @@ bool butchery(void) int old_weapon = you.equip[EQ_WEAPON]; bool barehand_butcher = (you.equip[ EQ_GLOVES ] == -1) - && (you.species == SP_TROLL - || you.species == SP_GHOUL - || you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS - || you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON - || you.mutation[MUT_CLAWS]); - - + && (you.attribute[ATTR_TRANSFORMATION] == TRAN_BLADE_HANDS || + you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON || + (you.attribute[ATTR_TRANSFORMATION] == TRAN_NONE && + (you.species == SP_TROLL || + you.species == SP_GHOUL || + you.mutation[MUT_CLAWS]))); + if (igrd[you.x_pos][you.y_pos] == NON_ITEM) { mpr("There isn't anything here!"); |