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

"Immer noch Probleme mit Kampf-Bewegungsregel"
Taktikrunde nur mitzaehlen, wenn man sie auch gekriegt hat.
This commit is contained in:
Enno Rehling 2006-07-30 14:21:44 +00:00
parent 91bf99036e
commit 3ff6208bb1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2460,8 +2460,17 @@ aftermath(battle * b)
fighter *df; fighter *df;
#ifndef SIMPLE_COMBAT #ifndef SIMPLE_COMBAT
boolean relevant = false; /* Kampf relevant für diese Partei? */ boolean relevant = false; /* Kampf relevant für diese Partei? */
if (s->bf->lastturn+(b->has_tactics_turn?1:0)>1) {
if (s->bf->lastturn>1) {
relevant = true; relevant = true;
} else if (s->bf->lastturn==1 && b->has_tactics_turn) {
side * stac;
for (stac=b->sides; stac; stac=stac->next) {
if (stac->leader.value == b->max_tactics && helping(stac, s)) {
relevant = true;
break;
}
}
} }
#endif #endif
s->flee = 0; s->flee = 0;