From b0fa9a8ee240249c21e746545eec07abbd4ca01d Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Tue, 20 Dec 2005 22:50:06 +0000 Subject: [PATCH] (nat_cap): Remove redundant max_btus checks. Remove deities and opt_BLITZ calculations as dispatch() will not let you run out of BTU's. --- src/lib/player/init_nats.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index 746e93e27..cfcfa9446 100644 --- a/src/lib/player/init_nats.c +++ b/src/lib/player/init_nats.c @@ -107,21 +107,11 @@ nat_cap(int btu) delta = roundavg(d * civ * sect.sct_effic * btu_build_rate); else /* Assume 1/2% efficiency minimum */ delta = roundavg(d * civ * btu_build_rate / 2.0); - if (player->god) - delta = max_btus - btu; - if (delta + btu > max_btus) - delta = max_btus - btu; - if (btu > max_btus) - delta = max_btus - btu; - if (opt_BLITZ) - delta = max_btus - btu; - if (delta > 0) { - /* set date if BTUs made */ - np->nat_btu += delta; - } - if (btu > max_btus) + if (delta + btu > max_btus) np->nat_btu = max_btus; + else + np->nat_btu += delta; } if (np->nat_stat == VIS) np->nat_btu = max_btus; -- 2.43.0