summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/food.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-22 18:20:35 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-22 18:20:35 +0000
commit050bda15479caa2b79599e2e0033389694aadbc3 (patch)
tree6a615d2476724c5d28c024055e03e3866900a372 /crawl-ref/source/food.cc
parent099ea03d1541c2c4d2d534e6ca744d5478e03c0e (diff)
downloadcrawl-ref-050bda15479caa2b79599e2e0033389694aadbc3.tar.gz
crawl-ref-050bda15479caa2b79599e2e0033389694aadbc3.zip
Properly disallow bottling blood from rotten corpses, as doing so causes
an assertion failure in wizard mode. Also, don't display "What a waste." if we've just butchered a rotten corpse. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5180 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r--crawl-ref/source/food.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 4ec471b7a6..ba293e99d2 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -297,9 +297,8 @@ static bool _butcher_corpse(int corpse_id, bool force_butcher = false)
if (work_req < 0)
work_req = 0;
-
delay_type dtype = DELAY_BUTCHER;
- if (!force_butcher
+ if (!force_butcher && !rotten
&& can_bottle_blood_from_corpse(mitm[corpse_id].plus))
{
dtype = DELAY_BOTTLE_BLOOD;