From c31c97a6d9e2cf88337aea8657062c8009c9c77d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 13 Jan 2004 03:02:25 +0000
Subject: [PATCH] minor cleanup: LoadBSP really shouldn't be doing the bsp2prt
 stuff :)

---
 tools/qfbsp/include/bsp5.h   |  1 +
 tools/qfbsp/source/qfbsp.c   |  1 +
 tools/qfbsp/source/readbsp.c | 31 +++++++++++++++++--------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/tools/qfbsp/include/bsp5.h b/tools/qfbsp/include/bsp5.h
index c3b748624..2e9865c83 100644
--- a/tools/qfbsp/include/bsp5.h
+++ b/tools/qfbsp/include/bsp5.h
@@ -245,6 +245,7 @@ qboolean FillOutside (node_t *node);
 // readbsp.c ==================================================================
 
 void LoadBSP (void);
+void bsp2prt (void);
 
 //=============================================================================
 
diff --git a/tools/qfbsp/source/qfbsp.c b/tools/qfbsp/source/qfbsp.c
index 52f33fb63..08cafb68b 100644
--- a/tools/qfbsp/source/qfbsp.c
+++ b/tools/qfbsp/source/qfbsp.c
@@ -767,6 +767,7 @@ ProcessFile (void)
 	bsp = BSP_New ();
 	if (options.portal) {
 		LoadBSP ();
+		bsp2prt ();
 		return;
 	}
 
diff --git a/tools/qfbsp/source/readbsp.c b/tools/qfbsp/source/readbsp.c
index fa7827f38..6c70d6712 100644
--- a/tools/qfbsp/source/readbsp.c
+++ b/tools/qfbsp/source/readbsp.c
@@ -61,7 +61,6 @@ dvertex_t  *vertices;
 dedge_t    *edges;
 int        *surfedges;
 unsigned short *marksurfaces;
-plane_t    *mplanes;
 static brushset_t bs;
 
 static void
@@ -98,13 +97,14 @@ load_planes (void)
 	dplane_t   *p;
 	int         i;
 
-	mplanes = malloc (bsp->numplanes * sizeof (plane_t));
+	memset (planes, 0, sizeof (planes));
 	for (i = 0; i < bsp->numplanes; i++) {
 		p = bsp->planes + i;
-		VectorCopy (p->normal, mplanes[i].normal);
-		mplanes[i].dist = p->dist;
-		mplanes[i].type = p->type;
+		VectorCopy (p->normal, planes[i].normal);
+		planes[i].dist = p->dist;
+		planes[i].type = p->type;
 	}
+	numbrushplanes = bsp->numplanes;
 }
 
 static void
@@ -218,7 +218,6 @@ void
 LoadBSP (void)
 {
 	QFile      *f;
-	vec3_t      ooo = {1, 1, 1};
 
 	f = Qopen (options.bspfile, "rb");
 	if (!f)
@@ -239,12 +238,16 @@ LoadBSP (void)
 	load_nodes ();
 	load_models ();
 	load_textures ();
-
-		memcpy (planes, mplanes, bsp->numplanes * sizeof (plane_t));
-		numbrushplanes = bsp->numplanes;
-		VectorSubtract (bsp->models[0].mins, ooo, bs.mins);
-		VectorAdd (bsp->models[0].maxs, ooo, bs.maxs);
-		brushset = &bs;
-		PortalizeWorld (nodes);
-		WritePortalfile (nodes);
+}
+
+void
+bsp2prt (void)
+{
+	vec3_t      ooo = {1, 1, 1};
+
+	VectorSubtract (bsp->models[0].mins, ooo, bs.mins);
+	VectorAdd (bsp->models[0].maxs, ooo, bs.maxs);
+	brushset = &bs;
+	PortalizeWorld (nodes);
+	WritePortalfile (nodes);
 }