From 8c8f36f64cbbaf5ea7c8b6dd945714510a1bd664 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 14 Dec 2002 16:19:05 +0000 Subject: [PATCH] alliedunit() bugfix --- src/common/kernel/eressea.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index 5e5c5bcee..1be341ee2 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -785,7 +785,7 @@ alliedunit(const unit * u, const faction * f2, int mode) sf = u->faction->allies; a = a_find(u->attribs, &at_group); if (a!=NULL) sf = ((group*)a->data.v)->allies; - return alliance(sf, mode) | (mode & autoalliance(pl, u->faction, f2)); + return alliedgroup(pl, u->faction, f2, sf, mode); } boolean