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

bugfix at_gm und alliances

This commit is contained in:
Enno Rehling 2001-02-18 12:30:10 +00:00
parent f19b1a1419
commit e35c2d23dd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* $Id: eressea.c,v 1.18 2001/02/18 12:20:37 corwin Exp $ * $Id: eressea.c,v 1.19 2001/02/18 12:30:10 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de)
@ -743,6 +743,15 @@ allied(const unit * u, const faction * f2, int mode)
pl = getplane(u->region); pl = getplane(u->region);
if (pl && pl->flags & PFL_FRIENDLY) return mode; if (pl && pl->flags & PFL_FRIENDLY) return mode;
/* if f2 is a gm in this plane, everyone has an auto-help to it */
a = a_find(f2->attribs, &at_gm);
while (a) {
plane * p = (plane*)a->data.v;
if (p==pl) return mode;
a=a->next;
}
if (mode != HELP_GIVE && pl && (pl->flags & PFL_NOALLIANCES)) if (mode != HELP_GIVE && pl && (pl->flags & PFL_NOALLIANCES))
return 0; return 0;
a = a_find(u->attribs, &at_group); a = a_find(u->attribs, &at_group);