From f6d5e6e24dbebd3a3324ae9ea5fa72558b02fc7e Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 28 May 2023 16:51:20 -0600 Subject: [PATCH] qbsp: fix test failure in last commit (stale pointers in map.hashedges) --- qbsp/faces.cc | 4 ++++ tests/test_qbsp.cc | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qbsp/faces.cc b/qbsp/faces.cc index 7e014460..38a6fb7d 100644 --- a/qbsp/faces.cc +++ b/qbsp/faces.cc @@ -263,12 +263,16 @@ size_t EmitFaces(node_t *headnode) { logging::funcheader(); + Q_assert(map.hashedges.empty()); + emit_faces_stats_t stats; size_t firstface = map.bsp.dfaces.size(); EmitFaces_R(headnode, stats); + map.hashedges.clear(); + return firstface; } diff --git a/tests/test_qbsp.cc b/tests/test_qbsp.cc index ba7c4a25..3d466a4f 100644 --- a/tests/test_qbsp.cc +++ b/tests/test_qbsp.cc @@ -1114,8 +1114,7 @@ TEST_CASE("q1_cubes" * doctest::test_suite("testmaps_q1")) { const auto [bsp, bspx, prt] = LoadTestmapQ1("q1_cubes.map"); - // index 0 is reserved, and the first cube has 12 edges, the second can share one edge so only needs 11 - CHECK(bsp.dedges.size() == 24); + CHECK(bsp.dedges.size() == 25); } /**