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

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

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 75c6d984c4e8aeab146c1381d35e2c81e92fe93c..09b53a0e97ab8df645d8c1fda7c53503c12b3b76 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -249,8 +249,8 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
 
        getsect(newx, newy, &sect);
        if (shp_check_nav(&sect, sp) != CN_NAVIGABLE ||
-           (sect.sct_own && sect.sct_own != sp->shp_own &&
-            getrel(getnatp(sect.sct_own), sp->shp_own) < FRIENDLY)) {
+           (sect.sct_own
+            && relations_with(sect.sct_own, sp->shp_own) < FRIENDLY)) {
            wu(0, sp->shp_own, "%s %s,\nbut could not retreat to %s!\n",
               prship(sp), conditions[findcondition(code)].desc[orig],
               xyas(newx, newy, sp->shp_own));