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

http://eressea.upb.de/mantis/view.php?id=593 

Einheit mit FOLGE-Befehl führt keinen langen Befehl aus obwohl führende Einheit sich nicht bewegt hat

Verbesserung: Wenn NACH oder ROUTE nicht der gewählte lange Befehl sind, wird auch nciht gefolgt.
Des weiteren: Folgende Einheiten mit at_follow werden ebenfalls verfolgt.
This commit is contained in:
Enno Rehling 2005-07-06 22:30:38 +00:00
parent 650a266254
commit a970f3b883
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/kernel/movement.c
View File

@ -2505,25 +2505,43 @@ follow_unit(void)
if (a && !fval(u, UFL_MOVED)) { if (a && !fval(u, UFL_MOVED)) {
unit * u2 = a->data.v; unit * u2 = a->data.v;
boolean follow = false;
if (!u2 || u2->region!=r || !cansee(u->faction, r, u2, 0)) if (!u2 || u2->region!=r || !cansee(u->faction, r, u2, 0))
continue; continue;
for (ord=u2->orders;ord;ord=ord->next) {
switch (get_keyword(ord)) { switch (get_keyword(u2->thisorder)) {
case K_MOVE: case K_MOVE:
case K_ROUTE: case K_ROUTE:
case K_DRIVE: case K_DRIVE:
follow = true;
break;
default:
for (ord=u2->orders;ord;ord=ord->next) {
switch (get_keyword(ord)) {
case K_FOLLOW: case K_FOLLOW:
case K_PIRACY: case K_PIRACY:
fset(u, UFL_FOLLOWING); follow = true;
fset(u2, UFL_FOLLOWED);
set_order(&u->thisorder, NULL);
break; break;
default: default:
continue; continue;
} }
break; break;
} }
break;
}
if (!follow) {
attrib * a2 = a_find(u2->attribs, &at_follow);
if (a2!=NULL) {
unit * u3 = a2->data.v;
follow = (u3 && u2->region==u2->region);
}
}
if (follow) {
fset(u, UFL_FOLLOWING);
fset(u2, UFL_FOLLOWED);
set_order(&u->thisorder, NULL);
}
} }
} }
} }