diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index 1249cf22..8c193b13 100644 --- a/src/lib/update/sect.c +++ b/src/lib/update/sect.c @@ -50,13 +50,12 @@ * Return amount of work used. */ static int -upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp, - short *vec, int etu, int *desig, int *cost) +upd_buildeff(struct sctstr *sp, int *workp, short vec[], int *desig, + int *cost) { int work_cost = 0; int buildeff_work = *workp / 2; int n, hcms, lcms, neweff; - unsigned char old_type = *desig; *cost = 0; neweff = sp->sct_effic; @@ -77,14 +76,6 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp, } neweff = n; *cost += work_cost; - if (!n && IS_BIG_CITY(old_type) && !IS_BIG_CITY(*desig)) { - /* FIXME use trunc_people() */ - int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n); - if (vec[I_CIVIL] > maxpop) - vec[I_CIVIL] = maxpop; - if (vec[I_UW] > maxpop) - vec[I_UW] = maxpop; - } } if (*desig == sp->sct_newtype) { work_cost = 100 - neweff; @@ -324,7 +315,7 @@ produce_sect(int natnum, int etu, struct bp *bp, int p_sect[][2]) if ((sp->sct_effic < 100 || sp->sct_type != sp->sct_newtype) && np->nat_money >= 0) { - neweff = upd_buildeff(np, sp, &work, vec, etu, &desig, &cost); + neweff = upd_buildeff(sp, &work, vec, &desig, &cost); bp_put_items(bp, sp, vec); p_sect[SCT_EFFIC][0]++; p_sect[SCT_EFFIC][1] += cost; diff --git a/tests/update/setup-POGO b/tests/update/setup-POGO index 75333633..8e6af9a0 100644 --- a/tests/update/setup-POGO +++ b/tests/update/setup-POGO @@ -283,7 +283,6 @@ give h 10,2 10 edit l 12,2 s c S c e 1 give l 12,2 10 give h 12,2 50 -| TODO pop truncation on big city teardown || ship building | #0 100% | #60 stopped