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

- falsches flag gesetzt 

- join_allies ordentlich formatiert
This commit is contained in:
Enno Rehling 2004-05-30 02:24:53 +00:00
parent a240be83a2
commit 0145b78d88
2 changed files with 68 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3312,8 +3312,6 @@ join_allies(battle * b)
if (s->bf->faction!=f) {
/* Wenn wir attackiert haben, kommt niemand mehr hinzu: */
if (s->bf->attacker) continue;
/* Wenn alliierte attackiert haben, helfen wir nicht mit: */
if (s->bf->faction!=f && s->bf->attacker) continue;
/* alliiert müssen wir schon sein, sonst ist's eh egal : */
if (!alliedunit(u, s->bf->faction, HELP_FIGHT)) continue;
/* wenn die partei verborgen ist, oder gar eine andere

4
src/eressea/lua/faction.cpp
View File

@ -117,8 +117,8 @@ faction_setpolicy(faction& a, faction& b, const char * flag, bool value)
for (mode=0;helpmodes[mode].name!=NULL;++mode) {
if (strcmp(flag, helpmodes[mode].name)==0) {
if (value) set_alliance(&a, &b, get_alliance(&a, &b) | mode);
else set_alliance(&a, &b, get_alliance(&a, &b) & ~mode);
if (value) set_alliance(&a, &b, get_alliance(&a, &b) | helpmodes[mode].status);
else set_alliance(&a, &b, get_alliance(&a, &b) & ~helpmodes[mode].status);
break;
}
}