Remove redundant casts of argument to (prototyped) double parameter.

diff --git a/include/land.h b/include/land.h
index 576e4cb9d94ea466fdf684037e626711e3f1c5b2..efd492fd5f202e441d8f7ec5af2934134e2d2e28 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -142,27 +142,27 @@ struct lchrstr {
 #define L_TRAIN         bit(11)        /* train unit - neato */
 #define L_HEAVY         bit(12)        /* heavy unit - can't go on trains */
 
-#define LND_ATTDEF(b, t) (((b) * (1.0 + ((sqrt((double)(t)) / 100.0) * 4.0))) \
-                                                 > 127 ? 127 : \
-                                                 ((b) * (1.0 + ((sqrt((double)(t)) / 100.0) * 4.0))))
-#define LND_SPD(b, t) ((b * (1.0 + ((sqrt((double)t) / 100.0) * 2.1))) > 127\
-                      ? 127 : (b * (1.0 + ((sqrt((double)t) / 100.0) * 2.1))))
-#define LND_VUL(b, t) ((b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))) < 0\
-                      ? 0 : (b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))))
+#define LND_ATTDEF(b, t) (((b) * (1.0 + ((sqrt((t)) / 100.0) * 4.0)))  \
+                         > 127 ? 127 :                                 \
+                         ((b) * (1.0 + ((sqrt((t)) / 100.0) * 4.0))))
+#define LND_SPD(b, t) ((b * (1.0 + ((sqrt(t) / 100.0) * 2.1))) > 127   \
+                      ? 127 : (b * (1.0 + ((sqrt(t) / 100.0) * 2.1))))
+#define LND_VUL(b, t) ((b * (1.0 - ((sqrt(t) / 100.0) * 1.1))) < 0     \
+                      ? 0 : (b * (1.0 - ((sqrt(t) / 100.0) * 1.1))))
 #define LND_VIS(b, t) (b)
 #define LND_SPY(b, t) (b)
 #define LND_RAD(b, t) (b)
-#define LND_FRG(b, t) ((t) ? \
-                                          ((b) * (logx((double)(t), (double)35.0) < 1.0 ? 1.0 : \
-                                                          logx((double)(t), (double)35.0))) : (b))
-#define LND_DAM(b, t) ((t) ? \
-                                          ((b) * (logx((double)(t), (double)60.0) < 1.0 ? 1.0 : \
-                                                          logx((double)(t), (double)60.0))) : (b))
-#define LND_ACC(b, t) ((b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))) < 0\
-                      ? 0 : (b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))))
+#define LND_FRG(b, t) ((t) ?                                \
+                      ((b) * (logx((t), 35.0) < 1.0 ? 1.0 : \
+                              logx((t), 35.0))) : (b))
+#define LND_DAM(b, t) ((t) ?                                \
+                      ((b) * (logx((t), 60.0) < 1.0 ? 1.0 : \
+                              logx((t), 60.0))) : (b))
+#define LND_ACC(b, t) ((b * (1.0 - ((sqrt(t) / 100.0) * 1.1))) < 0     \
+                      ? 0 : (b * (1.0 - ((sqrt(t) / 100.0) * 1.1))))
 #define LND_AMM(b, d, t) ((b) ? ((LND_DAM((d), (t)) / 2) + 1) : 0)
-#define LND_AAF(b, t) ((b * (1.0 + ((sqrt((double)t) / 100.0) * 3.0))) > 127\
-                      ? 127 : (b * (1.0 + ((sqrt((double)t) / 100.0) * 3.0))))
+#define LND_AAF(b, t) ((b * (1.0 + ((sqrt(t) / 100.0) * 3.0))) > 127   \
+                      ? 127 : (b * (1.0 + ((sqrt(t) / 100.0) * 3.0))))
 #define LND_FC(b, t)  (b)
 #define LND_FU(b, t)  (b)
 #define LND_XPL(b, t) (b)

diff --git a/include/plane.h b/include/plane.h
index 4f479283e1cadd79bd0d5937b4986c5b91208798..d4c25a22b24db336f95fc7104e7d268e422902bc 100644 (file)
--- a/include/plane.h
+++ b/include/plane.h
@@ -149,10 +149,10 @@ struct shiplist {
 };
 
 #define PLN_ATTDEF(b, t) (b + ((b?1:0) * ((t/20)>10?10:(t/20))))
-#define PLN_ACC(b, t) (b * (1.0 - (sqrt((double)t) / 50.)))
-#define PLN_RAN(b, t) (t ? (b + (logx((double)t, (double)2.0))) : b)
-#define PLN_LOAD(b, t) (t ? (b * (logx((double)t, (double)50.0) < 1.0 ? 1.0 : \
-                                 logx((double)t, (double)50.0))) : b)
+#define PLN_ACC(b, t) (b * (1.0 - (sqrt(t) / 50.)))
+#define PLN_RAN(b, t) (t ? (b + (logx(t, 2.0))) : b)
+#define PLN_LOAD(b, t) (t ? (b * (logx(t, 50.0) < 1.0 ? 1.0 : \
+                                 logx(t, 50.0))) : b)
 
 /* Work required for building 100% */
 #define PLN_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))

diff --git a/include/ship.h b/include/ship.h
index 794e6e42e2cf9ecc8c02dbdf01504a4bb1c8e641..c8ba98082d844c962031593409ddbebe7ba93675 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -191,15 +191,15 @@ struct mlist {
     double mobil;              /* how much mobility the ship has left */
 };
 
-#define SHP_DEF(b, t) (t ? (b * (logx((double)t, (double)40.0) < 1.0 ? 1.0 : \
-                            logx((double)t, (double)40.0))) : b)
-#define SHP_SPD(b, t) (t ? (b * (logx((double)t, (double)35.0) < 1.0 ? 1.0 : \
-                            logx((double)t, (double)35.0))) : b)
-#define SHP_VIS(b, t) (b * (1 - (sqrt((double)t) / 50)))
-#define SHP_RNG(b, t) (t ? (b * (logx((double)t, (double)35.0) < 1.0 ? 1.0 : \
-                            logx((double)t, (double)35.0))) : b)
-#define SHP_FIR(b, t) (t ? (b * (logx((double)t, (double)60.0) < 1.0 ? 1.0 : \
-                            logx((double)t, (double)60.0))) : b)
+#define SHP_DEF(b, t) (t ? (b * (logx(t, 40.0) < 1.0 ? 1.0 : \
+                                logx(t, 40.0))) : b)
+#define SHP_SPD(b, t) (t ? (b * (logx(t, 35.0) < 1.0 ? 1.0 : \
+                                logx(t, 35.0))) : b)
+#define SHP_VIS(b, t) (b * (1 - (sqrt(t) / 50)))
+#define SHP_RNG(b, t) (t ? (b * (logx(t, 35.0) < 1.0 ? 1.0 : \
+                                logx(t, 35.0))) : b)
+#define SHP_FIR(b, t) (t ? (b * (logx(t, 60.0) < 1.0 ? 1.0 : \
+                                logx(t, 60.0))) : b)
 
 /* Work required for building 100% */
 #define SHP_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index bc39efc3214c4ab13a6cba9b71238dcc0790f4c1..ede02ce12ea13f08f33f5b356b7cbbe8d765e6f6 100644 (file)
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -550,7 +550,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
        }
        mcp = &mchr[(int)ship.shp_type];
        if (gun > 0 && shell > 0 && !(mcp->m_flags & M_SUB)) {
-           flak = (int)(techfact(ship.shp_tech, (double)gun) * 2.0);
+           flak = (int)(techfact(ship.shp_tech, gun) * 2.0);
            ship.shp_item[I_SHELL] = shell;
            putship(ship.shp_uid, &ship);
            PR(ship.shp_own, "Flak! Firing %d guns from ship %s\n",
@@ -775,7 +775,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
        if (unitno < 0)
            continue;
 
-       flak = (int)(techfact(land.lnd_tech, (double)land.lnd_aaf) * 3.0);
+       flak = (int)(techfact(land.lnd_tech, land.lnd_aaf) * 3.0);
        if (flak) {
            PR(land.lnd_own,
               "Flak! Firing flak guns from unit %s (aa rating %d)\n",

diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index 053b628f48721ed5407f15a59744fcd18c5e81af..7232aae3badc4d14b2ba190505f4affb4d6c7cff 100644 (file)
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -127,7 +127,7 @@ look_ship(struct shpstr *lookship)
     int dist;
 
     range = (int)techfact(lookship->shp_tech,
-                         (double)mchr[(int)lookship->shp_type].m_vrnge);
+                         mchr[(int)lookship->shp_type].m_vrnge);
     range = range * (lookship->shp_effic / 100.0);
     smcp = &mchr[(int)lookship->shp_type];
     if (smcp->m_flags & M_SUB)
@@ -259,7 +259,7 @@ look_land(struct lndstr *lookland)
     int i;
     int dist;
 
-    drange = techfact(lookland->lnd_tech, (double)lookland->lnd_spy);
+    drange = techfact(lookland->lnd_tech, lookland->lnd_spy);
     drange = (drange * ((double)lookland->lnd_effic / 100.0));
     range = ldround(drange, 1);
 
@@ -280,7 +280,7 @@ look_land(struct lndstr *lookland)
            if (!(chance(LND_SPY_DETECT_CHANCE(lp->lnd_effic))))
                continue;
        }
-       vrange = ldround((double)((lp->lnd_vis * range) / 20.0), 1);
+       vrange = ldround((lp->lnd_vis * range) / 20.0, 1);
        dist = mapdist(lp->lnd_x, lp->lnd_y,
                       lookland->lnd_x, lookland->lnd_y);
        if (dist > vrange)
@@ -288,7 +288,7 @@ look_land(struct lndstr *lookland)
 
        pr("%s (#%d) %s (approx %d mil) @ %s\n",
           cname(lp->lnd_own), lp->lnd_own,
-          prland(lp), ldround((double)total_mil(lp), 20),
+          prland(lp), ldround(total_mil(lp), 20),
           xyas(lp->lnd_x, lp->lnd_y, player->cnum));
        if (opt_HIDDEN)
            setcont(player->cnum, lp->lnd_own, FOUND_LOOK);
@@ -300,7 +300,7 @@ look_land(struct lndstr *lookland)
            continue;
        if (pp->pln_flags & PLN_LAUNCHED)
            continue;
-       vrange = ldround((double)((10 * range) / 20.0), 1);
+       vrange = ldround((10 * range) / 20.0, 1);
        dist = mapdist(pp->pln_x, pp->pln_y,
                       lookland->lnd_x, lookland->lnd_y);
        if (dist > vrange)

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index db0466508771c565c8beb6025c436d21cd10438b..5cf362a6e4abc7a0c55a6a2f7f9639e2cbd61d9b 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -803,9 +803,8 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
   if (ship.shp_mobil <= 0)
   continue;
 */
-           erange = ship.shp_effic *
-               techfact(ship.shp_tech, ((double)ship.shp_frnge))
-               / 100.0;
+           erange = ship.shp_effic
+               * techfact(ship.shp_tech, ship.shp_frnge) / 100.0;
            erange = (double)roundrange(erange);
            range = mapdist(ship.shp_x, ship.shp_y, ax, ay);
            if (range > erange)

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 68785283826abd55144616a94148564b0ad3e293..266f9733da769159983e7c6692ae51523034752c 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -131,9 +131,9 @@ navi(void)
        }
        radmapnopr(shp->shp_x, shp->shp_y, (int)shp->shp_effic,
                   (int)techfact(shp->shp_tech,
-                                (double)mchr[(int)shp->shp_type].m_vrnge),
-                  (double)((mchr[(int)shp->shp_type].m_flags & M_SONAR)
-                           ? techfact(shp->shp_tech, 1.0) : 0.0));
+                                mchr[(int)shp->shp_type].m_vrnge),
+                  (mchr[(int)shp->shp_type].m_flags & M_SONAR)
+                  ? techfact(shp->shp_tech, 1.0) : 0.0);
        if (cp == 0 || *cp == '\0')
            cp = &dirch[DIR_STOP];
        if (*cp == 'M' ||

diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index fbfd4d2ce26473ded9daff5ef87376f09fba74c5..3de1333f138fa1952301a42e8a4f4fe61fd63570 100644 (file)
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -132,7 +132,7 @@ rada(void)
                }
                tf = 0.0;
                pr("%s at ", prland(&land));
-               tech = techfact(land.lnd_tech, (double)land.lnd_spy);
+               tech = techfact(land.lnd_tech, land.lnd_spy);
                if (tech > ((double)WORLD_Y / 2.0))
                    tech = ((double)WORLD_Y / 2.0);
                if (tech > ((double)WORLD_X / 4.0))

diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c
index a24fbe51af8117eef6603fd7928f2834dc9b3aad..e4648b474c22d08942f768bb0b14b6ad12d86b9e 100644 (file)
--- a/src/lib/commands/sona.c
+++ b/src/lib/commands/sona.c
@@ -115,7 +115,7 @@ sona(void)
        getsect(ship.shp_x, ship.shp_y, &sect);
        if (sect.sct_type != SCT_WATER)
            continue;
-       range = (int)techfact(ship.shp_tech, (double)mcp->m_vrnge);
+       range = (int)techfact(ship.shp_tech, mcp->m_vrnge);
        srange = MIN(7, 7 * range * ship.shp_effic / 200);
        pr("%s at %s efficiency %d%%, max range %d\n",
           prship(&ship),
@@ -248,9 +248,7 @@ plane_sona(struct emp_qelem *plane_list, int x, int y,
        pcp = ip->pcp;
        if (!(pcp->pl_flags & P_A))     /* if it isn't an ASW plane */
            continue;
-       range =
-           (int)techfact(pp->pln_tech,
-                         (double)((100 - pp->pln_acc) / 10));
+       range = (int)techfact(pp->pln_tech, (100 - pp->pln_acc) / 10);
 /*
                for (i=0; targ = getshipp(i); i++) {
 */

diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c
index 11048775ef25ce92d5c0235e13fa00bb542a0681..80236c60cfd2fc38cfb8fe2d358b49eb50adeca7 100644 (file)
--- a/src/lib/commands/torp.c
+++ b/src/lib/commands/torp.c
@@ -165,7 +165,7 @@ torp(void)
            continue;
        }
        erange = ((double)sub.shp_effic / 100.0) *
-           techfact(sub.shp_tech, ((double)sub.shp_frnge));
+           techfact(sub.shp_tech, sub.shp_frnge);
        erange = (double)roundrange(erange);
        pr("Effective torpedo range is %.1f\n", erange);
        shells -= SHP_TORP_SHELLS;
@@ -263,7 +263,7 @@ anti_torp(int f, int ntorping, int vshipown)
        if (!canshoot(&dd, &sub))
            continue;
 
-       erange = techfact(dd.shp_tech, ((double)dd.shp_frnge)) / 2.0;
+       erange = techfact(dd.shp_tech, dd.shp_frnge) / 2.0;
 
        erange = (double)roundrange(erange);
 

diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 9f356fbce27f6ebb992036e78a19523aea489c13..fcf241dbedce99a09b68f71aff97fed77e786967 100644 (file)
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -245,7 +245,7 @@ tran_plane(void)
        return RET_FAIL;
     }
     dam = 1;
-    mcost = move_ground(&sect, &endsect, (double)weight,
+    mcost = move_ground(&sect, &endsect, weight,
                        player->argp[3], tran_map, 0, &dam);
     dam /= count;
     if (mcost < 0)

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index 400055c6eb1f07e9c809185a89b33b566bd42250..e8235201c847aae582749891a1baebdc0b29c9b1 100644 (file)
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -845,7 +845,7 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
        }
        if (gun == 0 || shell == 0)
            continue;
-       firing = (int)(techfact(ship.shp_tech, (double)gun) * 2.0);
+       firing = (int)(techfact(ship.shp_tech, gun) * 2.0);
        guns += firing;
 
        if (!nats[ship.shp_own]) {
@@ -863,7 +863,7 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
     if (guns > 0) {
        if (guns > 14)
            guns = 14;
-       guns = 2.0 * tfact(from, (double)guns);
+       guns = 2.0 * tfact(from, guns);
        PR(plane_owner, "Flak!  Ships firing %d flak guns...\n", guns);
        ac_fireflak(list, from, 0, guns);
     }
@@ -908,8 +908,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
        rel = getrel(getnatp(land.lnd_own), plane_owner);
        if (rel > HOSTILE)
            continue;
-       firing =
-           (int)(techfact(land.lnd_tech, (double)land.lnd_aaf) * 3.0);
+       firing = (int)(techfact(land.lnd_tech, land.lnd_aaf) * 3.0);
        guns += firing;
 
        if (!nats[land.lnd_own]) {
@@ -928,7 +927,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
     if (guns > 0) {
        if (guns > 14)
            guns = 14;
-       guns = 2.0 * tfact(from, (double)guns);
+       guns = 2.0 * tfact(from, guns);
        PR(plane_owner, "Flak!  Land units firing %d flak guns...\n",
           guns);
        ac_fireflak(list, from, 0, guns);

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 45579b063ad9208ee5c7e17e39a7472839c51a75..60fa0dfd971ed3ceab51c6fbda2551d6284b86d5 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -940,7 +940,7 @@ lnd_fort_interdiction(struct emp_qelem *list,
        gun = fsect.sct_item[I_GUN];
        if (gun < 1)
            continue;
-       range = tfactfire(fsect.sct_own, (double)MIN(gun, 7));
+       range = tfactfire(fsect.sct_own, MIN(gun, 7));
        if (fsect.sct_effic > 59)
            range++;
        range2 = roundrange(range);

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 08f81f79e5b85330ce46c6dbb265dab40df87212..b73d0cc926940f5927bb3028a501a4f32d860bd3 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -531,7 +531,7 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
                    continue;
                if (!(mcp->m_flags & M_DCH) && !(mcp->m_flags & M_SUBT))
                    continue;
-               range2 = techfact(sp->shp_tech, (double)mcp->m_vrnge);
+               range2 = techfact(sp->shp_tech, mcp->m_vrnge);
                range2 *= (double)sp->shp_effic / 200.0;
                if (md > range2)
                    continue;
@@ -557,9 +557,8 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
                if (shell < SHP_TORP_SHELLS)
                    continue;
 
-               range = sp->shp_effic * techfact(sp->shp_tech,
-                                                ((double)sp->shp_frnge)) /
-                   100.0;
+               range = sp->shp_effic
+                   * techfact(sp->shp_tech, sp->shp_frnge) / 100.0;
 
                range2 = (double)roundrange(range);
                if (md > range)

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 698ef8489692e3c67430972f1c7d3b4a0cfb37fe..5e00cf45211eee8a1416e18efd12c5e24b91b7e4 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -675,7 +675,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
        gun = fsect.sct_item[I_GUN];
        if (gun < 1)
            continue;
-       range = tfactfire(fsect.sct_own, (double)MIN(gun, 7));
+       range = tfactfire(fsect.sct_own, MIN(gun, 7));
        if (fsect.sct_effic > 59)
            range++;
        range2 = roundrange(range);
@@ -878,7 +878,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
        putship(mlp->ship.shp_uid, &mlp->ship);
 
        /* Now update the map for this ship */
-       tech = techfact(mlp->ship.shp_tech, (double)mlp->mcp->m_vrnge);
+       tech = techfact(mlp->ship.shp_tech, mlp->mcp->m_vrnge);
        if (mlp->mcp->m_flags & M_SONAR)
            tf = techfact(mlp->ship.shp_tech, 1.0);
        else

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index ff328c41bd0fe5f38ef0d7ff54abc2f90ea680ec..fe2b2ef97f571c28dc1eb9199e063fc54b264509 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -279,12 +279,12 @@ landrepair(struct lndstr *land, struct natstr *np,
     leftp = ((float)left / 100.0);
 
     memset(mvec, 0, sizeof(mvec));
-    mvec[I_LCM] = lcm_needed = ldround((double)(lp->l_lcm * leftp), 1);
-    mvec[I_HCM] = hcm_needed = ldround((double)(lp->l_hcm * leftp), 1);
+    mvec[I_LCM] = lcm_needed = ldround(lp->l_lcm * leftp, 1);
+    mvec[I_HCM] = hcm_needed = ldround(lp->l_hcm * leftp, 1);
 /*
-        mvec[I_GUN] = gun_needed = ldround((double)(lp->l_gun * leftp),1);
-        mvec[I_MILIT] = mil_needed = ldround((double)(lp->l_mil * leftp),1);
-        mvec[I_SHELL] = shell_needed = ldround((double)(lp->l_shell *leftp),1);
+        mvec[I_GUN] = gun_needed = ldround(lp->l_gun * leftp, 1);
+        mvec[I_MILIT] = mil_needed = ldround(lp->l_mil * leftp, 1);
+        mvec[I_SHELL] = shell_needed = ldround(lp->l_shell *leftp, 1);
  */
     mvec[I_GUN] = gun_needed = 0;
     mvec[I_MILIT] = mil_needed = 0;
@@ -305,15 +305,15 @@ landrepair(struct lndstr *land, struct natstr *np,
     if (mvec[I_SHELL] < shell_needed)
        buildp = MIN(buildp, ((float)mvec[I_SHELL] / (float)lp->l_shell));
 
-    build = ldround((double)(buildp * 100.0), 1);
+    build = ldround(buildp * 100.0, 1);
 
     memset(mvec, 0, sizeof(mvec));
-    mvec[I_LCM] = lcm_needed = roundavg((double)(lp->l_lcm * buildp));
-    mvec[I_HCM] = hcm_needed = roundavg((double)(lp->l_hcm * buildp));
+    mvec[I_LCM] = lcm_needed = roundavg(lp->l_lcm * buildp);
+    mvec[I_HCM] = hcm_needed = roundavg(lp->l_hcm * buildp);
 /*
-        mvec[I_GUN] = gun_needed = roundavg((double)(lp->l_gun * buildp));
-        mvec[I_MILIT] = mil_needed = roundavg((double)(lp->l_mil * buildp));
-        mvec[I_SHELL] = shell_needed = roundavg((double)(lp->l_shell *buildp));
+        mvec[I_GUN] = gun_needed = roundavg(lp->l_gun * buildp);
+        mvec[I_MILIT] = mil_needed = roundavg(lp->l_mil * buildp);
+        mvec[I_SHELL] = shell_needed = roundavg(lp->l_shell *buildp);
  */
     mvec[I_GUN] = gun_needed = 0;
     mvec[I_MILIT] = mil_needed = 0;

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index 520256b699d390910913cde42727ae089c4b097d..8aa20f13732ff2ab80ad2fc953b2e3796ee1c27c 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -193,12 +193,9 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
 
            leftp = ((float)left / 100.0);
            memset(mvec, 0, sizeof(mvec));
-           mvec[I_MILIT] = mil_needed =
-               ldround((double)(plp->pl_crew * leftp), 1);
-           mvec[I_LCM] = lcm_needed =
-               ldround((double)(plp->pl_lcm * leftp), 1);
-           mvec[I_HCM] = hcm_needed =
-               ldround((double)(plp->pl_hcm * leftp), 1);
+           mvec[I_MILIT] = mil_needed = ldround(plp->pl_crew * leftp, 1);
+           mvec[I_LCM] = lcm_needed = ldround(plp->pl_lcm * leftp, 1);
+           mvec[I_HCM] = hcm_needed = ldround(plp->pl_hcm * leftp, 1);
 
            get_materials(sp, bp, mvec, 0);
 
@@ -215,14 +212,11 @@ prod_plane(int etus, int natnum, int *bp, int buildem)
                buildp = MIN(buildp, ((float)mvec[I_HCM] /
                                      (float)plp->pl_hcm));
 
-           build = ldround((double)(buildp * 100.0), 1);
+           build = ldround(buildp * 100.0, 1);
            memset(mvec, 0, sizeof(mvec));
-           mvec[I_MILIT] = mil_needed =
-               roundavg((double)(plp->pl_crew * buildp));
-           mvec[I_LCM] = lcm_needed =
-               roundavg((double)(plp->pl_lcm * buildp));
-           mvec[I_HCM] = hcm_needed =
-               roundavg((double)(plp->pl_hcm * buildp));
+           mvec[I_MILIT] = mil_needed = roundavg(plp->pl_crew * buildp);
+           mvec[I_LCM] = lcm_needed = roundavg(plp->pl_lcm * buildp);
+           mvec[I_HCM] = hcm_needed = roundavg(plp->pl_hcm * buildp);
 
            get_materials(sp, bp, mvec, 1);
 

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index d4944d05a67380e7925e9e00b326ff650fae0f77..eadb81bf7b4194e7ea2dda4e9b3411337b7c9ad4 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -78,7 +78,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
     tech = np->nat_level[NAT_TLEV];
     pct = (double)((tech - 40) / 40.0 + edu / 3.0);
     if (sp->sct_own == sp->sct_oldown && hap < pct &&
-       chance((double)(((double)pct - (double)hap) / (double)5.0))) {
+       chance(((double)pct - (double)hap) / (double)5.0)) {
        /*
         * zap the loyalty of unhappy civilians.
         * there is a 20% chance per hap point below the

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 4737077da622560cd82a91e58020b7ef3cd8de65..80cb5aab95b5c9205a291dba6a3b45a0ba77bb55 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -347,8 +347,8 @@ shiprepair(struct shpstr *ship, struct natstr *np,
 
     leftp = ((float)left / 100.0);
     memset(mvec, 0, sizeof(mvec));
-    mvec[I_LCM] = lcm_needed = ldround((double)(mp->m_lcm * leftp), 1);
-    mvec[I_HCM] = hcm_needed = ldround((double)(mp->m_hcm * leftp), 1);
+    mvec[I_LCM] = lcm_needed = ldround(mp->m_lcm * leftp, 1);
+    mvec[I_HCM] = hcm_needed = ldround(mp->m_hcm * leftp, 1);
 
     get_materials(sp, bp, mvec, 0);
 
@@ -359,10 +359,10 @@ shiprepair(struct shpstr *ship, struct natstr *np,
     if (mvec[I_HCM] < hcm_needed)
        buildp = MIN(buildp, ((float)mvec[I_HCM] / (float)mp->m_hcm));
 
-    build = ldround((double)(buildp * 100.0), 1);
+    build = ldround(buildp * 100.0, 1);
     memset(mvec, 0, sizeof(mvec));
-    mvec[I_LCM] = lcm_needed = roundavg((double)(mp->m_lcm * buildp));
-    mvec[I_HCM] = hcm_needed = roundavg((double)(mp->m_hcm * buildp));
+    mvec[I_LCM] = lcm_needed = roundavg(mp->m_lcm * buildp);
+    mvec[I_HCM] = hcm_needed = roundavg(mp->m_hcm * buildp);
 
     get_materials(sp, bp, mvec, 1);