empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(food_needed): New.

Browse source 
(feed_ship, feed_land): Use it.
(do_feed): Use it.  Estimate of food needed was one too large for
integer food needs.  Used to round fractional food need to nearest
instead of up for supply_commod(), which could cause starvation.
(s_commod, get_minimum): Use it.  Estimate of food needed was one too
large for integer food needs.  s_commod() used to reserve one more
than get_minimum() would have returned; it's now the same.

(famine_victims): New.
(feed_people): Use it.  This rounds victim fractions down instead of
up.  It also dosn't flush needs <=1 to zero.  Doesn't change
starvation, as do_feed() always produces at least one emergency food.
Does change food consumption.

(starve_some): New.
(feed_people): Use it.

(feed_ship): Use feed_people().  This rounds victim fractions down
instead of up.

(feed_land): Use feed_people().  Rounding of victim fractions
unchanged.  Feeds all people not just mil; closes #913997.

(starv_people): New.
(starv_sects, starv_ships, starv_units): Use it.  Fixes starve land to
talk about people instead of mil.

(starv_sects): Use famine_victims() rather than feed_people().  Take
emergency food into account, because feed_people() doesn't.  Don't aim
for one extra food, for consistency with starv_ships() and
starv_units().
(feed_people): Remove useless parameter.  Simplify.

(starv_ships, starv_ships): Use famine_victims() rather than
feed_ship() and feed_land().
(feed_ship, feed_land): Remove useless parameters.  Internal linkage.
Simplify.

(feed_land): Call resupply_commod() only if there's a food shortage.
Don't scrounge lnd_ship for food, resupply_commod() already does.
This commit is contained in:
Markus Armbruster 2006-05-26 18:22:42 +00:00
parent 0ac31b3ece
commit 109dad1bee
6 changed files with 119 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/lib/update/land.c
View file

@ -35,6 +35,7 @@
#include <config.h>
#include <math.h>
#include "misc.h"
#include "plague.h"
#include "sect.h"
@ -57,6 +58,7 @@ int mil_dbl_pay;
static void landrepair(struct lndstr *, struct natstr *, int *, int);
static void upd_land(struct lndstr *, int, struct natstr *, int *, int);
static int feed_land(struct lndstr *, int);
int
prod_land(int etus, int natnum, int *bp, int build)
@ -120,7 +122,6 @@ upd_land(struct lndstr *lp, int etus,
int n;
int min = morale_base - (int)np->nat_level[NAT_HLEV];
int mult;
int needed;
int cost;
int eff;
@ -160,7 +161,7 @@ upd_land(struct lndstr *lp, int etus,
if (!player->simulation) {
/* feed */
if ((n = feed_land(lp, etus, &needed, 1)) > 0) {
if ((n = feed_land(lp, etus)) > 0) {
wu(0, lp->lnd_own, "%d starved in %s%s\n",
n, prland(lp),
(lp->lnd_effic < LAND_MINEFF ? ", killing it" : ""));
@ -337,62 +338,20 @@ landrepair(struct lndstr *land, struct natstr *np, int *bp, int etus)
/*
* returns the number who starved, if any.
*/
int
feed_land(struct lndstr *lp, int etus, int *needed, int doit)
static int
feed_land(struct lndstr *lp, int etus)
{
double food_eaten, ship_eaten;
int ifood_eaten;
double people_left;
int need;
int total_people;
int starved;
int needed, give, take;
struct shpstr *sp;
if (opt_NOFOOD)
return 0; /* no food no work to be done */
return 0;
total_people = lp->lnd_item[I_MILIT];
food_eaten = etus * eatrate * total_people;
ifood_eaten = (int)food_eaten;
if (food_eaten - ifood_eaten > 0)
ifood_eaten++;
starved = 0;
*needed = 0;
needed = (int)ceil(food_needed(lp->lnd_item, etus));
if (doit)
/* scrounge */
if (needed > lp->lnd_item[I_FOOD])
resupply_commod(lp, I_FOOD);
/*
* If we're on a ship, and we don't have enough food,
* get some food off the carrying ship. (Don't starve
* the ship, tho...
*/
/* doit - Only try to take food off the ship during the update */
if (ifood_eaten > lp->lnd_item[I_FOOD] && lp->lnd_ship >= 0 && doit) {
need = ifood_eaten - lp->lnd_item[I_FOOD];
sp = getshipp(lp->lnd_ship);
ship_eaten = etus * eatrate * (sp->shp_item[I_CIVIL]
+ sp->shp_item[I_MILIT]
+ sp->shp_item[I_UW]);
if (sp->shp_item[I_FOOD] - need > ship_eaten) {
lp->lnd_item[I_FOOD] += need;
sp->shp_item[I_FOOD] -= need;
} else if (sp->shp_item[I_FOOD] - ship_eaten > 0) {
lp->lnd_item[I_FOOD] += sp->shp_item[I_FOOD] - ship_eaten;
sp->shp_item[I_FOOD] -= sp->shp_item[I_FOOD] - ship_eaten;
}
}
if (ifood_eaten > lp->lnd_item[I_FOOD]) {
*needed = ifood_eaten - lp->lnd_item[I_FOOD];
people_left = (lp->lnd_item[I_FOOD] + 0.01) / (food_eaten + 0.01);
/* only want to starve off at most 1/2 the populace. */
if (people_left < 0.5)
people_left = 0.5;
starved = total_people * (1 - people_left);
lp->lnd_item[I_MILIT] -= starved;
lp->lnd_item[I_FOOD] = 0;
} else {
lp->lnd_item[I_FOOD] -= (int)food_eaten;
}
return starved;
return feed_people(lp->lnd_item, etus);
}