From 1fbbccfe7269ca2b79803b22ffbe21fc401d10b1 Mon Sep 17 00:00:00 2001 From: Marc Olzheim Date: Tue, 14 Dec 2004 19:45:47 +0000 Subject: [PATCH] (prod): Fix bug #1083175. Use max_pop() not just when opt_RES_POP is enabled to determine the new working population of a sector. --- src/lib/commands/prod.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c index 6827fec86..619f30155 100644 --- a/src/lib/commands/prod.c +++ b/src/lib/commands/prod.c @@ -113,15 +113,10 @@ prod(void) * sect.sct_item[I_CIVIL])); uws = min(9999, (int)((uwbrate * etu_per_update + 1.0) * sect.sct_item[I_UW])); - if (opt_RES_POP) { - natp = getnatp(sect.sct_own); - maxpop = max_pop((float)natp->nat_level[NAT_RLEV], §); - civs = min(civs, maxpop); - uws = min(uws, maxpop); - } else { /* now RES_POP */ - civs = min(999, civs); - uws = min(999, uws); - } /* end RES_POP */ + natp = getnatp(sect.sct_own); + maxpop = max_pop(natp->nat_level[NAT_RLEV], §); + civs = min(civs, maxpop); + uws = min(uws, maxpop); /* This isn't quite right, since research might rise/fall */ /* during the update, but it's the best we can really do */ -- 2.43.0