From 28582c6728152cd55d9f0d5c41af6478011fcd3e Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 24 Mar 2007 21:14:01 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=1160 "Kein langer Befehl nach angeblichem Kampf" Nur ein bischen Kosmetik. --- src/common/kernel/movement.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 1e859130f..14ed09c67 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -2291,10 +2291,6 @@ hunt(unit *u, order * ord) cmistake(u, ord, 146, MSG_MOVE); fset(u, UFL_LONGACTION|UFL_NOTMOVING); /* FOLGE SCHIFF ist immer lang */ return 0; - } else if (fval(u, UFL_NOTMOVING)) { - cmistake(u, ord, 319, MSG_MOVE); - fset(u, UFL_LONGACTION|UFL_NOTMOVING); /* FOLGE SCHIFF ist immer lang */ - return 0; } else if (!can_move(u)) { cmistake(u, ord, 55, MSG_MOVE); fset(u, UFL_LONGACTION|UFL_NOTMOVING); /* FOLGE SCHIFF ist immer lang */ @@ -2491,9 +2487,10 @@ movement(void) if (fval(u, UFL_LONGACTION)) { cmistake(u, u->thisorder, 52, MSG_MOVE); set_order(&u->thisorder, NULL); + } else { + cmistake(u, u->thisorder, 319, MSG_MOVE); + set_order(&u->thisorder, NULL); } - cmistake(u, u->thisorder, 319, MSG_MOVE); - set_order(&u->thisorder, NULL); } else if (fval(u, UFL_MOVED)) { cmistake(u, u->thisorder, 187, MSG_MOVE); set_order(&u->thisorder, NULL);