forked from github/server
Hirntöter scheinen Einheit mit RdU im Astralraum zu sehen Einheiten, die von einem Schiff in eine andere Region gebeamt werden, haben leftship() gesetzt. Issue: 538
This commit is contained in:
parent
54fbc30359
commit
8d5700a38b
|
@ -1863,8 +1863,13 @@ travel(unit * u, region_list ** routep)
|
||||||
|
|
||||||
/* a few pre-checks that need not be done for each step: */
|
/* a few pre-checks that need not be done for each step: */
|
||||||
if (rterrain(r)!=T_OCEAN) {
|
if (rterrain(r)!=T_OCEAN) {
|
||||||
|
ship * sh = u->ship;
|
||||||
/* An Land kein NACH wenn in dieser Runde Schiff VERLASSEN! */
|
/* An Land kein NACH wenn in dieser Runde Schiff VERLASSEN! */
|
||||||
if ((u->ship || leftship(u)) && is_guarded(r, u, GUARD_LANDING)) {
|
if (sh==NULL) {
|
||||||
|
sh = leftship(u);
|
||||||
|
if (sh && sh->region!=u->region) sh = NULL;
|
||||||
|
}
|
||||||
|
if (sh && is_guarded(r, u, GUARD_LANDING)) {
|
||||||
cmistake(u, u->thisorder, 70, MSG_MOVE);
|
cmistake(u, u->thisorder, 70, MSG_MOVE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue