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

bugfixes alliances

This commit is contained in:
Enno Rehling 2002-09-03 16:57:19 +00:00
parent cacde10bec
commit 5d1e0c8d39
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/kernel/eressea.c
View File

@ -763,16 +763,16 @@ alliance(const ally * sf, const faction * f, int mode)
int int
alliedgroup(const struct plane * pl, const struct faction * f, const struct ally * sf, const struct faction * f2, int mode) alliedgroup(const struct plane * pl, const struct faction * f, const struct ally * sf, const struct faction * f2, int mode)
{ {
return alliance(sf, f, mode) | (mode & autoalliance(pl, f, f2)); return alliance(sf, f2, mode) | (mode & autoalliance(pl, f, f2));
} }
int int
alliedfaction(const struct plane * pl, const faction * sf, const faction * f2, int mode) alliedfaction(const struct plane * pl, const faction * f, const faction * f2, int mode)
{ {
#ifdef ALLIANCES #ifdef ALLIANCES
if (sf->alliance!=f2->alliance) return 0; if (f->alliance!=f2->alliance) return 0;
#endif #endif
return alliedgroup(pl, sf, sf->allies, f2, mode); return alliedgroup(pl, f, f->allies, f2, mode);
} }
/* Die Gruppe von Einheit u hat helfe zu f2 gesetzt. */ /* Die Gruppe von Einheit u hat helfe zu f2 gesetzt. */