From 5673207fe32f85a3ea9e8865b90dedf8aa2560c9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 11 Mar 2007 23:03:10 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=1151 "Einheit konnte sich nach Kampf nicht bewegen" Not clearing thisorder for fleeing units might do the trick. --- src/common/kernel/battle.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index dc237f575..7556ed1dc 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -2594,9 +2594,7 @@ aftermath(battle * b) #endif /* SIMPLE_ESCAPE */ scale_number(du, df->run.number); du->hp = df->run.hp; - set_order(&du->thisorder, NULL); setguard(du, GUARD_NONE); - fset(du, UFL_LONGACTION|UFL_NOTMOVING); #ifdef SIMPLE_ESCAPE if (du->status<=ST_FLEE) leave(du->region, du); #else @@ -2605,6 +2603,7 @@ aftermath(battle * b) run_to(du, df->run.region); df->run.region = du->region; } + fset(du, UFL_LONGACTION|UFL_NOTMOVING); #endif /* SIMPLE_ESCAPE */ } else { /* nur teilweise geflohene Einheiten mergen sich wieder */