From 7590fa50ef053e89a127dfe0e3250d1633f7a82c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 13 Aug 2006 16:27:58 +0000 Subject: [PATCH] =?UTF-8?q?http://eressea.upb.de/mantis/view.php=3Fid=3D98?= =?UTF-8?q?1=20"Einheiten=20aus=20Reihe=203=20r=C3=BCckten=20unbeabsichtig?= =?UTF-8?q?t=20auf"=20Man=20sollte=20doch=20immer=20sein=20eigener=20Freun?= =?UTF-8?q?d=20sein.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/kernel/battle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 68fc16ce2..d65141e92 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -285,7 +285,7 @@ fbattlerecord(battle * b, faction * f, const char *s) } #define enemy(as, ds) (as->relations[ds->index]&E_ENEMY) -#define friendly(as, ds) (as->relations[ds->index]&E_FRIEND) +#define friendly(as, ds) (as->bf->faction==ds->bf->faction || (as->relations[ds->index]&E_FRIEND)) static void set_enemy(side * as, side * ds, boolean attacking) @@ -3548,10 +3548,8 @@ join_allies(battle * b) int ai; for (ai=0; se->enemies[ai]; ++ai) { side * as = se->enemies[ai]; - if (as!=s) { - if (!enemy(as, s)) { - set_friendly(as, s); - } + if (as==s || !enemy(as, s)) { + set_friendly(as, s); } } }