(retreat_ship1): Fix sector ownership test. Before, retreating ships

could enter sectors owned by whoever caused the retreat, but not own
sectors.  Reported by Ray Hyatt.  Closes #1346750.

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 5a90d29c8bb0784a0029f8869a0c7b1b38c9775a..2db7c9010d54b46f05d65774704e2f2a2f798be2 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -253,7 +253,7 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
 
        getsect(newx, newy, &sect);
        if (shp_check_nav(&sect, sp) != CN_NAVIGABLE ||
-           (sect.sct_own && !player->owner &&
+           (sect.sct_own && sect.sct_own != sp->shp_own &&
             getrel(getnatp(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],