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

helfe in beide richtungen erlauben

This commit is contained in:
Katja Zedel 2005-06-05 15:50:53 +00:00
parent 12b2db11fa
commit fa1b0a8efc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -987,6 +987,9 @@ alliedgroup(const struct plane * pl, const struct faction * f,
if((a = a_find(f->attribs, &at_npcfaction)) != NULL) { if((a = a_find(f->attribs, &at_npcfaction)) != NULL) {
return mode; return mode;
} }
if((a = a_find(f2->attribs, &at_npcfaction)) != NULL) {
return mode;
}
if (AllianceRestricted() && f->alliance!=f2->alliance) { if (AllianceRestricted() && f->alliance!=f2->alliance) {
mode &= ~AllianceRestricted(); mode &= ~AllianceRestricted();
} }