From dbaad4c403cd50573dcb0977981f6d0ab7921910 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 3 Jul 2016 10:59:50 +0200 Subject: [PATCH 1/2] release version 3.8.14 --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index 21a1eaf34..874106784 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 8 -#define VERSION_BUILD 13 +#define VERSION_BUILD 14 From ca7b250c46d3c762fd02de34499f5343f1dfa2ca Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 3 Jul 2016 11:02:21 +0200 Subject: [PATCH 2/2] otherfaction can be null if not f->alive --- src/creport.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/creport.c b/src/creport.c index 186afab4d..591061f94 100644 --- a/src/creport.c +++ b/src/creport.c @@ -795,10 +795,8 @@ void cr_output_unit(stream *out, const region * r, const faction * f, stream_printf(out, "%d;Verkleidung\n", sf->no); if (fval(u, UFL_ANON_FACTION)) stream_printf(out, "%d;Parteitarnung\n", i2b(fval(u, UFL_ANON_FACTION))); - if (otherfaction) { - if (otherfaction != u->faction) { - stream_printf(out, "%d;Anderepartei\n", otherfaction->no); - } + if (otherfaction && otherfaction != u->faction) { + stream_printf(out, "%d;Anderepartei\n", otherfaction->no); } mage = get_familiar_mage(u); if (mage) { @@ -819,11 +817,9 @@ void cr_output_unit(stream *out, const region * r, const faction * f, if (sf == f) { stream_printf(out, "1;Verraeter\n"); } - if (a_otherfaction) { - if (otherfaction != u->faction) { - if (alliedunit(u, f, HELP_FSTEALTH)) { - stream_printf(out, "%d;Anderepartei\n", otherfaction->no); - } + if (otherfaction && otherfaction != u->faction) { + if (alliedunit(u, f, HELP_FSTEALTH)) { + stream_printf(out, "%d;Anderepartei\n", otherfaction->no); } } }