From 54e6dc3fdc1f9b0a033a67a5df3a6e9429c59a95 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Thu, 23 Dec 2004 00:31:03 +0000
Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D34?=
 =?UTF-8?q?6=20http://eressea.upb.de/mantis/view.php=3Fid=3D341=20-=20wenn?=
 =?UTF-8?q?=20FAHRE=20in=20einer=20Region=20gemacht=20wurde,=20wurden=20ev?=
 =?UTF-8?q?tl.=20Einheiten=20=C3=BCbersprungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/movement.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 3250204c2..2ab073276 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -2386,9 +2386,11 @@ movement(void)
           if (*up && (*up)->region!=r) {
             /* moved the upcoming unit along with u (units on ships or followers,
             * for example). must start from the beginning again immediately */
-            up = NULL;
+            up = &r->units;
+            repeat = false;
+          } else {
+            repeat = true;
           }
-          repeat = true;
         }
         /* else *up is already the next unit */
       }