forked from github/server
HELFE stati vermurkst beim Allianzen-Merge
This commit is contained in:
parent
06ffd492f3
commit
c58e45e276
|
@ -1468,9 +1468,6 @@ addally(const faction * f, ally ** sfp, int aid, int state)
|
||||||
state &= ~HELP_TRAVEL;
|
state &= ~HELP_TRAVEL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (af==NULL) return sfp;
|
|
||||||
if (f->alliance==NULL || f->alliance!=af->alliance) state &= ~AllianceRestricted();
|
|
||||||
if (f->alliance==NULL || f->alliance==af->alliance) state |= AllianceAuto();
|
|
||||||
if (state==0) return sfp;
|
if (state==0) return sfp;
|
||||||
|
|
||||||
sf = calloc(1, sizeof(ally));
|
sf = calloc(1, sizeof(ally));
|
||||||
|
|
Loading…
Reference in New Issue