From cc9714fca6e288b0f6f852092c385328a234d076 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 26 Feb 2006 15:58:44 +0000
Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D84?=
 =?UTF-8?q?7=20Frisch=20auferstandene=20Untote=20k=C3=A4mpfen=20mit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- join_allies checkt jetzt auf UFL_ISNEW
---
 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 5b23ef334..fced95187 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -3384,7 +3384,7 @@ join_allies(battle * b)
   size_t 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_LONGACTION) && u->number > 0)
+    if (u->status != ST_FLEE && u->status != ST_AVOID && !fval(u, UFL_LONGACTION|UFL_ISNEW) && u->number > 0)
     {
       size_t si;
       faction * f = u->faction;