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-08-06 23:30:59 +02:00
parent 0d54a2da35 ae3e5b8088
commit b1f729a379
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/attributes/otherfaction.c
View File

@ -76,8 +76,7 @@ faction *visible_faction(const faction * f, const unit * u)
attrib *a = a_find(u->attribs, &at_otherfaction); attrib *a = a_find(u->attribs, &at_otherfaction);
if (a) { if (a) {
faction *fv = get_otherfaction(a); faction *fv = get_otherfaction(a);
assert(fv != NULL); /* fv should never be NULL! */ if (fv) return fv;
return fv;
} }
} }
return u->faction; return u->faction;