From 5d1e0c8d391107635b805438a915a8e9a2f0f43b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 3 Sep 2002 16:57:19 +0000 Subject: [PATCH] bugfixes alliances --- src/common/kernel/eressea.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 5828c5507..b1254ca49 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -763,16 +763,16 @@ alliance(const ally * sf, const faction * f, int mode) int 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 -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 - if (sf->alliance!=f2->alliance) return 0; + if (f->alliance!=f2->alliance) return 0; #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. */