Use relations_with() for US==THEM || getrel(getnatp(US), THEM)

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

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 07fe00b297a661b8880efe43ffd94da364065d7f..5883d2ba59e3bac417a50df5a4009983256f61e7 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -750,8 +750,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
        navigate = shp_check_nav(&sect, &mlp->unit.ship);
        if (navigate != CN_NAVIGABLE ||
            (sect.sct_own
-            && sect.sct_own != actor
-            && getrel(getnatp(sect.sct_own), actor) < FRIENDLY)) {
+            && 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)