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

alliedunit() bugfix

This commit is contained in:
Enno Rehling 2002-12-14 16:19:05 +00:00
parent 961a036d19
commit 8c8f36f64c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,7 +785,7 @@ alliedunit(const unit * u, const faction * f2, int mode)
sf = u->faction->allies; sf = u->faction->allies;
a = a_find(u->attribs, &at_group); a = a_find(u->attribs, &at_group);
if (a!=NULL) sf = ((group*)a->data.v)->allies; 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 boolean