From 737cfecf6d174ad2b996509f7685e61b32ee0b8b Mon Sep 17 00:00:00 2001 From: elliot <114384093+elliot1377@users.noreply.github.com> Date: Sat, 14 Nov 2026 04:51:55 -0600 Subject: [PATCH] fix: handle collmap geoms when dumping IW4 physcollmaps (#1055) * fix: handle collmap geoms when dumping IW4 physcollmaps * chore: mention invalid brush data for broken collmap geom types --------- Co-authored-by: Jan Laupetin --- .../Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp b/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp index 03eb9b55..5aeaa583 100644 --- a/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp +++ b/src/ObjWriting/Game/IW4/PhysCollmap/PhysCollmapDumperIW4.cpp @@ -36,8 +36,12 @@ namespace phys_collmap switch (geom.type) { case PHYS_GEOM_NONE: + case PHYS_GEOM_COLLMAP: // TODO: Dump BrushWrapper (probably GJK related) - mapFileDumper.WriteComment("TODO: Brush data"); + if (geom.brushWrapper) + mapFileDumper.WriteComment("TODO: Brush data"); + else + mapFileDumper.WriteComment("Invalid brush data"); break; case PHYS_GEOM_BOX: mapFileDumper.WritePhysicsBox({ @@ -60,7 +64,6 @@ namespace phys_collmap case PHYS_GEOM_BRUSHMODEL: case PHYS_GEOM_BRUSH: - case PHYS_GEOM_COLLMAP: case PHYS_GEOM_CAPSULE: case PHYS_GEOM_GLASS: default: