From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 26 Mar 2008 21:00:35 +0000 (+0100)
Subject: Revert "Fix update's resupply of food to avoid starvation"
X-Git-Tag: v4.3.12~8
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=e89a4b5657246f22f763304f8efb45363cd3c284

Revert "Fix update's resupply of food to avoid starvation"

This reverts commit 03811b2c97d9537cfeaf4e5a6726002b0b0d6b78.

That "fix" could actually conjure up food.  The resupply doesn't wipe
out food, because it resuppies from the sector itself.
---

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index 38c648d4b..528069388 100644
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -82,9 +82,9 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
 	    if (vec[I_FOOD] < needed && sp->sct_own == sp->sct_oldown) {
 		/* steal food from warehouses, headquarters,
 		   supply ships in port, or supply units */
-		vec[I_FOOD] += supply_commod(sp->sct_own,
-					     sp->sct_x, sp->sct_y,
-					     I_FOOD, needed - vec[I_FOOD]);
+		vec[I_FOOD] = supply_commod(sp->sct_own,
+					    sp->sct_x, sp->sct_y,
+					    I_FOOD, needed);
 	    }
 	}
 	starved = feed_people(vec, etu);