From 8ef95e67295225eff621327e3b3bc4fc3feb1860 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 7 Jan 2021 21:53:34 +0100 Subject: [PATCH] https://bugs.eressea.de/view.php?id=2716 Bei FOLGE Schiff muss das Zile nicht in der gleichen Region sein! --- src/move.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/move.c b/src/move.c index 9480e3463..bc2871366 100644 --- a/src/move.c +++ b/src/move.c @@ -2572,6 +2572,12 @@ void follow_cmds(unit * u) if (id > 0) { u2 = findunit(id); + if (!u2 || u2->region != r || !cansee(u->faction, r, u2, 0)) { + ADDMSG(&u->faction->msgs, msg_message("unitnotfound_id", + "unit region command id", u, r, ord, itoa36(id))); + return; + } + } } else if (p == P_SHIP) { @@ -2600,13 +2606,6 @@ void follow_cmds(unit * u) } if (u2) { bool moving = false; - if (u2->region != r || !cansee(u->faction, r, u2, 0)) { - /* FIXME: u2 sollte hier keine TEMP Einheit sein. */ - ADDMSG(&u->faction->msgs, msg_message("unitnotfound_id", - "unit region command id", u, r, ord, itoa36(u2->no))); - return; - } - switch (getkeyword(u2->thisorder)) { case K_MOVE: case K_ROUTE: