From aa3717c904d5d25c9f58f5d17e66379966f00a8f Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 10 Jun 2008 07:41:27 +0000 Subject: 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 --- crawl-ref/source/food.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/food.cc') 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]; -- cgit v1.2.3-54-g00ecf