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

Merge branch 'master' into develop 

Conflicts:
	src/buildno.h
This commit is contained in:
Enno Rehling 2016-07-03 11:10:04 +02:00
parent defc5c19e7 ca7b250c46
commit 8d4a2ed688
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/creport.c
View File

@ -795,10 +795,8 @@ void cr_output_unit(stream *out, const region * r, const faction * f,
stream_printf(out, "%d;Verkleidung\n", sf->no); stream_printf(out, "%d;Verkleidung\n", sf->no);
if (fval(u, UFL_ANON_FACTION)) if (fval(u, UFL_ANON_FACTION))
stream_printf(out, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION))); stream_printf(out, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION)));
if (otherfaction) { if (otherfaction && otherfaction != u->faction) {
if (otherfaction != u->faction) { stream_printf(out, "%d;Anderepartei\n", otherfaction->no);
stream_printf(out, "%d;Anderepartei\n", otherfaction->no);
}
} }
mage = get_familiar_mage(u); mage = get_familiar_mage(u);
if (mage) { if (mage) {
@ -819,11 +817,9 @@ void cr_output_unit(stream *out, const region * r, const faction * f,
if (sf == f) { if (sf == f) {
stream_printf(out, "1;Verraeter\n"); stream_printf(out, "1;Verraeter\n");
} }
if (a_otherfaction) { if (otherfaction && otherfaction != u->faction) {
if (otherfaction != u->faction) { if (alliedunit(u, f, HELP_FSTEALTH)) {
if (alliedunit(u, f, HELP_FSTEALTH)) { stream_printf(out, "%d;Anderepartei\n", otherfaction->no);
stream_printf(out, "%d;Anderepartei\n", otherfaction->no);
}
} }
} }
} }