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=875 

Folge Schiff hat falschen Befehl in Fehlermeldung
This commit is contained in:
Enno Rehling 2006-04-08 06:48:54 +00:00
parent 33c1741fff
commit 1dd85e6a02
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2225,7 +2225,7 @@ hunted_dir(attrib *at, int id)
} }
static int static int
hunt(unit *u) hunt(unit *u, order * ord)
{ {
region *rc = u->region; region *rc = u->region;
int moves, id; int moves, id;
@ -2235,19 +2235,19 @@ hunt(unit *u)
if (fval(u, UFL_LONGACTION)) { if (fval(u, UFL_LONGACTION)) {
return 0; return 0;
} else if (u->ship == NULL) { } else if (u->ship == NULL) {
cmistake(u, u->thisorder, 144, MSG_MOVE); cmistake(u, ord, 144, MSG_MOVE);
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} else if (!fval(u, UFL_OWNER)) { } else if (!fval(u, UFL_OWNER)) {
cmistake(u, u->thisorder, 146, MSG_MOVE); cmistake(u, ord, 146, MSG_MOVE);
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} else if (fval(u, UFL_NOTMOVING)) { } else if (fval(u, UFL_NOTMOVING)) {
cmistake(u, u->thisorder, 187, MSG_MOVE); cmistake(u, ord, 187, MSG_MOVE);
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} else if (!can_move(u)) { } else if (!can_move(u)) {
cmistake(u, u->thisorder, 55, MSG_MOVE); cmistake(u, ord, 55, MSG_MOVE);
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} }
@ -2255,7 +2255,7 @@ hunt(unit *u)
id = getshipid(); id = getshipid();
if (id <= 0) { if (id <= 0) {
cmistake(u, u->thisorder, 20, MSG_MOVE); cmistake(u, ord, 20, MSG_MOVE);
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} }
@ -2265,7 +2265,7 @@ hunt(unit *u)
if (dir == NODIRECTION) { if (dir == NODIRECTION) {
ship * sh = findship(id); ship * sh = findship(id);
if (sh == NULL || sh->region!=rc) { if (sh == NULL || sh->region!=rc) {
cmistake(u, u->thisorder, 20, MSG_MOVE); cmistake(u, ord, 20, MSG_MOVE);
} }
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
@ -2356,7 +2356,7 @@ move_hunters(void)
break; break;
} }
if (!fval(u, UFL_LONGACTION) && !LongHunger(u) && hunt(u)) { if (!fval(u, UFL_LONGACTION) && !LongHunger(u) && hunt(u, ord)) {
up = &r->units; up = &r->units;
break; break;
} }