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

Fix starvation not to starve one more than it should

Browse source 
Commit 109dad1b (v4.3.5) promised to round victim fractions down, but
got it wrong for odd population when exactly half of it rounded down
could be fed.  This could starve the last man on a boat or land unit.
Fix famine_victims().
This commit is contained in:
Markus Armbruster 2008-05-17 08:50:56 +02:00
parent 9a7628f05b
commit b37ebbbde3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,9 +192,9 @@ famine_victims(short *vec, int etu)
{ {
double can_eat = vec[I_FOOD] / (etu * eatrate); double can_eat = vec[I_FOOD] / (etu * eatrate);
int people = vec[I_CIVIL] + vec[I_MILIT] + vec[I_UW]; int people = vec[I_CIVIL] + vec[I_MILIT] + vec[I_UW];
if (people < can_eat) if (people <= can_eat)
return 0; return 0;
if (can_eat < people / 2) if (can_eat <= people / 2)
return people / 2; return people / 2;
return (int)(people - can_eat); return (int)(people - can_eat);
} }