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

helfe parteitarnung auch im CR anzeigen.

This commit is contained in:
Enno Rehling 2003-01-27 23:09:44 +00:00
parent b5a119c47b
commit 2f5ab2a31f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,11 +621,16 @@ cr_output_unit(FILE * F, const region * r,
/* faction info is hidden */
fprintf(F, "%d;Parteitarnung\n", i2b(fval(u, FL_PARTEITARNUNG)));
} else {
const attrib *a_otherfaction = a_find(u->attribs, &at_otherfaction);
const faction * otherfaction = a_otherfaction?get_otherfaction(a_otherfaction):NULL;
/* other unit. show visible faction, not u->faction */
fprintf(F, "%d;Partei\n", sf->no);
if (sf == f) {
fprintf(F, "1;Verraeter\n");
}
if (a_otherfaction && alliedunit(u, f, HELP_FSTEALTH)) {
fprintf(F, "%d;Anderepartei\n", otherfaction->no);
}
}
}
if (atyp) {

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

@ -795,7 +795,6 @@ rpunit(FILE * F, const faction * f, const unit * u, int indent, int mode)
char marker;
strlist *S;
int dh;
faction *fv;
boolean isbattle = (boolean)(mode == see_battle);
#ifdef USE_UGROUPS
ugroup *ug = findugroup(u);
@ -818,7 +817,6 @@ rpunit(FILE * F, const faction * f, const unit * u, int indent, int mode)
}
a_otherfaction = a_find(u->attribs, &at_otherfaction);
fv = visible_faction(f,u);
if(u->faction == f) {
marker = '*';