From 1577981960b3eba4519aa9ad146d13f990a125a1 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Thu, 3 Oct 2019 19:59:56 -0600
Subject: [PATCH] qbsp: fix clip brushes export with -wrbrushes, and various
 other fixes for -wrbrushes

---
 qbsp/brush.cc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/qbsp/brush.cc b/qbsp/brush.cc
index 99d65bb2..381982ef 100644
--- a/qbsp/brush.cc
+++ b/qbsp/brush.cc
@@ -1069,7 +1069,7 @@ Entity_SortBrushes(mapentity_t *dst)
 ============
 Brush_LoadEntity
 
-hullnum -1 should contain ALL brushes.
+hullnum -1 should contain ALL brushes. (used by BSPX_CreateBrushList())
 hullnum 0 does not contain clip brushes.
 ============
 */
@@ -1220,7 +1220,8 @@ Brush_LoadEntity(mapentity_t *dst, const mapentity_t *src, const int hullnum)
             }
         }
         
-        /* func_detail_illusionary don't exist in the collision hull */
+        /* func_detail_illusionary don't exist in the collision hull
+         * (or bspx export) */
         if (hullnum && detail_illusionary) {
             continue;
         }
@@ -1231,7 +1232,7 @@ Brush_LoadEntity(mapentity_t *dst, const mapentity_t *src, const int hullnum)
          * correctly.
          */
         if (contents == CONTENTS_CLIP) {
-            if (hullnum <= 0) {
+            if (hullnum == 0) {
                 brush_t *brush = LoadBrush(mapbrush, contents, rotate_offset, hullnum);
                 if (brush) {
                     AddToBounds(dst, brush->mins);
@@ -1240,7 +1241,11 @@ Brush_LoadEntity(mapentity_t *dst, const mapentity_t *src, const int hullnum)
                 }
                 continue;
             }
-            contents = CONTENTS_SOLID;
+            // for hull1, 2, etc., convert clip to CONTENTS_SOLID
+            if (hullnum > 0) {
+                contents = CONTENTS_SOLID;
+            }
+            // if hullnum is -1 (bspx brush export), leave it as CONTENTS_CLIP
         }
 
         /* "hint" brushes don't affect the collision hulls */
@@ -1267,11 +1272,11 @@ Brush_LoadEntity(mapentity_t *dst, const mapentity_t *src, const int hullnum)
         }
         
         /* nonsolid brushes don't show up in clipping hulls */
-        if (hullnum && contents != CONTENTS_SOLID && contents != CONTENTS_SKY)
+        if (hullnum > 0 && contents != CONTENTS_SOLID && contents != CONTENTS_SKY)
             continue;
 
         /* sky brushes are solid in the collision hulls */
-        if (hullnum && contents == CONTENTS_SKY)
+        if (hullnum > 0 && contents == CONTENTS_SKY)
             contents = CONTENTS_SOLID;
         
         brush_t *brush = LoadBrush(mapbrush, contents, rotate_offset, hullnum);