From ee2dc294fac666d0f66e0e621221e2d47bfcd6cf Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 18 Jul 2008 16:59:55 +0000 Subject: Fix 2019873: Monsters picking up a second melee weapon if they already have one. (They now either upgrade or simply ignore a second weapon, unless dual-wielding.) Fix 2021307: Really get in some butchering before you get interrupted. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6604 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/food.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/food.cc') diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 833ed25dfc..0ff2d7f727 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -337,7 +337,11 @@ static bool _butcher_corpse(int corpse_id, bool first_corpse = true, you.religion); } - int work_req = 4 - mitm[corpse_id].plus2 - (first_corpse ? 1 : 0); + // Start work on the first corpse we butcher. + if (first_corpse) + mitm[corpse_id].plus2++; + + int work_req = 4 - mitm[corpse_id].plus2; if (work_req < 0) work_req = 0; -- cgit v1.2.3-54-g00ecf