From 8d5700a38b9aca6e0bb0870b9020be924c7c6a5a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 4 Jun 2005 14:17:58 +0000 Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D53?= =?UTF-8?q?8=20Hirnt=C3=B6ter=20scheinen=20Einheit=20mit=20RdU=20im=20Astr?= =?UTF-8?q?alraum=20zu=20sehen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Einheiten, die von einem Schiff in eine andere Region gebeamt werden, haben leftship() gesetzt. Issue: 538 --- src/common/kernel/movement.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index fa883e792..4c034181b 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -1863,8 +1863,13 @@ travel(unit * u, region_list ** routep) /* a few pre-checks that need not be done for each step: */ if (rterrain(r)!=T_OCEAN) { + ship * sh = u->ship; /* 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); return; }