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

(feed_people): Simplify. No functional changes.

Browse source
This commit is contained in:
Markus Armbruster 2004-03-11 20:20:35 +00:00
parent eb94c88806
commit 61d57719c2
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/lib/update/human.c
View file

@ -187,6 +187,7 @@ int
feed_people(register int *vec, int etu, int *needed) feed_people(register int *vec, int etu, int *needed)
{ {
double food_eaten; double food_eaten;
int ifood_eaten;
int can_eat; int can_eat;
int total_people; int total_people;
int to_starve; int to_starve;
@ -194,22 +195,21 @@ feed_people(register int *vec, int etu, int *needed)
if (opt_NOFOOD) if (opt_NOFOOD)
return 0; return 0;
food_eaten = (double)(((double)etu * (double)eatrate) *
(double)(vec[I_CIVIL] + vec[I_MILIT] + total_people = vec[I_CIVIL] + vec[I_MILIT] + vec[I_UW];
vec[I_UW])); food_eaten = etu * eatrate * total_people;
if (food_eaten <= 1) ifood_eaten = (int)food_eaten;
if (food_eaten - ifood_eaten > 0)
ifood_eaten++;
if (ifood_eaten <= 1)
return 0; return 0;
starved = 0; starved = 0;
*needed = 0; *needed = 0;
if (food_eaten > vec[I_FOOD]) { if (ifood_eaten > vec[I_FOOD]) {
*needed = food_eaten - vec[I_FOOD]; *needed = ifood_eaten - vec[I_FOOD];
if ((double)(*needed) < (double)(food_eaten - (double)vec[I_FOOD])) can_eat = vec[I_FOOD] / (etu * eatrate);
(*needed)++;
can_eat = (vec[I_FOOD] / (etu * eatrate));
total_people = vec[I_CIVIL] + vec[I_MILIT] + vec[I_UW];
/* only want to starve off at most 1/2 the populace. */ /* only want to starve off at most 1/2 the populace. */
if (can_eat < (total_people / 2)) if (can_eat < total_people / 2)
can_eat = total_people / 2; can_eat = total_people / 2;
to_starve = total_people - can_eat; to_starve = total_people - can_eat;