empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let ships navigate bridge spans regardless of owner

Browse source
This commit is contained in:
Markus Armbruster 2008-04-24 20:25:48 +02:00 • committed by Markus Armbruster
parent f7d6181717
commit 4e962406ff
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/lib/subs/retreat.c
View file

@ -251,6 +251,7 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
getsect(newx, newy, &sect); getsect(newx, newy, &sect);
if (shp_check_nav(&sect, sp) != CN_NAVIGABLE || if (shp_check_nav(&sect, sp) != CN_NAVIGABLE ||
(sect.sct_own && sect.sct_own != sp->shp_own && (sect.sct_own && sect.sct_own != sp->shp_own &&
sect.sct_type != SCT_BSPAN &&
getrel(getnatp(sect.sct_own), sp->shp_own) < FRIENDLY)) { getrel(getnatp(sect.sct_own), sp->shp_own) < FRIENDLY)) {
wu(0, sp->shp_own, "%s %s,\nbut could not retreat to %s!\n", wu(0, sp->shp_own, "%s %s,\nbut could not retreat to %s!\n",
prship(sp), conditions[findcondition(code)].desc[orig], prship(sp), conditions[findcondition(code)].desc[orig],

1
src/lib/subs/shpsub.c
View file

@ -753,6 +753,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
navigate = shp_check_nav(&sect, &mlp->unit.ship); navigate = shp_check_nav(&sect, &mlp->unit.ship);
if (navigate != CN_NAVIGABLE || if (navigate != CN_NAVIGABLE ||
(sect.sct_own && actor != sect.sct_own && (sect.sct_own && actor != sect.sct_own &&
sect.sct_type != SCT_BSPAN &&
getrel(getnatp(sect.sct_own), actor) < FRIENDLY)) { getrel(getnatp(sect.sct_own), actor) < FRIENDLY)) {
if (dchr[sect.sct_type].d_nav == NAV_CANAL && if (dchr[sect.sct_type].d_nav == NAV_CANAL &&
!(((struct mchrstr *)mlp->chrp)->m_flags & M_CANAL) && !(((struct mchrstr *)mlp->chrp)->m_flags & M_CANAL) &&