From ef4e53b73567edb94dc6a7ffbe8844f08e7f4ff3 Mon Sep 17 00:00:00 2001
From: Kevin Shanahan <kmshanah@disenchant.net>
Date: Mon, 18 Feb 2013 09:51:33 +1030
Subject: [PATCH] qbsp: pass hullnum into Brush_LoadEntity()

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
---
 qbsp/brush.c | 14 +++++++-------
 qbsp/qbsp.c  |  2 +-
 qbsp/qbsp.h  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qbsp/brush.c b/qbsp/brush.c
index 1152081c..2fcc6459 100644
--- a/qbsp/brush.c
+++ b/qbsp/brush.c
@@ -355,7 +355,7 @@ CreateBrushFaces
 =================
 */
 static face_t *
-CreateBrushFaces(hullbrush_t *hullbrush, mapentity_t *ent)
+CreateBrushFaces(hullbrush_t *hullbrush, mapentity_t *ent, const int hullnum)
 {
     int i, j, k;
     vec_t r;
@@ -762,7 +762,7 @@ Converts a mapbrush to a bsp brush
 ===============
 */
 static brush_t *
-LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush)
+LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush, const int hullnum)
 {
     hullbrush_t hullbrush;
     brush_t *brush;
@@ -804,7 +804,7 @@ LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush)
     hullbrush.numfaces = mapbrush->numfaces;
     memcpy(hullbrush.faces, mapface, mapbrush->numfaces * sizeof(mapface_t));
 
-    facelist = CreateBrushFaces(&hullbrush, ent);
+    facelist = CreateBrushFaces(&hullbrush, ent, hullnum);
     if (!facelist) {
 	Message(msgWarning, warnNoBrushFaces);
 	return NULL;
@@ -815,13 +815,13 @@ LoadBrush(mapentity_t *ent, const mapbrush_t *mapbrush)
 
 	ExpandBrush(&hullbrush, size, facelist);
 	FreeBrushFaces(facelist);
-	facelist = CreateBrushFaces(&hullbrush, ent);
+	facelist = CreateBrushFaces(&hullbrush, ent, hullnum);
     } else if (hullnum == 2) {
 	vec3_t size[2] = { {-32, -32, -64}, {32, 32, 24} };
 
 	ExpandBrush(&hullbrush, size, facelist);
 	FreeBrushFaces(facelist);
-	facelist = CreateBrushFaces(&hullbrush, ent);
+	facelist = CreateBrushFaces(&hullbrush, ent, hullnum);
     }
 
     // create the brush
@@ -844,7 +844,7 @@ Brush_LoadEntity
 ============
 */
 void
-Brush_LoadEntity(mapentity_t *ent)
+Brush_LoadEntity(mapentity_t *ent, const int hullnum)
 {
     brush_t *brush, *next, *water, *other;
     mapbrush_t *mapbrush;
@@ -861,7 +861,7 @@ Brush_LoadEntity(mapentity_t *ent)
     mapbrush = ent->mapbrushes;
     ent->numbrushes = 0;
     for (i = 0; i < ent->nummapbrushes; i++, mapbrush++) {
-	brush = LoadBrush(ent, mapbrush);
+	brush = LoadBrush(ent, mapbrush, hullnum);
 	if (!brush)
 	    continue;
 
diff --git a/qbsp/qbsp.c b/qbsp/qbsp.c
index fe5bd04e..26821883 100644
--- a/qbsp/qbsp.c
+++ b/qbsp/qbsp.c
@@ -59,7 +59,7 @@ ProcessEntity(mapentity_t *ent)
     }
     // take the brush_ts and clip off all overlapping and contained faces,
     // leaving a perfect skin of the model with no hidden faces
-    Brush_LoadEntity(ent);
+    Brush_LoadEntity(ent, hullnum);
 
     if (!ent->brushes) {
 	PrintEntity(ent);
diff --git a/qbsp/qbsp.h b/qbsp/qbsp.h
index 53b37a06..c714c021 100644
--- a/qbsp/qbsp.h
+++ b/qbsp/qbsp.h
@@ -637,7 +637,7 @@ void GetVectorForKey(const mapentity_t *ent, const char *szKey, vec3_t vec);
 void WriteEntitiesToString(void);
 
 void FixRotateOrigin(mapentity_t *ent);
-void Brush_LoadEntity(mapentity_t *ent);
+void Brush_LoadEntity(mapentity_t *ent, const int hullnum);
 surface_t *CSGFaces(const mapentity_t *ent);
 void PortalizeWorld(const mapentity_t *ent, node_t *headnode);
 void TJunc(const mapentity_t *ent, node_t *headnode);