From ae3e5b8088f492c70f0cedb47da9050560df6c9f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 6 Aug 2016 23:27:23 +0200 Subject: [PATCH] release version 3.8.15 --- src/attributes/otherfaction.c | 3 +-- src/buildno.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/attributes/otherfaction.c b/src/attributes/otherfaction.c index 83196f959..16682d8f8 100644 --- a/src/attributes/otherfaction.c +++ b/src/attributes/otherfaction.c @@ -75,8 +75,7 @@ faction *visible_faction(const faction * f, const unit * u) attrib *a = a_find(u->attribs, &at_otherfaction); if (a) { faction *fv = get_otherfaction(a); - assert(fv != NULL); /* fv should never be NULL! */ - return fv; + if (fv) return fv; } } return u->faction; diff --git a/src/buildno.h b/src/buildno.h index 874106784..204ec9beb 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 8 -#define VERSION_BUILD 14 +#define VERSION_BUILD 15