From a240be83a29d7e3290c0a4ef033316df7d155cbc Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 30 May 2004 01:52:54 +0000 Subject: [PATCH] =?UTF-8?q?-=20Kein=20Test=20auf=20UFL=5FMOVED=20(weil=20s?= =?UTF-8?q?onst=20teleports=20vorm=20Kampf=20den=20Kampf=20verhindern)=20-?= =?UTF-8?q?=20Daf=C3=BCr=20LONGACTION=20setzen=20bei=20einer=20Flucht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/kernel/battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 1312531cc..ab813e5d6 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -3299,7 +3299,7 @@ join_allies(battle * b) int size = cv_size(&b->sides); for (u=r->units;u;u=u->next) /* Was ist mit Schiffen? */ - if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_MOVED) && u->number > 0) + if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_LONGACTION) && u->number > 0) { int si; faction * f = u->faction;