olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp: make "too many edges" have a clear error message, instead of 

an assertion failure
This commit is contained in:
Eric Wasylishen 2018-04-05 22:18:28 -06:00
parent 51c9a063ee
commit 02e66edd5b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qbsp/surfaces.cc
View File

@ -313,7 +313,9 @@ GetEdge(mapentity_t *entity, const vec3_t p1, const vec3_t p2,
if (it != hashedges.end()) {
for (const int i : it->second) {
edge = (bsp29_dedge_t *)edges->data + i;
Q_assert(v1 == edge->v[1] && v2 == edge->v[0]);
if (!(v1 == edge->v[1] && v2 == edge->v[0])) {
Error("Too many edges for standard BSP format. Try compiling with -bsp2");
}
if (pEdgeFaces1[i] == NULL
&& pEdgeFaces0[i]->contents[0] == face->contents[0]) {
pEdgeFaces1[i] = face;