Factor out land unit firing range calculation into lnd_fire_range()

[empserver] / src / lib / commands / mfir.c

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index b65e59de1369f89d37f29c457ac9b699874fafc3..b0b9345961bf368de0670aebf59cfb368d44a6a0 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -362,7 +362,7 @@ multifire(void)
                continue;
            }
 
-           range = effrange(fland.lnd_frg, fland.lnd_tech);
+           range = lnd_fire_range(&fland);
            range2 = roundrange(range);
            pr("range is %d.00 (%.2f)\n", range2, range);
            if (target == targ_sub) {
@@ -777,7 +777,7 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
        if ((land.lnd_own != own) && ((rel != ALLIED) || (rel2 != AT_WAR)))
            continue;
 
-       erange = effrange(land.lnd_frg, land.lnd_tech);
+       erange = lnd_fire_range(&land);
        if (roundrange(erange) < ni.curdist)
            continue;