From b8b243339f564e5f66aabfe066c196f43b46745b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 27 Mar 2006 20:43:57 +0000 Subject: [PATCH] (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. --- src/lib/subs/retreat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 5a90d29c..2db7c901 100644 --- 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, §); if (shp_check_nav(§, 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],