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

(prod): Fix bug #1083175. Use max_pop() not just when opt_RES_POP is

Browse source 
enabled to determine the new working population of a sector.
This commit is contained in:
Marc Olzheim 2004-12-14 19:45:47 +00:00
parent 7a593d9083
commit 1fbbccfe72
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/prod.c
View file

@ -113,15 +113,10 @@ prod(void)
* sect.sct_item[I_CIVIL])); * sect.sct_item[I_CIVIL]));
uws = min(9999, (int)((uwbrate * etu_per_update + 1.0) uws = min(9999, (int)((uwbrate * etu_per_update + 1.0)
* sect.sct_item[I_UW])); * sect.sct_item[I_UW]));
if (opt_RES_POP) {
natp = getnatp(sect.sct_own); natp = getnatp(sect.sct_own);
maxpop = max_pop((float)natp->nat_level[NAT_RLEV], &sect); maxpop = max_pop(natp->nat_level[NAT_RLEV], &sect);
civs = min(civs, maxpop); civs = min(civs, maxpop);
uws = min(uws, maxpop); uws = min(uws, maxpop);
} else { /* now RES_POP */
civs = min(999, civs);
uws = min(999, uws);
} /* end RES_POP */
/* This isn't quite right, since research might rise/fall */ /* This isn't quite right, since research might rise/fall */
/* during the update, but it's the best we can really do */ /* during the update, but it's the best we can really do */