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

qbsp: add bsp2 check if int16_t nodes/leafs are exceeded

This commit is contained in:
Eric Wasylishen 2017-10-19 16:19:47 -06:00
parent 37e2b94d3e
commit 7a7d3b843c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qbsp/writebsp.cc
View File

@ -25,6 +25,7 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <cstdint>
static void static void
AssertVanillaContentType(int content) AssertVanillaContentType(int content)
@ -582,11 +583,19 @@ ExportDrawNodes_BSP29(mapentity_t *entity, node_t *node)
if (node->children[i]->contents == CONTENTS_SOLID) if (node->children[i]->contents == CONTENTS_SOLID)
dnode->children[i] = -1; dnode->children[i] = -1;
else { else {
dnode->children[i] = -(map.cTotal[LUMP_LEAFS] + 1); int childnum = -(map.cTotal[LUMP_LEAFS] + 1);
if (childnum < INT16_MIN) {
Error("Map exceeds BSP29 node/leaf limit. Recompile with -bsp2 flag.");
}
dnode->children[i] = childnum;
ExportLeaf_BSP29(entity, node->children[i]); ExportLeaf_BSP29(entity, node->children[i]);
} }
} else { } else {
dnode->children[i] = map.cTotal[LUMP_NODES]; int childnum = map.cTotal[LUMP_NODES];
if (childnum > INT16_MAX) {
Error("Map exceeds BSP29 node/leaf limit. Recompile with -bsp2 flag.");
}
dnode->children[i] = childnum;
ExportDrawNodes_BSP29(entity, node->children[i]); ExportDrawNodes_BSP29(entity, node->children[i]);
} }
} }