From 7b89b9034da26ca4508d4e819c97a6191a8847af Mon Sep 17 00:00:00 2001 From: LJW-Dev <48092720+LJW-Dev@users.noreply.github.com> Date: Thu, 12 Feb 2026 17:26:39 +0800 Subject: [PATCH] Minor fixes --- src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp | 2 +- src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp index d6571b8e..deac5368 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp @@ -351,7 +351,7 @@ namespace BSP leaf.leafBrushNode = 0; // -1 as it uses tris - leaf.terrainContents = -1; + leaf.terrainContents = 1; if (tree->leaf->getObjectCount() > 0) { size_t parentCount = 0; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp index e04a115c..e4d0cdf0 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp @@ -44,6 +44,7 @@ namespace BSP assert(indexCount % 3 == 0); gfxWorld->draw.indexCount = static_cast(indexCount); gfxWorld->draw.indices = m_memory.Alloc(indexCount); + static_assert(sizeof(bsp->gfxWorld.indices.data()[0]) == sizeof(uint16_t)); memcpy(gfxWorld->draw.indices, bsp->gfxWorld.indices.data(), sizeof(uint16_t) * indexCount); }