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

qbsp: throw exception in ExportLeaf if a leaf bounds is invalid 

add check in test suite that qbspfeatures.map doesn't get upgraded to BSP2 due to invalid leaf bounds
This commit is contained in:
Eric Wasylishen 2022-06-18 16:11:29 -06:00
parent ea985eb5ac
commit ccf605794e
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qbsp/test_qbsp.cc
View File

@ -908,6 +908,8 @@ TEST_CASE("features", "[testmaps_q1]")
const auto [bsp, bspx, prt] = LoadTestmapQ1("qbspfeatures.map"); const auto [bsp, bspx, prt] = LoadTestmapQ1("qbspfeatures.map");
REQUIRE(prt.has_value()); REQUIRE(prt.has_value());
CHECK(bsp.loadversion == &bspver_q1);
} }
bool PortalMatcher(const prtfile_winding_t& a, const prtfile_winding_t &b) bool PortalMatcher(const prtfile_winding_t& a, const prtfile_winding_t &b)

5
qbsp/writebsp.cc
View File

@ -30,6 +30,7 @@
#include <common/json.hh> #include <common/json.hh>
#include <fstream> #include <fstream>
#include <stdexcept>
using nlohmann::json; using nlohmann::json;
/** /**
@ -156,6 +157,10 @@ static void ExportLeaf(mapentity_t *entity, node_t *node)
dleaf.contents = remapped.native; dleaf.contents = remapped.native;
if (node->bounds.maxs()[0] < node->bounds.mins()[0]) {
throw std::runtime_error("leaf bounds was unassigned");
}
/* /*
* write bounding box info * write bounding box info
*/ */