Merge branch 'master' into develop

Conflicts: src/buildno.h
2016-08-06 23:30:59 +02:00 · 2016-08-06 23:30:59 +02:00 · b1f729a379
parent 0d54a2da35 ae3e5b8088
commit b1f729a379
1 changed files with 1 additions and 2 deletions
--- a/src/attributes/otherfaction.c
+++ b/src/attributes/otherfaction.c
@ -76,8 +76,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;