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

http://eressea.upb.de/mantis/view.php?id=981 

"Einheiten aus Reihe 3 rückten unbeabsichtigt auf"
Man sollte doch immer sein eigener Freund sein.
This commit is contained in:
Enno Rehling 2006-08-13 16:27:58 +00:00
parent 442af719f4
commit 7590fa50ef
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ fbattlerecord(battle * b, faction * f, const char *s)
} }
#define enemy(as, ds) (as->relations[ds->index]&E_ENEMY) #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 static void
set_enemy(side * as, side * ds, boolean attacking) set_enemy(side * as, side * ds, boolean attacking)
@ -3548,14 +3548,12 @@ join_allies(battle * b)
int ai; int ai;
for (ai=0; se->enemies[ai]; ++ai) { for (ai=0; se->enemies[ai]; ++ai) {
side * as = se->enemies[ai]; side * as = se->enemies[ai];
if (as!=s) { if (as==s || !enemy(as, s)) {
if (!enemy(as, s)) {
set_friendly(as, s); set_friendly(as, s);
} }
} }
} }
} }
}
} }
static void static void