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

(max_population): New, factored out of max_pop().

Browse source 
(max_pop): Use it.  Don't support null argument anymore.
(nati, gen_power): Use max_population() instead of max_pop() with null
argument.
(show_sect_stats): Use max_population() to simplify the code.
(prod, upd_buildeff): Use max_population() to get correct new maximum
population for limiting work when tearing down a big city.
Previously, this was broken in upd_buildeff().  In prod(), it was
broken when the new designation had odd maximum population, which
should not occur.
This commit is contained in:
Markus Armbruster 2005-02-17 21:04:08 +00:00
parent f8b2860ec5
commit ff67d93711
7 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,9 +41,9 @@
#include "common.h"
int
max_pop(float research, struct sctstr *sp)
max_population(float research, int desig, int eff)
{
int maxpop = dchr[sp ? sp->sct_type : SCT_MINE].d_maxpop;
int maxpop = dchr[desig].d_maxpop;
if (opt_RES_POP) {
/* research limits maximum population */
@ -55,10 +55,17 @@ max_pop(float research, struct sctstr *sp)
if (opt_BIG_CITY) {
/* city efficiency limits maximum population */
if (sp && dchr[sp->sct_type].d_pkg == UPKG)
maxpop = (int)(maxpop * ((9.0 * sp->sct_effic) / 100 + 1));
if (dchr[desig].d_pkg == UPKG)
maxpop *= 1 + 9.0 * eff / 100;
if (CANT_HAPPEN(maxpop > 9999))
maxpop = 9999;
}
return maxpop;
}
int
max_pop(float research, struct sctstr *sp)
{
return max_population(research, sp->sct_type, sp->sct_effic);
}