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

"Einheit konnte sich nach Kampf nicht bewegen"

Not clearing thisorder for fleeing units might do the trick.
This commit is contained in:
Enno Rehling 2007-03-11 23:03:10 +00:00
parent 9aef2904c3
commit 5673207fe3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/kernel/battle.c
View File

@ -2594,9 +2594,7 @@ aftermath(battle * b)
#endif /* SIMPLE_ESCAPE */ #endif /* SIMPLE_ESCAPE */
scale_number(du, df->run.number); scale_number(du, df->run.number);
du->hp = df->run.hp; du->hp = df->run.hp;
set_order(&du->thisorder, NULL);
setguard(du, GUARD_NONE); setguard(du, GUARD_NONE);
fset(du, UFL_LONGACTION|UFL_NOTMOVING);
#ifdef SIMPLE_ESCAPE #ifdef SIMPLE_ESCAPE
if (du->status<=ST_FLEE) leave(du->region, du); if (du->status<=ST_FLEE) leave(du->region, du);
#else #else
@ -2605,6 +2603,7 @@ aftermath(battle * b)
run_to(du, df->run.region); run_to(du, df->run.region);
df->run.region = du->region; df->run.region = du->region;
} }
fset(du, UFL_LONGACTION|UFL_NOTMOVING);
#endif /* SIMPLE_ESCAPE */ #endif /* SIMPLE_ESCAPE */
} else { } else {
/* nur teilweise geflohene Einheiten mergen sich wieder */ /* nur teilweise geflohene Einheiten mergen sich wieder */