Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

https://bugs.eressea.de/view.php?id=2716 

Bei FOLGE Schiff muss das Zile nicht in der gleichen Region sein!
This commit is contained in:
Enno Rehling 2021-01-07 21:53:34 +01:00
parent f09bed10b7
commit 8ef95e6729
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/move.c
View File

@ -2572,6 +2572,12 @@ void follow_cmds(unit * u)
if (id > 0) { if (id > 0) {
u2 = findunit(id); 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) { else if (p == P_SHIP) {
@ -2600,13 +2606,6 @@ void follow_cmds(unit * u)
} }
if (u2) { if (u2) {
bool moving = false; 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)) { switch (getkeyword(u2->thisorder)) {
case K_MOVE: case K_MOVE:
case K_ROUTE: case K_ROUTE: