Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix combat turn > 0

This commit is contained in:
Enno Rehling 2010-01-24 20:31:53 +00:00
parent 2426e5d7f5
commit 60d9e616a8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4235,10 +4235,7 @@ battle_attacks(battle * b)
for (s=b->sides;s!=b->sides+b->nsides;++s) {
fighter *fig;
/* Taktikrunde: */
if (b->turn == 0) {
int tactics = get_tactics(s, NULL);
if (b->max_tactics > 0 && tactics == b->max_tactics) {
if (b->turn!=0 || (b->max_tactics > 0 && get_tactics(s, NULL) == b->max_tactics)) {
for (fig=s->fighters;fig;fig=fig->next) {
/* ist in dieser Einheit noch jemand handlungsfähig? */
@ -4250,7 +4247,6 @@ battle_attacks(battle * b)
}
}
}
}
/** updates the number of attacking troops in each fighter struct.
* this has to be calculated _before_ the actual attacks take