From 60d9e616a8a99664dbbcf710d3db42c8c02c4b68 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 24 Jan 2010 20:31:53 +0000 Subject: [PATCH] bugfix combat turn > 0 --- src/common/kernel/battle.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 33832a09c..0f8fd6c50 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -4235,18 +4235,14 @@ 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) { - for (fig=s->fighters;fig;fig=fig->next) { + 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? */ - if (fig->fighting <= 0) continue; + /* ist in dieser Einheit noch jemand handlungsfähig? */ + if (fig->fighting <= 0) continue; - /* Handle the unit's attack on someone */ - do_attack(fig); - } + /* Handle the unit's attack on someone */ + do_attack(fig); } } }