Use relations_with() where its different value doesn't matter

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

diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index c003bceb8561ef79ad73f6a5a28ecc6563aa06d5..29df52f1215563009b8587dc3ae55a676ad186e5 100644 (file)
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -603,7 +603,6 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
     struct mchrstr *mcp;
     double flak, total, ngun;
     int gun;
-    int rel;
     struct plist *plp;
     natid plane_owner;
     natid from;
@@ -619,8 +618,7 @@ ac_shipflak(struct emp_qelem *list, coord x, coord y)
        mcp = &mchr[(int)ship.shp_type];
        if (mcp->m_flags & M_SUB)
            continue;
-       rel = getrel(getnatp(ship.shp_own), plane_owner);
-       if (rel > HOSTILE)
+       if (relations_with(ship.shp_own, plane_owner) > HOSTILE)
            continue;
        gun = shp_usable_guns(&ship);
        if (gun == 0)
@@ -653,7 +651,6 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
     struct lchrstr *lcp;
     double flak, total, ngun;
     int aaf, gun;
-    int rel;
     struct plist *plp;
     natid plane_owner;
     natid from;
@@ -672,8 +669,7 @@ ac_landflak(struct emp_qelem *list, coord x, coord y)
            continue;
        if (land.lnd_ship >= 0 || land.lnd_land >= 0)
            continue;
-       rel = getrel(getnatp(land.lnd_own), plane_owner);
-       if (rel > HOSTILE)
+       if (relations_with(land.lnd_own, plane_owner) > HOSTILE)
            continue;
        flak = aaf * 1.5 * land.lnd_effic / 100.0;
        ngun += flak;