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

Merge branch 'master' into develop

Browse source 
Conflicts:
	src/buildno.h
This commit is contained in:
Enno Rehling 2016-07-03 11:10:04 +02:00
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

8
src/creport.c
View file

@ -795,11 +795,9 @@ 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) {
stream_printf(out, "%u;familiarmage\n", mage->no); stream_printf(out, "%u;familiarmage\n", mage->no);
@ -819,15 +817,13 @@ 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);
} }
} }
} }
} }
}
if (prefix) { if (prefix) {
prefix = mkname("prefix", prefix); prefix = mkname("prefix", prefix);
stream_printf(out, "\"%s\";typprefix\n", translate(prefix, LOC(f->locale, stream_printf(out, "\"%s\";typprefix\n", translate(prefix, LOC(f->locale,