Apply the vampire draining fix to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6608 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 13 insertions, 7 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 75e0367e2e..ce03e51855 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -1,3 +1,11 @@
+Stone Soup 0.4.2 (2008????)
+---------------------------
+
+Disclaimer: These are merely the highlights, not an exhaustive list of changes.
+
+* Fixed vampire draining not destroying small corpses.
+* Fixed repeatedly interrupted butchering making no progress.
+
 Stone Soup 0.4.1 (20080717)
 ---------------------------
 
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index e160412b89..d982ee7658 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -2340,13 +2340,11 @@ static bool _vampire_consume_corpse(const int slot, bool invent)
     // Get some nutrition right away, in case we're interrupted.
     // (-1 for the starting message.)
     vampire_nutrition_per_turn(corpse, -1);
-    if (chunk_amount/2 > 0)
-    {
-        // The draining delay doesn't have a start action, and we only need
-        // the continue/finish messages if it takes longer than 1 turn.
-        start_delay( DELAY_FEED_VAMPIRE, chunk_amount/2,
-                     (int) invent, slot );
-    }
+
+    // The draining delay doesn't have a start action, and we only need
+    // the continue/finish messages if it takes longer than 1 turn.
+    start_delay( DELAY_FEED_VAMPIRE, chunk_amount/2,
+                 (int) invent, slot );
 
     return (true);
 }