Let ships navigate bridge spans regardless of owner

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 57eceeae7d4762cae4da6afc5296dc0de619f38a..b3fb5ef7b39c5c214fbef53c2e16f807de19a163 100644 (file)
--- 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, &sect);
        if (shp_check_nav(&sect, 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 bcdd5869b383c9270810d5c833b23fcf530a0fcb..f5b90fd9b99bd482f4ebc80d1a36f23bcc6a64a8 100644 (file)
--- 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(&sect, &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) &&