From e94c6e5a3e898c707ec078123402decb3e1b5f49 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 30 Apr 2006 18:25:50 +0000
Subject: [PATCH] (gen_power): Simplify.

---
 src/lib/commands/powe.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index bca1ddbd..c91372a1 100644
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -306,11 +306,7 @@ gen_power(void)
 	    pow->p_power += (pow->p_sects
 			     * ((pow->p_effic / pow->p_sects) / 100.0))
 		* 10.0;
-	if (natp->nat_level[NAT_TLEV] > 0.0)
-	    pow->p_power = pow->p_power *
-		(((float)natp->nat_level[NAT_TLEV]) / 500.0);
-	else
-	    pow->p_power = pow->p_power * (1.0 / 500.0);
+	pow->p_power *= MIN(1.0, natp->nat_level[NAT_TLEV]) / 500.0;
 	/* ack.  add this vec to the "world power" element */
 	f_pt2 = &powbuf[0].p_sects;
 	f_ptr = &pow->p_sects;