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

(max_population): Fix for opt_RES_POP and d_maxpop != 999.

Browse source
This commit is contained in:
Markus Armbruster 2005-02-17 21:40:24 +00:00
parent ff67d93711
commit d5d8028ad1
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib/common/res_pop.c
View file

@ -44,23 +44,25 @@ int
max_population(float research, int desig, int eff) max_population(float research, int desig, int eff)
{ {
int maxpop = dchr[desig].d_maxpop; int maxpop = dchr[desig].d_maxpop;
int rmax;
if (opt_RES_POP) {
/* research limits maximum population */
maxpop = maxpop * 0.4
+ maxpop * 0.6 * (50.0 + 4.0*research) / (200.0 + 3.0*research);
if (maxpop > 999)
maxpop = 999;
}
if (opt_BIG_CITY) { if (opt_BIG_CITY) {
/* city efficiency limits maximum population */ /* city efficiency limits maximum population */
if (dchr[desig].d_pkg == UPKG) if (dchr[desig].d_pkg == UPKG)
maxpop *= 1 + 9.0 * eff / 100; maxpop *= 1 + 9.0 * eff / 100;
if (CANT_HAPPEN(maxpop > 9999))
maxpop = 9999;
} }
if (opt_RES_POP) {
/* research limits maximum population */
rmax = maxpop * 0.4
+ maxpop * 0.6 * (50.0 + 4.0*research) / (200.0 + 3.0*research);
if (maxpop > rmax)
maxpop = rmax;
}
if (CANT_HAPPEN(maxpop > ITEM_MAX))
maxpop = ITEM_MAX;
return maxpop; return maxpop;
} }