]> git.pond.sub.org Git - empserver/commitdiff
(gen_power): Simplify.
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 30 Apr 2006 18:25:50 +0000 (18:25 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 30 Apr 2006 18:25:50 +0000 (18:25 +0000)
src/lib/commands/powe.c

index bca1ddbd64eb49ce87e75274fad98487782355b9..c91372a1f963b8ea9c24a07fe78f3a720de304c9 100644 (file)
@@ -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;