diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 07:41:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 07:41:27 +0000 |
| commit | aa3717c904d5d25c9f58f5d17e66379966f00a8f (patch) | |
| tree | b0e55eb934017aada2332593ee8aa8979aeb9b58 /crawl-ref/source/food.cc | |
| parent | 172979dfbcd139f1adba90624340e9e6e5184cae (diff) | |
| download | crawl-ref-aa3717c904d5d25c9f58f5d17e66379966f00a8f.tar.gz crawl-ref-aa3717c904d5d25c9f58f5d17e66379966f00a8f.zip | |
Move pickup_butcher_tool.txt into (the recently freed) pickup.lua,
re-enable it (whoops) and clean up its code.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5698 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 621abf33bd..adcb48127b 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -185,6 +185,10 @@ static bool _find_butchering_implement( bool fallback ) // automatically. if (const item_def *wpn = you.weapon()) { + // No switching necessary. + if (can_cut_meat( *wpn )) + return (false); + if (wpn->base_type == OBJ_WEAPONS && item_type_known(*wpn) && get_weapon_brand(*wpn) == SPWPN_DISTORTION) @@ -195,9 +199,6 @@ static bool _find_butchering_implement( bool fallback ) return (false); } - // No switching necessary. - if (can_cut_meat( *wpn )) - return (false); } int old_weapon = you.equip[EQ_WEAPON]; |