Use relations_with() in shp_fort_interdiction()

[empserver] / src / lib / subs / shpsub.c

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index f1c6b6e19eb9186d252fa6a52aa2b92df8ee2a09..8ce26bd1cbfb842abbaecc7d8c27c4d144fed6e3 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -589,7 +589,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
 
     /* Inform neutral and worse */
     for (i = 0; i < MAXNOC; ++i) {
-       if (getrel(getnatp(i), victim) <= NEUTRAL)
+       if (relations_with(i, victim) <= NEUTRAL)
            notified[i] = 0;
        else
            notified[i] = 1;
@@ -611,7 +611,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
        return 0;               /* Only coastwatch notify in nofortfire */
     /* Only fire at Hostile ships */
     for (i = 0; i < MAXNOC; ++i) {
-       if (getrel(getnatp(i), victim) >= NEUTRAL)
+       if (relations_with(i, victim) >= NEUTRAL)
            notified[i] = 0;
     }
     snxtsct_dist(&ns, newx, newy, fort_max_interdiction_range);
@@ -732,8 +732,6 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
     coord newy;
     int stopping = 0;
     double mobcost;
-    double tech;               /* for mapping */
-    double tf;                 /* for mapping */
     char dp[80];
     int navigate;
 
@@ -751,8 +749,8 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
        getsect(newx, newy, &sect);
        navigate = shp_check_nav(&sect, &mlp->unit.ship);
        if (navigate != CN_NAVIGABLE ||
-           (sect.sct_own && actor != sect.sct_own &&
-            getrel(getnatp(sect.sct_own), actor) < FRIENDLY)) {
+           (sect.sct_own
+            && relations_with(sect.sct_own, actor) < FRIENDLY)) {
            if (dchr[sect.sct_type].d_nav == NAV_CANAL &&
                !(((struct mchrstr *)mlp->chrp)->m_flags & M_CANAL) &&
                navigate == CN_LANDLOCKED)
@@ -786,15 +784,10 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
        putship(mlp->unit.ship.shp_uid, &mlp->unit.ship);
 
        /* Now update the map for this ship */
-       tech = techfact(mlp->unit.ship.shp_tech,
-                       ((struct mchrstr *)mlp->chrp)->m_vrnge);
-       if (((struct mchrstr *)mlp->chrp)->m_flags & M_SONAR)
-           tf = techfact(mlp->unit.ship.shp_tech, 1.0);
-       else
-           tf = 0.0;
-       radmapupd(mlp->unit.ship.shp_own,
-                 mlp->unit.ship.shp_x, mlp->unit.ship.shp_y,
-                 (int)mlp->unit.ship.shp_effic, (int)tech, tf);
+       rad_map_set(mlp->unit.ship.shp_own,
+                   mlp->unit.ship.shp_x, mlp->unit.ship.shp_y,
+                   mlp->unit.ship.shp_effic, mlp->unit.ship.shp_tech,
+                   ((struct mchrstr *)mlp->chrp)->m_vrnge);
     }
     if (QEMPTY(list))
        return stopping;
@@ -856,7 +849,7 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget)
        if (!(mchr[(int)ship.shp_type].m_flags & M_ANTIMISSILE))
            continue;
 
-       if (getrel(getnatp(ship.shp_own), bombown) >= NEUTRAL)
+       if (relations_with(ship.shp_own, bombown) >= NEUTRAL)
            continue;
 
        if (ship.shp_effic < 60)