From ac60160355f1b1fb7842cb806e5bb154dd233bfb Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 3 May 2013 20:42:51 +0200 Subject: [PATCH] Clean up redundant code in prod() --- src/lib/commands/prod.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c index c0f0688df..882ff28cb 100644 --- a/src/lib/commands/prod.c +++ b/src/lib/commands/prod.c @@ -135,7 +135,6 @@ prod(void) eff = 0; } if (!eff && IS_BIG_CITY(otype) && !IS_BIG_CITY(type)) { - natp = getnatp(sect.sct_own); maxpop = max_population(natp->nat_level[NAT_RLEV], type, eff); work = new_work(§, @@ -184,12 +183,8 @@ prod(void) if (sect.sct_own != sect.sct_oldown) continue; - civs = (1.0 + obrate * etu_per_update) * sect.sct_item[I_CIVIL]; - natp = getnatp(sect.sct_own); - maxpop = max_pop(natp->nat_level[NAT_RLEV], §); - civs = MIN(civs, maxpop); enlisted = 0; - maxmil = (civs / 2) - sect.sct_item[I_MILIT]; + maxmil = MIN(civs, maxpop) / 2 - sect.sct_item[I_MILIT]; if (maxmil > 0) { enlisted = (etu_per_update * (10 + sect.sct_item[I_MILIT]) @@ -214,7 +209,6 @@ prod(void) resource = (unsigned char *)§ + pp->p_nrndx; else resource = NULL; - natp = getnatp(sect.sct_own); /* * sect p_e (inc improvements) */ -- 2.43.0