From 83cf63e77f2e8def44b185f2026dbd43be5223a0 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 15 Aug 2022 21:17:17 -0600 Subject: [PATCH] revert using detail on hull1/2 for now as it's breaking tests --- qbsp/brush.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/qbsp/brush.cc b/qbsp/brush.cc index f88a9db5..0615efa0 100644 --- a/qbsp/brush.cc +++ b/qbsp/brush.cc @@ -465,13 +465,15 @@ static void Brush_LoadEntity(mapentity_t *dst, mapentity_t *src, hull_index_t hu if ((qbsp_options.omitdetail.value() || qbsp_options.omitdetailfence.value()) && detail_fence) continue; - /* turn solid brushes into detail */ - if (detail_illusionary) { - contents = qbsp_options.target_game->create_detail_illusionary_contents(contents); - } else if (detail_fence) { - contents = qbsp_options.target_game->create_detail_fence_contents(contents); - } else if (detail) { - contents = qbsp_options.target_game->create_detail_solid_contents(contents); + /* turn solid brushes into detail, if we're in hull0 */ + if (hullnum <= 0 && contents.is_solid(qbsp_options.target_game)) { + if (detail_illusionary) { + contents = qbsp_options.target_game->create_detail_illusionary_contents(contents); + } else if (detail_fence) { + contents = qbsp_options.target_game->create_detail_fence_contents(contents); + } else if (detail) { + contents = qbsp_options.target_game->create_detail_solid_contents(contents); + } } /* func_detail_illusionary don't exist in the collision hull