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

cosmetic fixes regarding alliances.

This commit is contained in:
Enno Rehling 2009-07-29 18:34:27 +00:00
parent d456189ace
commit 627b87790b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gamecode/creport.c
View File

@ -947,7 +947,6 @@ show_alliances_cr(FILE * F, const faction * f)
fprintf(F, "ALLIANCE %d\n", al->id); fprintf(F, "ALLIANCE %d\n", al->id);
fprintf(F, "\"%s\";name\n", al->name); fprintf(F, "\"%s\";name\n", al->name);
fprintf(F, "%d;leader\n", al->leader->no); fprintf(F, "%d;leader\n", al->leader->no);
fprintf(F, "%d;leader\n", al->leader->no);
} }
} }

5
src/common/gamecode/report.c
View File

@ -671,7 +671,7 @@ nr_unit(FILE * F, const faction * f, const unit * u, int indent, int mode)
if (u->faction == f) { if (u->faction == f) {
marker = '*'; marker = '*';
} else if (u->faction->alliance == f->alliance && f->alliance) { } else if ALLIED(u->faction, f) {
marker = 'o'; marker = 'o';
} else if (a_otherfaction && f != u->faction && get_otherfaction(a_otherfaction) == f } else if (a_otherfaction && f != u->faction && get_otherfaction(a_otherfaction) == f
&& !fval(u, UFL_PARTEITARNUNG)) { && !fval(u, UFL_PARTEITARNUNG)) {
@ -1703,7 +1703,8 @@ list_address(FILE * F, const faction * uf, const faction_list * seenfactions)
char label = '-'; char label = '-';
sprintf(buf, "%s: %s; %s", factionname(f), f->email, f->banner?f->banner:""); sprintf(buf, "%s: %s; %s", factionname(f), f->email, f->banner?f->banner:"");
if (ALLIED(uf, f)) label = '*'; if (uf==f) label = '*';
else if (ALLIED(uf, f)) label = 'o';
else if (alliedfaction(NULL, uf, f, HELP_ALL)) label = '+'; else if (alliedfaction(NULL, uf, f, HELP_ALL)) label = '+';
rparagraph(F, buf, 4, 0, label); rparagraph(F, buf, 4, 0, label);