From 4e962406ff38fa2c44dd7f973bc3595925b3a475 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 24 Apr 2008 20:25:48 +0200 Subject: [PATCH] Let ships navigate bridge spans regardless of owner --- src/lib/subs/retreat.c | 1 + src/lib/subs/shpsub.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 57eceeae..b3fb5ef7 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -251,6 +251,7 @@ retreat_ship1(struct shpstr *sp, char code, int orig) getsect(newx, newy, §); if (shp_check_nav(§, sp) != CN_NAVIGABLE || (sect.sct_own && sect.sct_own != sp->shp_own && + sect.sct_type != SCT_BSPAN && 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], diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index bcdd5869..f5b90fd9 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -753,6 +753,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor, navigate = shp_check_nav(§, &mlp->unit.ship); if (navigate != CN_NAVIGABLE || (sect.sct_own && actor != sect.sct_own && + sect.sct_type != SCT_BSPAN && getrel(getnatp(sect.sct_own), actor) < FRIENDLY)) { if (dchr[sect.sct_type].d_nav == NAV_CANAL && !(((struct mchrstr *)mlp->chrp)->m_flags & M_CANAL) &&