X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_brush.c;h=8622d3d01d7561bf3dcabc4e20f7372ddb0d6929;hp=edf6135e8e40d573596f2d990dbb6b054ff9214d;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hpb=c5f3e2f2412f9b0510de4b399c34c39f949715b6

diff --git a/model_brush.c b/model_brush.c
index edf6135e..8622d3d0 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -26,12 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "wad.h"
 
 
-// note: model_shared.c sets up r_notexture, and r_surf_notexture
-
-qbyte mod_q1bsp_novis[(MAX_MAP_LEAFS + 7)/ 8];
-
 //cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
 cvar_t halflifebsp = {0, "halflifebsp", "0"};
+cvar_t mcbsp = {0, "mcbsp", "0"};
 cvar_t r_novis = {0, "r_novis", "0"};
 cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"};
 cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
@@ -48,11 +45,11 @@ cvar_t mod_q3bsp_curves_collisions = {0, "mod_q3bsp_curves_collisions", "1"};
 cvar_t mod_q3bsp_optimizedtraceline = {0, "mod_q3bsp_optimizedtraceline", "1"};
 cvar_t mod_q3bsp_debugtracebrush = {0, "mod_q3bsp_debugtracebrush", "0"};
 
-static void Mod_Q1BSP_Collision_Init (void);
 void Mod_BrushInit(void)
 {
 //	Cvar_RegisterVariable(&r_subdivide_size);
 	Cvar_RegisterVariable(&halflifebsp);
+	Cvar_RegisterVariable(&mcbsp);
 	Cvar_RegisterVariable(&r_novis);
 	Cvar_RegisterVariable(&r_miplightmaps);
 	Cvar_RegisterVariable(&r_lightmaprgba);
@@ -68,8 +65,6 @@ void Mod_BrushInit(void)
 	Cvar_RegisterVariable(&mod_q3bsp_curves_collisions);
 	Cvar_RegisterVariable(&mod_q3bsp_optimizedtraceline);
 	Cvar_RegisterVariable(&mod_q3bsp_debugtracebrush);
-	memset(mod_q1bsp_novis, 0xff, sizeof(mod_q1bsp_novis));
-	Mod_Q1BSP_Collision_Init();
 }
 
 static mleaf_t *Mod_Q1BSP_PointInLeaf(model_t *model, const vec3_t p)
@@ -79,18 +74,16 @@ static mleaf_t *Mod_Q1BSP_PointInLeaf(model_t *model, const vec3_t p)
 	if (model == NULL)
 		return NULL;
 
-	Mod_CheckLoaded(model);
-
 	// LordHavoc: modified to start at first clip node,
 	// in other words: first node of the (sub)model
-	node = model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode;
-	while (node->contents == 0)
+	node = model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode;
+	while (node->plane)
 		node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct(p,node->plane->normal)) < node->plane->dist];
 
 	return (mleaf_t *)node;
 }
 
-static void Mod_Q1BSP_AmbientSoundLevelsForPoint(model_t *model, const vec3_t p, qbyte *out, int outsize)
+static void Mod_Q1BSP_AmbientSoundLevelsForPoint(model_t *model, const vec3_t p, unsigned char *out, int outsize)
 {
 	int i;
 	mleaf_t *leaf;
@@ -109,17 +102,84 @@ static void Mod_Q1BSP_AmbientSoundLevelsForPoint(model_t *model, const vec3_t p,
 		memset(out, 0, outsize);
 }
 
-static int Mod_Q1BSP_BoxTouchingPVS(model_t *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs)
+static int Mod_Q1BSP_FindBoxClusters(model_t *model, const vec3_t mins, const vec3_t maxs, int maxclusters, int *clusterlist)
+{
+	int numclusters = 0;
+	int nodestackindex = 0;
+	mnode_t *node, *nodestack[1024];
+	if (!model->brush.num_pvsclusters)
+		return -1;
+	node = model->brush.data_nodes;
+	for (;;)
+	{
+#if 1
+		if (node->plane)
+		{
+			// node - recurse down the BSP tree
+			int side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
+			if (side < 2)
+			{
+				// box is on one side of plane, take that path
+				node = node->children[side];
+			}
+			else
+			{
+				// box crosses plane, take one path and remember the other
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+			}
+			continue;
+		}
+		else
+		{
+			// leaf - add clusterindex to list
+			if (numclusters < maxclusters)
+				clusterlist[numclusters] = ((mleaf_t *)node)->clusterindex;
+			numclusters++;
+		}
+#else
+		if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
+		{
+			if (node->plane)
+			{
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+				continue;
+			}
+			else
+			{
+				// leaf - add clusterindex to list
+				if (numclusters < maxclusters)
+					clusterlist[numclusters] = ((mleaf_t *)node)->clusterindex;
+				numclusters++;
+			}
+		}
+#endif
+		// try another path we didn't take earlier
+		if (nodestackindex == 0)
+			break;
+		node = nodestack[--nodestackindex];
+	}
+	// return number of clusters found (even if more than the maxclusters)
+	return numclusters;
+}
+
+static int Mod_Q1BSP_BoxTouchingPVS(model_t *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs)
 {
-	int clusterindex, side, nodestackindex = 0;
+	int nodestackindex = 0;
 	mnode_t *node, *nodestack[1024];
-	node = model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode;
+	if (!model->brush.num_pvsclusters)
+		return true;
+	node = model->brush.data_nodes;
 	for (;;)
 	{
+#if 1
 		if (node->plane)
 		{
 			// node - recurse down the BSP tree
-			side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
+			int side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
 			if (side < 2)
 			{
 				// box is on one side of plane, take that path
@@ -132,48 +192,184 @@ static int Mod_Q1BSP_BoxTouchingPVS(model_t *model, const qbyte *pvs, const vec3
 					nodestack[nodestackindex++] = node->children[0];
 				node = node->children[1];
 			}
+			continue;
 		}
 		else
 		{
 			// leaf - check cluster bit
-			clusterindex = ((mleaf_t *)node)->clusterindex;
+			int clusterindex = ((mleaf_t *)node)->clusterindex;
 			if (CHECKPVSBIT(pvs, clusterindex))
 			{
 				// it is visible, return immediately with the news
 				return true;
 			}
+		}
+#else
+		if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
+		{
+			if (node->plane)
+			{
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+				continue;
+			}
 			else
 			{
-				// nothing to see here, try another path we didn't take earlier
-				if (nodestackindex == 0)
-					break;
-				node = nodestack[--nodestackindex];
+				// leaf - check cluster bit
+				int clusterindex = ((mleaf_t *)node)->clusterindex;
+				if (CHECKPVSBIT(pvs, clusterindex))
+				{
+					// it is visible, return immediately with the news
+					return true;
+				}
 			}
 		}
+#endif
+		// nothing to see here, try another path we didn't take earlier
+		if (nodestackindex == 0)
+			break;
+		node = nodestack[--nodestackindex];
 	}
 	// it is not visible
 	return false;
 }
 
-/*
-static int Mod_Q1BSP_PointContents(model_t *model, const vec3_t p)
+static int Mod_Q1BSP_BoxTouchingLeafPVS(model_t *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs)
 {
-	mnode_t *node;
-
-	if (model == NULL)
-		return CONTENTS_EMPTY;
-
-	Mod_CheckLoaded(model);
-
-	// LordHavoc: modified to start at first clip node,
-	// in other words: first node of the (sub)model
-	node = model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode;
-	while (node->contents == 0)
-		node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct(p,node->plane->normal)) < node->plane->dist];
+	int nodestackindex = 0;
+	mnode_t *node, *nodestack[1024];
+	if (!model->brush.num_leafs)
+		return true;
+	node = model->brush.data_nodes;
+	for (;;)
+	{
+#if 1
+		if (node->plane)
+		{
+			// node - recurse down the BSP tree
+			int side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
+			if (side < 2)
+			{
+				// box is on one side of plane, take that path
+				node = node->children[side];
+			}
+			else
+			{
+				// box crosses plane, take one path and remember the other
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+			}
+			continue;
+		}
+		else
+		{
+			// leaf - check cluster bit
+			int clusterindex = ((mleaf_t *)node) - model->brush.data_leafs;
+			if (CHECKPVSBIT(pvs, clusterindex))
+			{
+				// it is visible, return immediately with the news
+				return true;
+			}
+		}
+#else
+		if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
+		{
+			if (node->plane)
+			{
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+				continue;
+			}
+			else
+			{
+				// leaf - check cluster bit
+				int clusterindex = ((mleaf_t *)node) - model->brush.data_leafs;
+				if (CHECKPVSBIT(pvs, clusterindex))
+				{
+					// it is visible, return immediately with the news
+					return true;
+				}
+			}
+		}
+#endif
+		// nothing to see here, try another path we didn't take earlier
+		if (nodestackindex == 0)
+			break;
+		node = nodestack[--nodestackindex];
+	}
+	// it is not visible
+	return false;
+}
 
-	return ((mleaf_t *)node)->contents;
+static int Mod_Q1BSP_BoxTouchingVisibleLeafs(model_t *model, const unsigned char *visibleleafs, const vec3_t mins, const vec3_t maxs)
+{
+	int nodestackindex = 0;
+	mnode_t *node, *nodestack[1024];
+	if (!model->brush.num_leafs)
+		return true;
+	node = model->brush.data_nodes;
+	for (;;)
+	{
+#if 1
+		if (node->plane)
+		{
+			// node - recurse down the BSP tree
+			int side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
+			if (side < 2)
+			{
+				// box is on one side of plane, take that path
+				node = node->children[side];
+			}
+			else
+			{
+				// box crosses plane, take one path and remember the other
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+			}
+			continue;
+		}
+		else
+		{
+			// leaf - check if it is visible
+			if (visibleleafs[(mleaf_t *)node - model->brush.data_leafs])
+			{
+				// it is visible, return immediately with the news
+				return true;
+			}
+		}
+#else
+		if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
+		{
+			if (node->plane)
+			{
+				if (nodestackindex < 1024)
+					nodestack[nodestackindex++] = node->children[0];
+				node = node->children[1];
+				continue;
+			}
+			else
+			{
+				// leaf - check if it is visible
+				if (visibleleafs[(mleaf_t *)node - model->brush.data_leafs])
+				{
+					// it is visible, return immediately with the news
+					return true;
+				}
+			}
+		}
+#endif
+		// nothing to see here, try another path we didn't take earlier
+		if (nodestackindex == 0)
+			break;
+		node = nodestack[--nodestackindex];
+	}
+	// it is not visible
+	return false;
 }
-*/
 
 typedef struct findnonsolidlocationinfo_s
 {
@@ -185,43 +381,28 @@ typedef struct findnonsolidlocationinfo_s
 }
 findnonsolidlocationinfo_t;
 
-#if 0
-extern cvar_t samelevel;
-#endif
 static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *info, mleaf_t *leaf)
 {
-	int i, surfnum, k, *tri, *mark;
+	int i, surfacenum, k, *tri, *mark;
 	float dist, f, vert[3][3], edge[3][3], facenormal[3], edgenormal[3][3], point[3];
-#if 0
-	float surfnormal[3];
-#endif
-	msurface_t *surf;
-	for (surfnum = 0, mark = leaf->firstmarksurface;surfnum < leaf->nummarksurfaces;surfnum++, mark++)
+	msurface_t *surface;
+	for (surfacenum = 0, mark = leaf->firstleafsurface;surfacenum < leaf->numleafsurfaces;surfacenum++, mark++)
 	{
-		surf = info->model->brushq1.surfaces + *mark;
-		if (surf->flags & SURF_SOLIDCLIP)
+		surface = info->model->data_surfaces + *mark;
+		if (surface->texture->supercontents & SUPERCONTENTS_SOLID)
 		{
-#if 0
-			VectorCopy(surf->plane->normal, surfnormal);
-			if (surf->flags & SURF_PLANEBACK)
-				VectorNegate(surfnormal, surfnormal);
-#endif
-			for (k = 0;k < surf->mesh.num_triangles;k++)
+			for (k = 0;k < surface->num_triangles;k++)
 			{
-				tri = surf->mesh.data_element3i + k * 3;
-				VectorCopy((surf->mesh.data_vertex3f + tri[0] * 3), vert[0]);
-				VectorCopy((surf->mesh.data_vertex3f + tri[1] * 3), vert[1]);
-				VectorCopy((surf->mesh.data_vertex3f + tri[2] * 3), vert[2]);
+				tri = (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle) + k * 3;
+				VectorCopy((surface->groupmesh->data_vertex3f + tri[0] * 3), vert[0]);
+				VectorCopy((surface->groupmesh->data_vertex3f + tri[1] * 3), vert[1]);
+				VectorCopy((surface->groupmesh->data_vertex3f + tri[2] * 3), vert[2]);
 				VectorSubtract(vert[1], vert[0], edge[0]);
 				VectorSubtract(vert[2], vert[1], edge[1]);
 				CrossProduct(edge[1], edge[0], facenormal);
 				if (facenormal[0] || facenormal[1] || facenormal[2])
 				{
 					VectorNormalize(facenormal);
-#if 0
-					if (VectorDistance(facenormal, surfnormal) > 0.01f)
-						Con_Printf("a2! %f %f %f != %f %f %f\n", facenormal[0], facenormal[1], facenormal[2], surfnormal[0], surfnormal[1], surfnormal[2]);
-#endif
 					f = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
 					if (f <= info->bestdist && f >= -info->bestdist)
 					{
@@ -232,19 +413,6 @@ static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *in
 						CrossProduct(facenormal, edge[0], edgenormal[0]);
 						CrossProduct(facenormal, edge[1], edgenormal[1]);
 						CrossProduct(facenormal, edge[2], edgenormal[2]);
-#if 0
-						if (samelevel.integer & 1)
-							VectorNegate(edgenormal[0], edgenormal[0]);
-						if (samelevel.integer & 2)
-							VectorNegate(edgenormal[1], edgenormal[1]);
-						if (samelevel.integer & 4)
-							VectorNegate(edgenormal[2], edgenormal[2]);
-						for (i = 0;i < 3;i++)
-							if (DotProduct(vert[0], edgenormal[i]) > DotProduct(vert[i], edgenormal[i]) + 0.1f
-							 || DotProduct(vert[1], edgenormal[i]) > DotProduct(vert[i], edgenormal[i]) + 0.1f
-							 || DotProduct(vert[2], edgenormal[i]) > DotProduct(vert[i], edgenormal[i]) + 0.1f)
-								Con_Printf("a! %i : %f %f %f (%f %f %f)\n", i, edgenormal[i][0], edgenormal[i][1], edgenormal[i][2], facenormal[0], facenormal[1], facenormal[2]);
-#endif
 						// face distance
 						if (DotProduct(info->center, edgenormal[0]) < DotProduct(vert[0], edgenormal[0])
 						 && DotProduct(info->center, edgenormal[1]) < DotProduct(vert[1], edgenormal[1])
@@ -313,12 +481,7 @@ static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *in
 
 static void Mod_Q1BSP_FindNonSolidLocation_r(findnonsolidlocationinfo_t *info, mnode_t *node)
 {
-	if (node->contents)
-	{
-		if (((mleaf_t *)node)->nummarksurfaces)
-			Mod_Q1BSP_FindNonSolidLocation_r_Leaf(info, (mleaf_t *)node);
-	}
-	else
+	if (node->plane)
 	{
 		float f = PlaneDiff(info->center, node->plane);
 		if (f >= -info->bestdist)
@@ -326,6 +489,11 @@ static void Mod_Q1BSP_FindNonSolidLocation_r(findnonsolidlocationinfo_t *info, m
 		if (f <= info->bestdist)
 			Mod_Q1BSP_FindNonSolidLocation_r(info, node->children[1]);
 	}
+	else
+	{
+		if (((mleaf_t *)node)->numleafsurfaces)
+			Mod_Q1BSP_FindNonSolidLocation_r_Leaf(info, (mleaf_t *)node);
+	}
 }
 
 static void Mod_Q1BSP_FindNonSolidLocation(model_t *model, const vec3_t in, vec3_t out, float radius)
@@ -345,7 +513,7 @@ static void Mod_Q1BSP_FindNonSolidLocation(model_t *model, const vec3_t in, vec3
 	{
 		VectorClear(info.nudge);
 		info.bestdist = radius;
-		Mod_Q1BSP_FindNonSolidLocation_r(&info, model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode);
+		Mod_Q1BSP_FindNonSolidLocation_r(&info, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode);
 		VectorAdd(info.center, info.nudge, info.center);
 	}
 	while (info.bestdist < radius && ++i < 10);
@@ -387,7 +555,7 @@ int Mod_Q1BSP_NativeContentsFromSuperContents(model_t *model, int supercontents)
 	return CONTENTS_EMPTY;
 }
 
-typedef struct
+typedef struct RecursiveHullCheckTraceInfo_s
 {
 	// the hull we're tracing through
 	const hull_t *hull;
@@ -597,6 +765,13 @@ static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace,
 	VectorSubtract(boxstartmaxs, boxstartmins, boxsize);
 	if (boxsize[0] < 3)
 		rhc.hull = &model->brushq1.hulls[0]; // 0x0x0
+	else if (model->brush.ismcbsp)
+	{
+		if (boxsize[2] < 48) // pick the nearest of 40 or 56
+			rhc.hull = &model->brushq1.hulls[2]; // 16x16x40
+		else
+			rhc.hull = &model->brushq1.hulls[1]; // 16x16x56
+	}
 	else if (model->brush.ishlbsp)
 	{
 		// LordHavoc: this has to have a minor tolerance (the .1) because of
@@ -635,40 +810,6 @@ static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace,
 #endif
 }
 
-static hull_t box_hull;
-static dclipnode_t box_clipnodes[6];
-static mplane_t box_planes[6];
-
-static void Mod_Q1BSP_Collision_Init (void)
-{
-	int		i;
-	int		side;
-
-	//Set up the planes and clipnodes so that the six floats of a bounding box
-	//can just be stored out and get a proper hull_t structure.
-
-	box_hull.clipnodes = box_clipnodes;
-	box_hull.planes = box_planes;
-	box_hull.firstclipnode = 0;
-	box_hull.lastclipnode = 5;
-
-	for (i = 0;i < 6;i++)
-	{
-		box_clipnodes[i].planenum = i;
-
-		side = i&1;
-
-		box_clipnodes[i].children[side] = CONTENTS_EMPTY;
-		if (i != 5)
-			box_clipnodes[i].children[side^1] = i + 1;
-		else
-			box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
-
-		box_planes[i].type = i>>1;
-		box_planes[i].normal[i>>1] = 1;
-	}
-}
-
 void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask, int boxsupercontents)
 {
 #if 1
@@ -701,6 +842,9 @@ void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cm
 	Collision_TraceLineBrushFloat(trace, start, end, &cbox, &cbox);
 #else
 	RecursiveHullCheckTraceInfo_t rhc;
+	static hull_t box_hull;
+	static dclipnode_t box_clipnodes[6];
+	static mplane_t box_planes[6];
 	// fill in a default trace
 	memset(&rhc, 0, sizeof(rhc));
 	memset(trace, 0, sizeof(trace_t));
@@ -716,6 +860,36 @@ void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cm
 #if COLLISIONPARANOID >= 3
 	Con_Printf("box_planes %f:%f %f:%f %f:%f\ncbox %f %f %f:%f %f %f\nbox %f %f %f:%f %f %f\n", box_planes[0].dist, box_planes[1].dist, box_planes[2].dist, box_planes[3].dist, box_planes[4].dist, box_planes[5].dist, cmins[0], cmins[1], cmins[2], cmaxs[0], cmaxs[1], cmaxs[2], mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
 #endif
+
+	if (box_hull.clipnodes == NULL)
+	{
+		int i, side;
+
+		//Set up the planes and clipnodes so that the six floats of a bounding box
+		//can just be stored out and get a proper hull_t structure.
+
+		box_hull.clipnodes = box_clipnodes;
+		box_hull.planes = box_planes;
+		box_hull.firstclipnode = 0;
+		box_hull.lastclipnode = 5;
+
+		for (i = 0;i < 6;i++)
+		{
+			box_clipnodes[i].planenum = i;
+
+			side = i&1;
+
+			box_clipnodes[i].children[side] = CONTENTS_EMPTY;
+			if (i != 5)
+				box_clipnodes[i].children[side^1] = i + 1;
+			else
+				box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
+
+			box_planes[i].type = i>>1;
+			box_planes[i].normal[i>>1] = 1;
+		}
+	}
+
 	// trace a line through the generated clipping hull
 	//rhc.boxsupercontents = boxsupercontents;
 	rhc.hull = &box_hull;
@@ -734,14 +908,14 @@ void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cm
 #endif
 }
 
-static int Mod_Q1BSP_LightPoint_RecursiveBSPNode(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const mnode_t *node, float x, float y, float startz, float endz)
+static int Mod_Q1BSP_LightPoint_RecursiveBSPNode(model_t *model, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const mnode_t *node, float x, float y, float startz, float endz)
 {
 	int side, distz = endz - startz;
 	float front, back;
 	float mid;
 
 loc0:
-	if (node->contents < 0)
+	if (!node->plane)
 		return false;		// didn't hit anything
 
 	switch (node->plane->type)
@@ -778,7 +952,7 @@ loc0:
 	}
 
 	// go down front side
-	if (node->children[side]->contents >= 0 && Mod_Q1BSP_LightPoint_RecursiveBSPNode(ambientcolor, diffusecolor, diffusenormal, node->children[side], x, y, startz, mid))
+	if (node->children[side]->plane && Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, node->children[side], x, y, startz, mid))
 		return true;	// hit something
 	else
 	{
@@ -786,31 +960,31 @@ loc0:
 		if (node->numsurfaces)
 		{
 			int i, ds, dt;
-			msurface_t *surf;
+			msurface_t *surface;
 
-			surf = r_refdef.worldmodel->brushq1.surfaces + node->firstsurface;
-			for (i = 0;i < node->numsurfaces;i++, surf++)
+			surface = model->data_surfaces + node->firstsurface;
+			for (i = 0;i < node->numsurfaces;i++, surface++)
 			{
-				if (!(surf->flags & SURF_LIGHTMAP) || !surf->samples)
+				if (!(surface->texture->basematerialflags & MATERIALFLAG_WALL) || !surface->lightmapinfo->samples)
 					continue;	// no lightmaps
 
-				ds = (int) (x * surf->texinfo->vecs[0][0] + y * surf->texinfo->vecs[0][1] + mid * surf->texinfo->vecs[0][2] + surf->texinfo->vecs[0][3]) - surf->texturemins[0];
-				dt = (int) (x * surf->texinfo->vecs[1][0] + y * surf->texinfo->vecs[1][1] + mid * surf->texinfo->vecs[1][2] + surf->texinfo->vecs[1][3]) - surf->texturemins[1];
+				ds = (int) (x * surface->lightmapinfo->texinfo->vecs[0][0] + y * surface->lightmapinfo->texinfo->vecs[0][1] + mid * surface->lightmapinfo->texinfo->vecs[0][2] + surface->lightmapinfo->texinfo->vecs[0][3]) - surface->lightmapinfo->texturemins[0];
+				dt = (int) (x * surface->lightmapinfo->texinfo->vecs[1][0] + y * surface->lightmapinfo->texinfo->vecs[1][1] + mid * surface->lightmapinfo->texinfo->vecs[1][2] + surface->lightmapinfo->texinfo->vecs[1][3]) - surface->lightmapinfo->texturemins[1];
 
-				if (ds >= 0 && ds < surf->extents[0] && dt >= 0 && dt < surf->extents[1])
+				if (ds >= 0 && ds < surface->lightmapinfo->extents[0] && dt >= 0 && dt < surface->lightmapinfo->extents[1])
 				{
-					qbyte *lightmap;
+					unsigned char *lightmap;
 					int lmwidth, lmheight, maps, line3, size3, dsfrac = ds & 15, dtfrac = dt & 15, scale = 0, r00 = 0, g00 = 0, b00 = 0, r01 = 0, g01 = 0, b01 = 0, r10 = 0, g10 = 0, b10 = 0, r11 = 0, g11 = 0, b11 = 0;
-					lmwidth = ((surf->extents[0]>>4)+1);
-					lmheight = ((surf->extents[1]>>4)+1);
+					lmwidth = ((surface->lightmapinfo->extents[0]>>4)+1);
+					lmheight = ((surface->lightmapinfo->extents[1]>>4)+1);
 					line3 = lmwidth * 3; // LordHavoc: *3 for colored lighting
 					size3 = lmwidth * lmheight * 3; // LordHavoc: *3 for colored lighting
 
-					lightmap = surf->samples + ((dt>>4) * lmwidth + (ds>>4))*3; // LordHavoc: *3 for colored lighting
+					lightmap = surface->lightmapinfo->samples + ((dt>>4) * lmwidth + (ds>>4))*3; // LordHavoc: *3 for colored lighting
 
-					for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++)
+					for (maps = 0;maps < MAXLIGHTMAPS && surface->lightmapinfo->styles[maps] != 255;maps++)
 					{
-						scale = d_lightstylevalue[surf->styles[maps]];
+						scale = r_refdef.lightstylevalue[surface->lightmapinfo->styles[maps]];
 						r00 += lightmap[      0] * scale;g00 += lightmap[      1] * scale;b00 += lightmap[      2] * scale;
 						r01 += lightmap[      3] * scale;g01 += lightmap[      4] * scale;b01 += lightmap[      5] * scale;
 						r10 += lightmap[line3+0] * scale;g10 += lightmap[line3+1] * scale;b10 += lightmap[line3+2] * scale;
@@ -869,13 +1043,13 @@ middle sample (the one which was requested)
 
 void Mod_Q1BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
 {
-	Mod_Q1BSP_LightPoint_RecursiveBSPNode(ambientcolor, diffusecolor, diffusenormal, model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2], p[2] - 65536);
+	Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2], p[2] - 65536);
 }
 
-static void Mod_Q1BSP_DecompressVis(const qbyte *in, const qbyte *inend, qbyte *out, qbyte *outend)
+static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char *inend, unsigned char *out, unsigned char *outend)
 {
 	int c;
-	qbyte *outstart = out;
+	unsigned char *outstart = out;
 	while (out < outend)
 	{
 		if (in == inend)
@@ -913,7 +1087,7 @@ R_Q1BSP_LoadSplitSky
 A sky texture is 256*128, with the right side being a masked overlay
 ==============
 */
-void R_Q1BSP_LoadSplitSky (qbyte *src, int width, int height, int bytesperpixel)
+void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesperpixel)
 {
 	int i, j;
 	unsigned solidpixels[128*128], alphapixels[128*128];
@@ -973,8 +1147,8 @@ void R_Q1BSP_LoadSplitSky (qbyte *src, int width, int height, int bytesperpixel)
 		}
 	}
 
-	loadmodel->brush.solidskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_solidtexture", 128, 128, (qbyte *) solidpixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
-	loadmodel->brush.alphaskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_alphatexture", 128, 128, (qbyte *) alphapixels, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+	loadmodel->brush.solidskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_solidtexture", 128, 128, (unsigned char *) solidpixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
+	loadmodel->brush.alphaskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_alphatexture", 128, 128, (unsigned char *) alphapixels, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
 static void Mod_Q1BSP_LoadTextures(lump_t *l)
@@ -983,38 +1157,44 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 	miptex_t *dmiptex;
 	texture_t *tx, *tx2, *anims[10], *altanims[10];
 	dmiptexlump_t *m;
-	qbyte *data, *mtdata;
+	unsigned char *data, *mtdata;
 	char name[256];
 
-	loadmodel->brushq1.textures = NULL;
+	loadmodel->data_textures = NULL;
 
 	// add two slots for notexture walls and notexture liquids
 	if (l->filelen)
 	{
 		m = (dmiptexlump_t *)(mod_base + l->fileofs);
 		m->nummiptex = LittleLong (m->nummiptex);
-		loadmodel->brushq1.numtextures = m->nummiptex + 2;
+		loadmodel->num_textures = m->nummiptex + 2;
 	}
 	else
 	{
 		m = NULL;
-		loadmodel->brushq1.numtextures = 2;
+		loadmodel->num_textures = 2;
 	}
 
-	loadmodel->brushq1.textures = Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numtextures * sizeof(texture_t));
+	loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_textures * sizeof(texture_t));
 
 	// fill out all slots with notexture
-	for (i = 0, tx = loadmodel->brushq1.textures;i < loadmodel->brushq1.numtextures;i++, tx++)
+	for (i = 0, tx = loadmodel->data_textures;i < loadmodel->num_textures;i++, tx++)
 	{
-		tx->number = i;
 		strcpy(tx->name, "NO TEXTURE FOUND");
 		tx->width = 16;
 		tx->height = 16;
-		tx->skin.base = r_notexture;
-		if (i == loadmodel->brushq1.numtextures - 1)
-			tx->flags = SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+		tx->skin.base = r_texture_notexture;
+		tx->basematerialflags = 0;
+		if (i == loadmodel->num_textures - 1)
+		{
+			tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES;
+			tx->supercontents = SUPERCONTENTS_WATER;
+		}
 		else
-			tx->flags = SURF_LIGHTMAP | SURF_SOLIDCLIP;
+		{
+			tx->basematerialflags |= MATERIALFLAG_WALL;
+			tx->supercontents = SUPERCONTENTS_SOLID;
+		}
 		tx->currentframe = tx;
 	}
 
@@ -1029,7 +1209,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 		dofs[i] = LittleLong(dofs[i]);
 		if (dofs[i] == -1 || r_nosurftextures.integer)
 			continue;
-		dmiptex = (miptex_t *)((qbyte *)m + dofs[i]);
+		dmiptex = (miptex_t *)((unsigned char *)m + dofs[i]);
 
 		// make sure name is no more than 15 characters
 		for (j = 0;dmiptex->name[j] && j < 15;j++)
@@ -1048,7 +1228,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 				Con_Printf("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
 				continue;
 			}
-			mtdata = (qbyte *)dmiptex + j;
+			mtdata = (unsigned char *)dmiptex + j;
 		}
 
 		if ((mtwidth & 15) || (mtheight & 15))
@@ -1059,7 +1239,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 			if (name[j] >= 'A' && name[j] <= 'Z')
 				name[j] += 'a' - 'A';
 
-		tx = loadmodel->brushq1.textures + i;
+		tx = loadmodel->data_textures + i;
 		strcpy(tx->name, name);
 		tx->width = mtwidth;
 		tx->height = mtheight;
@@ -1087,13 +1267,13 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 		}
 		else
 		{
-			if (!Mod_LoadSkinFrame(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, true, true))
+			if (!Mod_LoadSkinFrame(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, true))
 			{
 				// did not find external texture, load it from the bsp or wad3
 				if (loadmodel->brush.ishlbsp)
 				{
 					// internal texture overrides wad
-					qbyte *pixels, *freepixels, *fogpixels;
+					unsigned char *pixels, *freepixels, *fogpixels;
 					pixels = freepixels = NULL;
 					if (mtdata)
 						pixels = W_ConvertWAD3Texture(dmiptex);
@@ -1106,7 +1286,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 						tx->skin.base = tx->skin.merged = R_LoadTexture2D(loadmodel->texturepool, tx->name, image_width, image_height, pixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, NULL);
 						if (Image_CheckAlpha(pixels, image_width * image_height, true))
 						{
-							fogpixels = Mem_Alloc(tempmempool, image_width * image_height * 4);
+							fogpixels = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
 							for (j = 0;j < image_width * image_height * 4;j += 4)
 							{
 								fogpixels[j + 0] = 255;
@@ -1122,7 +1302,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 						Mem_Free(freepixels);
 				}
 				else if (mtdata) // texture included
-					Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_PRECACHE | TEXF_PICMIP, false, true, tx->name[0] != '*' && r_fullbrights.integer, mtdata, tx->width, tx->height);
+					Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_PRECACHE | TEXF_PICMIP, false, tx->name[0] != '*' && r_fullbrights.integer, mtdata, tx->width, tx->height);
 			}
 		}
 		if (tx->skin.base == NULL)
@@ -1130,25 +1310,40 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 			// no texture found
 			tx->width = 16;
 			tx->height = 16;
-			tx->skin.base = r_notexture;
+			tx->skin.base = r_texture_notexture;
 		}
 
+		tx->basematerialflags = 0;
 		if (tx->name[0] == '*')
 		{
 			// turb does not block movement
-			tx->flags = SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+			tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES;
 			// LordHavoc: some turbulent textures should be fullbright and solid
 			if (!strncmp(tx->name,"*lava",5)
 			 || !strncmp(tx->name,"*teleport",9)
 			 || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
-				tx->flags |= SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA;
+				tx->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
+			else
+				tx->basematerialflags |= MATERIALFLAG_WATERALPHA;
+			if (!strncmp(tx->name, "*lava", 5))
+				tx->supercontents = SUPERCONTENTS_LAVA;
+			else if (!strncmp(tx->name, "*slime", 6))
+				tx->supercontents = SUPERCONTENTS_SLIME;
 			else
-				tx->flags |= SURF_WATERALPHA;
+				tx->supercontents = SUPERCONTENTS_WATER;
 		}
 		else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
-			tx->flags = SURF_DRAWSKY | SURF_SOLIDCLIP;
+		{
+			tx->supercontents = SUPERCONTENTS_SKY;
+			tx->basematerialflags |= MATERIALFLAG_SKY;
+		}
 		else
-			tx->flags = SURF_LIGHTMAP | SURF_SOLIDCLIP;
+		{
+			tx->supercontents = SUPERCONTENTS_SOLID;
+			tx->basematerialflags |= MATERIALFLAG_WALL;
+		}
+		if (tx->skin.fog)
+			tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
 
 		// start out with no animation
 		tx->currentframe = tx;
@@ -1157,7 +1352,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 	// sequence the animations
 	for (i = 0;i < m->nummiptex;i++)
 	{
-		tx = loadmodel->brushq1.textures + i;
+		tx = loadmodel->data_textures + i;
 		if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
 			continue;
 		if (tx->anim_total[0] || tx->anim_total[1])
@@ -1169,7 +1364,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 
 		for (j = i;j < m->nummiptex;j++)
 		{
-			tx2 = loadmodel->brushq1.textures + j;
+			tx2 = loadmodel->data_textures + j;
 			if (!tx2 || tx2->name[0] != '+' || strcmp(tx2->name+2, tx->name+2))
 				continue;
 
@@ -1259,31 +1454,36 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 static void Mod_Q1BSP_LoadLighting(lump_t *l)
 {
 	int i;
-	qbyte *in, *out, *data, d;
+	unsigned char *in, *out, *data, d;
 	char litfilename[1024];
 	loadmodel->brushq1.lightdata = NULL;
 	if (loadmodel->brush.ishlbsp) // LordHavoc: load the colored lighting data straight
 	{
-		loadmodel->brushq1.lightdata = Mem_Alloc(loadmodel->mempool, l->filelen);
+		loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen);
 		for (i=0; i<l->filelen; i++)
 			loadmodel->brushq1.lightdata[i] = mod_base[l->fileofs+i] >>= 1;
 	}
+	else if (loadmodel->brush.ismcbsp)
+	{
+		loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen);
+		memcpy(loadmodel->brushq1.lightdata, mod_base + l->fileofs, l->filelen);
+	}
 	else // LordHavoc: bsp version 29 (normal white lighting)
 	{
 		// LordHavoc: hope is not lost yet, check for a .lit file to load
 		strlcpy (litfilename, loadmodel->name, sizeof (litfilename));
 		FS_StripExtension (litfilename, litfilename, sizeof (litfilename));
 		strlcat (litfilename, ".lit", sizeof (litfilename));
-		data = (qbyte*) FS_LoadFile(litfilename, tempmempool, false);
+		data = (unsigned char*) FS_LoadFile(litfilename, tempmempool, false);
 		if (data)
 		{
-			if (fs_filesize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+			if (fs_filesize == (fs_offset_t)(8 + l->filelen * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
 			{
 				i = LittleLong(((int *)data)[1]);
 				if (i == 1)
 				{
 					Con_DPrintf("loaded %s\n", litfilename);
-					loadmodel->brushq1.lightdata = Mem_Alloc(loadmodel->mempool, fs_filesize - 8);
+					loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, fs_filesize - 8);
 					memcpy(loadmodel->brushq1.lightdata, data + 8, fs_filesize - 8);
 					Mem_Free(data);
 					return;
@@ -1299,14 +1499,14 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l)
 				if (fs_filesize == 8)
 					Con_Print("Empty .lit file, ignoring\n");
 				else
-					Con_Print("Corrupt .lit file (old version?), ignoring\n");
+					Con_Printf("Corrupt .lit file (file size %i bytes, should be %i bytes), ignoring\n", fs_filesize, 8 + l->filelen * 3);
 				Mem_Free(data);
 			}
 		}
 		// LordHavoc: oh well, expand the white lighting data
 		if (!l->filelen)
 			return;
-		loadmodel->brushq1.lightdata = Mem_Alloc(loadmodel->mempool, l->filelen*3);
+		loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen*3);
 		in = loadmodel->brushq1.lightdata + l->filelen*2; // place the file at the end, so it will not be overwritten until the very last write
 		out = loadmodel->brushq1.lightdata;
 		memcpy(in, mod_base + l->fileofs, l->filelen);
@@ -1346,7 +1546,7 @@ static void Mod_Q1BSP_LoadLightList(void)
 			s++;
 			numlights++;
 		}
-		loadmodel->brushq1.lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
+		loadmodel->brushq1.lights = (mlight_t *)Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
 		s = lightsstring;
 		n = 0;
 		while (*s && n < numlights)
@@ -1389,7 +1589,7 @@ static void Mod_Q1BSP_LoadVisibility(lump_t *l)
 	if (!l->filelen)
 		return;
 	loadmodel->brushq1.num_compressedpvs = l->filelen;
-	loadmodel->brushq1.data_compressedpvs = Mem_Alloc(loadmodel->mempool, l->filelen);
+	loadmodel->brushq1.data_compressedpvs = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen);
 	memcpy(loadmodel->brushq1.data_compressedpvs, mod_base + l->fileofs, l->filelen);
 }
 
@@ -1458,7 +1658,7 @@ static void Mod_Q1BSP_LoadEntities(lump_t *l)
 	loadmodel->brush.entities = NULL;
 	if (!l->filelen)
 		return;
-	loadmodel->brush.entities = Mem_Alloc(loadmodel->mempool, l->filelen);
+	loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen);
 	memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen);
 	if (loadmodel->brush.ishlbsp)
 		Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->brush.entities);
@@ -1471,11 +1671,11 @@ static void Mod_Q1BSP_LoadVertexes(lump_t *l)
 	mvertex_t	*out;
 	int			i, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dvertex_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadVertexes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	out = (mvertex_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
 	loadmodel->brushq1.vertexes = out;
 	loadmodel->brushq1.numvertexes = count;
@@ -1488,35 +1688,63 @@ static void Mod_Q1BSP_LoadVertexes(lump_t *l)
 	}
 }
 
-static void Mod_Q1BSP_LoadSubmodels(lump_t *l)
+// The following two functions should be removed and MSG_* or SZ_* function sets adjusted so they
+// can be used for this
+// REMOVEME
+int SB_ReadInt (unsigned char **buffer)
+{
+	int	i;
+	i = ((*buffer)[0]) + 256*((*buffer)[1]) + 65536*((*buffer)[2]) + 16777216*((*buffer)[3]);
+	(*buffer) += 4;
+	return i;
+}
+
+// REMOVEME
+float SB_ReadFloat (unsigned char **buffer)
+{
+	union
+	{
+		int		i;
+		float	f;
+	} u;
+
+	u.i = SB_ReadInt (buffer);
+	return u.f;
+}
+
+static void Mod_Q1BSP_LoadSubmodels(lump_t *l, hullinfo_t *hullinfo)
 {
-	dmodel_t	*in;
+	unsigned char		*index;
 	dmodel_t	*out;
 	int			i, j, count;
 
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Host_Error("Mod_Q1BSP_LoadSubmodels: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	index = (unsigned char *)(mod_base + l->fileofs);
+	if (l->filelen % (48+4*hullinfo->filehulls))
+		Host_Error ("Mod_Q1BSP_LoadSubmodels: funny lump size in %s", loadmodel->name);
+
+	count = l->filelen / (48+4*hullinfo->filehulls);
+	out = (dmodel_t *)Mem_Alloc (loadmodel->mempool, count*sizeof(*out));
 
 	loadmodel->brushq1.submodels = out;
 	loadmodel->brush.numsubmodels = count;
 
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			// spread the mins / maxs by a pixel
-			out->mins[j] = LittleFloat(in->mins[j]) - 1;
-			out->maxs[j] = LittleFloat(in->maxs[j]) + 1;
-			out->origin[j] = LittleFloat(in->origin[j]);
-		}
-		for (j=0 ; j<MAX_MAP_HULLS ; j++)
-			out->headnode[j] = LittleLong(in->headnode[j]);
-		out->visleafs = LittleLong(in->visleafs);
-		out->firstface = LittleLong(in->firstface);
-		out->numfaces = LittleLong(in->numfaces);
+	for (i = 0; i < count; i++, out++)
+	{
+	// spread out the mins / maxs by a pixel
+		out->mins[0] = SB_ReadFloat (&index) - 1;
+		out->mins[1] = SB_ReadFloat (&index) - 1;
+		out->mins[2] = SB_ReadFloat (&index) - 1;
+		out->maxs[0] = SB_ReadFloat (&index) + 1;
+		out->maxs[1] = SB_ReadFloat (&index) + 1;
+		out->maxs[2] = SB_ReadFloat (&index) + 1;
+		out->origin[0] = SB_ReadFloat (&index);
+		out->origin[1] = SB_ReadFloat (&index);
+		out->origin[2] = SB_ReadFloat (&index);
+		for (j = 0; j < hullinfo->filehulls; j++)
+			out->headnode[j] = SB_ReadInt (&index);
+		out->visleafs = SB_ReadInt (&index);
+		out->firstface = SB_ReadInt (&index);
+		out->numfaces = SB_ReadInt (&index);
 	}
 }
 
@@ -1526,11 +1754,11 @@ static void Mod_Q1BSP_LoadEdges(lump_t *l)
 	medge_t *out;
 	int 	i, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dedge_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadEdges: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (medge_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
 	loadmodel->brushq1.edges = out;
 	loadmodel->brushq1.numedges = count;
@@ -1548,11 +1776,11 @@ static void Mod_Q1BSP_LoadTexinfo(lump_t *l)
 	mtexinfo_t *out;
 	int i, j, k, count, miptex;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (texinfo_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadTexinfo: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (mtexinfo_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
 	loadmodel->brushq1.texinfo = out;
 	loadmodel->brushq1.numtexinfo = count;
@@ -1567,25 +1795,25 @@ static void Mod_Q1BSP_LoadTexinfo(lump_t *l)
 		out->flags = LittleLong(in->flags);
 
 		out->texture = NULL;
-		if (loadmodel->brushq1.textures)
+		if (loadmodel->data_textures)
 		{
-			if ((unsigned int) miptex >= (unsigned int) loadmodel->brushq1.numtextures)
-				Con_Printf("error in model \"%s\": invalid miptex index %i(of %i)\n", loadmodel->name, miptex, loadmodel->brushq1.numtextures);
+			if ((unsigned int) miptex >= (unsigned int) loadmodel->num_textures)
+				Con_Printf("error in model \"%s\": invalid miptex index %i(of %i)\n", loadmodel->name, miptex, loadmodel->num_textures);
 			else
-				out->texture = loadmodel->brushq1.textures + miptex;
+				out->texture = loadmodel->data_textures + miptex;
 		}
 		if (out->flags & TEX_SPECIAL)
 		{
 			// if texture chosen is NULL or the shader needs a lightmap,
 			// force to notexture water shader
-			if (out->texture == NULL || out->texture->flags & SURF_LIGHTMAP)
-				out->texture = loadmodel->brushq1.textures + (loadmodel->brushq1.numtextures - 1);
+			if (out->texture == NULL || out->texture->basematerialflags & MATERIALFLAG_WALL)
+				out->texture = loadmodel->data_textures + (loadmodel->num_textures - 1);
 		}
 		else
 		{
 			// if texture chosen is NULL, force to notexture
 			if (out->texture == NULL)
-				out->texture = loadmodel->brushq1.textures + (loadmodel->brushq1.numtextures - 2);
+				out->texture = loadmodel->data_textures + (loadmodel->num_textures - 2);
 		}
 	}
 }
@@ -1710,7 +1938,7 @@ static void SubdividePolygon(int numverts, float *verts)
 //Breaks a polygon up along axial 64 unit
 //boundaries so that turbulent and sky warps
 //can be done reasonably.
-static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surf)
+static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surface)
 {
 	int i, j;
 	surfvertex_t *v;
@@ -1718,11 +1946,11 @@ static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surf)
 
 	subdivpolytriangles = 0;
 	subdivpolyverts = 0;
-	SubdividePolygon(surf->poly_numverts, surf->poly_verts);
+	SubdividePolygon(surface->num_vertices, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex));
 	if (subdivpolytriangles < 1)
 		Host_Error("Mod_Q1BSP_GenerateWarpMesh: no triangles?\n");
 
-	surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
+	surface->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
 	mesh->num_vertices = subdivpolyverts;
 	mesh->num_triangles = subdivpolytriangles;
 	mesh->vertex = (surfvertex_t *)(mesh + 1);
@@ -1736,91 +1964,49 @@ static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surf)
 	for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
 	{
 		VectorCopy(subdivpolyvert[i], v->v);
-		v->st[0] = DotProduct(v->v, surf->texinfo->vecs[0]);
-		v->st[1] = DotProduct(v->v, surf->texinfo->vecs[1]);
+		v->st[0] = DotProduct(v->v, surface->lightmapinfo->texinfo->vecs[0]);
+		v->st[1] = DotProduct(v->v, surface->lightmapinfo->texinfo->vecs[1]);
 	}
 }
 #endif
 
-static void Mod_Q1BSP_GenerateSurfacePolygon(msurface_t *surf, int firstedge, int numedges)
-{
-	int i, lindex, j;
-	float *vec, *vert, mins[3], maxs[3], val, *v;
-	mtexinfo_t *tex;
-
-	// convert edges back to a normal polygon
-	surf->poly_numverts = numedges;
-	vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * numedges);
-	for (i = 0;i < numedges;i++)
-	{
-		lindex = loadmodel->brushq1.surfedges[firstedge + i];
-		if (lindex > 0)
-			vec = loadmodel->brushq1.vertexes[loadmodel->brushq1.edges[lindex].v[0]].position;
-		else
-			vec = loadmodel->brushq1.vertexes[loadmodel->brushq1.edges[-lindex].v[1]].position;
-		VectorCopy(vec, vert);
-		vert += 3;
-	}
-
-	// calculate polygon bounding box and center
-	vert = surf->poly_verts;
-	VectorCopy(vert, mins);
-	VectorCopy(vert, maxs);
-	vert += 3;
-	for (i = 1;i < surf->poly_numverts;i++, vert += 3)
-	{
-		if (mins[0] > vert[0]) mins[0] = vert[0];if (maxs[0] < vert[0]) maxs[0] = vert[0];
-		if (mins[1] > vert[1]) mins[1] = vert[1];if (maxs[1] < vert[1]) maxs[1] = vert[1];
-		if (mins[2] > vert[2]) mins[2] = vert[2];if (maxs[2] < vert[2]) maxs[2] = vert[2];
-	}
-	VectorCopy(mins, surf->poly_mins);
-	VectorCopy(maxs, surf->poly_maxs);
-	surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
-	surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
-	surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
-
-	// generate surface extents information
-	tex = surf->texinfo;
-	mins[0] = maxs[0] = DotProduct(surf->poly_verts, tex->vecs[0]) + tex->vecs[0][3];
-	mins[1] = maxs[1] = DotProduct(surf->poly_verts, tex->vecs[1]) + tex->vecs[1][3];
-	for (i = 1, v = surf->poly_verts + 3;i < surf->poly_numverts;i++, v += 3)
-	{
-		for (j = 0;j < 2;j++)
-		{
-			val = DotProduct(v, tex->vecs[j]) + tex->vecs[j][3];
-			if (mins[j] > val)
-				mins[j] = val;
-			if (maxs[j] < val)
-				maxs[j] = val;
-		}
-	}
-	for (i = 0;i < 2;i++)
-	{
-		surf->texturemins[i] = (int) floor(mins[i] / 16) * 16;
-		surf->extents[i] = (int) ceil(maxs[i] / 16) * 16 - surf->texturemins[i];
-	}
-}
-
 static void Mod_Q1BSP_LoadFaces(lump_t *l)
 {
 	dface_t *in;
-	msurface_t *surf;
-	int i, count, surfnum, planenum, ssize, tsize, firstedge, numedges, totalverts, totaltris, totalmeshes;
-	surfmesh_t *mesh;
-	float s, t;
+	msurface_t *surface;
+	int i, j, count, surfacenum, planenum, smax, tmax, ssize, tsize, firstedge, numedges, totalverts, totaltris;
+	float texmins[2], texmaxs[2], val;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dface_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadFaces: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	loadmodel->brushq1.surfaces = Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_t));
+	loadmodel->data_surfaces = (msurface_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_t));
+	loadmodel->data_surfaces_lightmapinfo = (msurface_lightmapinfo_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_lightmapinfo_t));
 
-	loadmodel->brushq1.numsurfaces = count;
-	loadmodel->brushq1.surfacevisframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+	loadmodel->num_surfaces = count;
 
-	for (surfnum = 0, surf = loadmodel->brushq1.surfaces, totalverts = 0, totaltris = 0, totalmeshes = 0;surfnum < count;surfnum++, totalverts += surf->poly_numverts, totaltris += surf->poly_numverts - 2, totalmeshes++, in++, surf++)
+	totalverts = 0;
+	totaltris = 0;
+	for (surfacenum = 0, in = (dface_t *)(mod_base + l->fileofs);surfacenum < count;surfacenum++, in++)
 	{
-		surf->number = surfnum;
+		numedges = LittleShort(in->numedges);
+		totalverts += numedges;
+		totaltris += numedges - 2;
+	}
+
+	// TODO: split up into multiple meshes as needed to avoid exceeding 65536
+	// vertex limit
+	loadmodel->nummeshes = 1;
+	loadmodel->meshlist = (surfmesh_t **)Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *));
+	loadmodel->meshlist[0] = Mod_AllocSurfMesh(loadmodel->mempool, totalverts, totaltris, true, false, false);
+
+	totalverts = 0;
+	totaltris = 0;
+	for (surfacenum = 0, in = (dface_t *)(mod_base + l->fileofs), surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, in++, surface++)
+	{
+		surface->lightmapinfo = loadmodel->data_surfaces_lightmapinfo + surfacenum;
+
 		// FIXME: validate edges, texinfo, etc?
 		firstedge = LittleLong(in->firstedge);
 		numedges = LittleShort(in->numedges);
@@ -1829,146 +2015,153 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l)
 		i = LittleShort(in->texinfo);
 		if ((unsigned int) i >= (unsigned int) loadmodel->brushq1.numtexinfo)
 			Host_Error("Mod_Q1BSP_LoadFaces: invalid texinfo index %i(model has %i texinfos)\n", i, loadmodel->brushq1.numtexinfo);
-		surf->texinfo = loadmodel->brushq1.texinfo + i;
-		surf->flags = surf->texinfo->texture->flags;
+		surface->lightmapinfo->texinfo = loadmodel->brushq1.texinfo + i;
+		surface->texture = surface->lightmapinfo->texinfo->texture;
 
 		planenum = LittleShort(in->planenum);
-		if ((unsigned int) planenum >= (unsigned int) loadmodel->brushq1.numplanes)
-			Host_Error("Mod_Q1BSP_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->brushq1.numplanes);
-
-		if (LittleShort(in->side))
-			surf->flags |= SURF_PLANEBACK;
-
-		surf->plane = loadmodel->brushq1.planes + planenum;
+		if ((unsigned int) planenum >= (unsigned int) loadmodel->brush.num_planes)
+			Host_Error("Mod_Q1BSP_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->brush.num_planes);
+
+		//surface->flags = surface->texture->flags;
+		//if (LittleShort(in->side))
+		//	surface->flags |= SURF_PLANEBACK;
+		//surface->plane = loadmodel->brush.data_planes + planenum;
+
+		surface->groupmesh = loadmodel->meshlist[0];
+		surface->num_firstvertex = totalverts;
+		surface->num_vertices = numedges;
+		surface->num_firsttriangle = totaltris;
+		surface->num_triangles = numedges - 2;
+		totalverts += numedges;
+		totaltris += numedges - 2;
+
+		// convert edges back to a normal polygon
+		for (i = 0;i < surface->num_vertices;i++)
+		{
+			int lindex = loadmodel->brushq1.surfedges[firstedge + i];
+			float s, t;
+			if (lindex > 0)
+				VectorCopy(loadmodel->brushq1.vertexes[loadmodel->brushq1.edges[lindex].v[0]].position, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3);
+			else
+				VectorCopy(loadmodel->brushq1.vertexes[loadmodel->brushq1.edges[-lindex].v[1]].position, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3);
+			s = DotProduct(((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3];
+			t = DotProduct(((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3];
+			(surface->groupmesh->data_texcoordtexture2f + 2 * surface->num_firstvertex)[i * 2 + 0] = s / surface->texture->width;
+			(surface->groupmesh->data_texcoordtexture2f + 2 * surface->num_firstvertex)[i * 2 + 1] = t / surface->texture->height;
+			(surface->groupmesh->data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 0] = 0;
+			(surface->groupmesh->data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 1] = 0;
+			(surface->groupmesh->data_lightmapoffsets + surface->num_firstvertex)[i] = 0;
+		}
 
-		// clear lightmap (filled in later)
-		surf->lightmaptexture = NULL;
+		for (i = 0;i < surface->num_triangles;i++)
+		{
+			(surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 0] = 0 + surface->num_firstvertex;
+			(surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 1] = i + 1 + surface->num_firstvertex;
+			(surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 2] = i + 2 + surface->num_firstvertex;
+		}
 
-		// force lightmap upload on first time seeing the surface
-		surf->cached_dlight = true;
+		// compile additional data about the surface geometry
+		Mod_BuildTextureVectorsAndNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, surface->groupmesh->data_vertex3f, surface->groupmesh->data_texcoordtexture2f, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle), surface->groupmesh->data_svector3f, surface->groupmesh->data_tvector3f, surface->groupmesh->data_normal3f, true);
+		BoxFromPoints(surface->mins, surface->maxs, surface->num_vertices, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex));
 
-		Mod_Q1BSP_GenerateSurfacePolygon(surf, firstedge, numedges);
+		// generate surface extents information
+		texmins[0] = texmaxs[0] = DotProduct((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3];
+		texmins[1] = texmaxs[1] = DotProduct((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3];
+		for (i = 1;i < surface->num_vertices;i++)
+		{
+			for (j = 0;j < 2;j++)
+			{
+				val = DotProduct((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3, surface->lightmapinfo->texinfo->vecs[j]) + surface->lightmapinfo->texinfo->vecs[j][3];
+				texmins[j] = min(texmins[j], val);
+				texmaxs[j] = max(texmaxs[j], val);
+			}
+		}
+		for (i = 0;i < 2;i++)
+		{
+			surface->lightmapinfo->texturemins[i] = (int) floor(texmins[i] / 16.0) * 16;
+			surface->lightmapinfo->extents[i] = (int) ceil(texmaxs[i] / 16.0) * 16 - surface->lightmapinfo->texturemins[i];
+		}
 
-		ssize = (surf->extents[0] >> 4) + 1;
-		tsize = (surf->extents[1] >> 4) + 1;
+		smax = surface->lightmapinfo->extents[0] >> 4;
+		tmax = surface->lightmapinfo->extents[1] >> 4;
+		ssize = (surface->lightmapinfo->extents[0] >> 4) + 1;
+		tsize = (surface->lightmapinfo->extents[1] >> 4) + 1;
 
 		// lighting info
 		for (i = 0;i < MAXLIGHTMAPS;i++)
-			surf->styles[i] = in->styles[i];
+			surface->lightmapinfo->styles[i] = in->styles[i];
+		// force lightmap upload on first time seeing the surface
+		surface->cached_dlight = true;
+		surface->lightmapinfo->lightmaptexturestride = 0;
+		surface->lightmaptexture = NULL;
 		i = LittleLong(in->lightofs);
 		if (i == -1)
-			surf->samples = NULL;
+		{
+			surface->lightmapinfo->samples = NULL;
+			// give non-lightmapped water a 1x white lightmap
+			if ((surface->texture->basematerialflags & MATERIALFLAG_WATER) && (surface->lightmapinfo->texinfo->flags & TEX_SPECIAL) && ssize <= 256 && tsize <= 256)
+			{
+				surface->lightmapinfo->samples = (unsigned char *)Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
+				surface->lightmapinfo->styles[0] = 0;
+				memset(surface->lightmapinfo->samples, 128, ssize * tsize * 3);
+			}
+		}
 		else if (loadmodel->brush.ishlbsp) // LordHavoc: HalfLife map (bsp version 30)
-			surf->samples = loadmodel->brushq1.lightdata + i;
+			surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + i;
 		else // LordHavoc: white lighting (bsp version 29)
-			surf->samples = loadmodel->brushq1.lightdata + (i * 3);
+			surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + (i * 3);
 
-		if (surf->texinfo->texture->flags & SURF_LIGHTMAP)
+		if (!(surface->lightmapinfo->texinfo->flags & TEX_SPECIAL) || surface->lightmapinfo->samples)
 		{
-			if ((surf->extents[0] >> 4) + 1 > (256) || (surf->extents[1] >> 4) + 1 > (256))
+			int i, iu, iv;
+			float u, v, ubase, vbase, uscale, vscale;
+
+			if (ssize > 256 || tsize > 256)
 				Host_Error("Bad surface extents");
 			// stainmap for permanent marks on walls
-			surf->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
+			surface->lightmapinfo->stainsamples = (unsigned char *)Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
 			// clear to white
-			memset(surf->stainsamples, 255, ssize * tsize * 3);
-		}
-	}
-
-	// TODO: split up into multiple meshes as needed to avoid exceeding 65536
-	// vertex limit
-	loadmodel->nummeshes = 1;
-	loadmodel->meshlist = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *));
-	loadmodel->meshlist[0] = Mod_AllocSurfMesh(loadmodel->mempool, totalverts, totaltris, 0, 0, true, true, false);
-
-	for (surfnum = 0, surf = loadmodel->brushq1.surfaces, totalverts = 0, totaltris = 0, totalmeshes = 0;surfnum < count;surfnum++, totalverts += surf->poly_numverts, totaltris += surf->poly_numverts - 2, totalmeshes++, surf++)
-	{
-		mesh = &surf->mesh;
-		mesh->num_vertices = surf->poly_numverts;
-		mesh->num_triangles = surf->poly_numverts - 2;
-		mesh->data_vertex3f = loadmodel->meshlist[0]->data_vertex3f + totalverts * 3;
-		mesh->data_texcoordtexture2f = loadmodel->meshlist[0]->data_texcoordtexture2f + totalverts * 2;
-		mesh->data_texcoordlightmap2f = loadmodel->meshlist[0]->data_texcoordlightmap2f + totalverts * 2;
-		mesh->data_texcoorddetail2f = loadmodel->meshlist[0]->data_texcoorddetail2f + totalverts * 2;
-		mesh->data_svector3f = loadmodel->meshlist[0]->data_svector3f + totalverts * 3;
-		mesh->data_tvector3f = loadmodel->meshlist[0]->data_tvector3f + totalverts * 3;
-		mesh->data_normal3f = loadmodel->meshlist[0]->data_normal3f + totalverts * 3;
-		mesh->data_lightmapoffsets = loadmodel->meshlist[0]->data_lightmapoffsets + totalverts;
-		mesh->data_element3i = loadmodel->meshlist[0]->data_element3i + totaltris * 3;
-		mesh->data_neighbor3i = loadmodel->meshlist[0]->data_neighbor3i + totaltris * 3;
-
-		surf->lightmaptexturestride = 0;
-		surf->lightmaptexture = NULL;
-
-		for (i = 0;i < mesh->num_vertices;i++)
-		{
-			mesh->data_vertex3f[i * 3 + 0] = surf->poly_verts[i * 3 + 0];
-			mesh->data_vertex3f[i * 3 + 1] = surf->poly_verts[i * 3 + 1];
-			mesh->data_vertex3f[i * 3 + 2] = surf->poly_verts[i * 3 + 2];
-			s = DotProduct((mesh->data_vertex3f + i * 3), surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
-			t = DotProduct((mesh->data_vertex3f + i * 3), surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
-			mesh->data_texcoordtexture2f[i * 2 + 0] = s / surf->texinfo->texture->width;
-			mesh->data_texcoordtexture2f[i * 2 + 1] = t / surf->texinfo->texture->height;
-			mesh->data_texcoorddetail2f[i * 2 + 0] = s * (1.0f / 16.0f);
-			mesh->data_texcoorddetail2f[i * 2 + 1] = t * (1.0f / 16.0f);
-			mesh->data_texcoordlightmap2f[i * 2 + 0] = 0;
-			mesh->data_texcoordlightmap2f[i * 2 + 1] = 0;
-			mesh->data_lightmapoffsets[i] = 0;
-		}
-
-		for (i = 0;i < mesh->num_triangles;i++)
-		{
-			mesh->data_element3i[i * 3 + 0] = 0;
-			mesh->data_element3i[i * 3 + 1] = i + 1;
-			mesh->data_element3i[i * 3 + 2] = i + 2;
-		}
-
-		Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles);
-		Mod_BuildTextureVectorsAndNormals(mesh->num_vertices, mesh->num_triangles, mesh->data_vertex3f, mesh->data_texcoordtexture2f, mesh->data_element3i, mesh->data_svector3f, mesh->data_tvector3f, mesh->data_normal3f);
-
-		if (surf->texinfo->texture->flags & SURF_LIGHTMAP)
-		{
-			int i, iu, iv, smax, tmax;
-			float u, v, ubase, vbase, uscale, vscale;
-
-			smax = surf->extents[0] >> 4;
-			tmax = surf->extents[1] >> 4;
+			memset(surface->lightmapinfo->stainsamples, 255, ssize * tsize * 3);
 
 			if (r_miplightmaps.integer)
 			{
-				surf->lightmaptexturestride = smax+1;
-				surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+				surface->lightmapinfo->lightmaptexturestride = ssize;
+				surface->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surface->lightmapinfo->lightmaptexturestride, tsize, NULL, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
 			}
 			else
 			{
-				surf->lightmaptexturestride = R_CompatibleFragmentWidth(smax+1, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
-				surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+				surface->lightmapinfo->lightmaptexturestride = R_CompatibleFragmentWidth(ssize, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
+				surface->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surface->lightmapinfo->lightmaptexturestride, tsize, NULL, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
 			}
-			R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
-			uscale = (uscale - ubase) / (smax + 1);
-			vscale = (vscale - vbase) / (tmax + 1);
+			R_FragmentLocation(surface->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
+			uscale = (uscale - ubase) / ssize;
+			vscale = (vscale - vbase) / tsize;
 
-			for (i = 0;i < mesh->num_vertices;i++)
+			for (i = 0;i < surface->num_vertices;i++)
 			{
-				u = ((DotProduct((mesh->data_vertex3f + i * 3), surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]) + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-				v = ((DotProduct((mesh->data_vertex3f + i * 3), surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]) + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-				mesh->data_texcoordlightmap2f[i * 2 + 0] = u * uscale + ubase;
-				mesh->data_texcoordlightmap2f[i * 2 + 1] = v * vscale + vbase;
+				u = ((DotProduct(((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3]) + 8 - surface->lightmapinfo->texturemins[0]) * (1.0 / 16.0);
+				v = ((DotProduct(((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3]) + 8 - surface->lightmapinfo->texturemins[1]) * (1.0 / 16.0);
+				(surface->groupmesh->data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 0] = u * uscale + ubase;
+				(surface->groupmesh->data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 1] = v * vscale + vbase;
 				// LordHavoc: calc lightmap data offset for vertex lighting to use
 				iu = (int) u;
 				iv = (int) v;
-				mesh->data_lightmapoffsets[i] = (bound(0, iv, tmax) * (smax+1) + bound(0, iu, smax)) * 3;
+				(surface->groupmesh->data_lightmapoffsets + surface->num_firstvertex)[i] = (bound(0, iv, tmax) * ssize + bound(0, iu, smax)) * 3;
 			}
 		}
 	}
 }
 
-static void Mod_Q1BSP_SetParent(mnode_t *node, mnode_t *parent)
+static void Mod_Q1BSP_LoadNodes_RecursiveSetParent(mnode_t *node, mnode_t *parent)
 {
+	//if (node->parent)
+	//	Host_Error("Mod_Q1BSP_LoadNodes_RecursiveSetParent: runaway recursion\n");
 	node->parent = parent;
-	if (node->contents < 0)
-		return;
-	Mod_Q1BSP_SetParent(node->children[0], node);
-	Mod_Q1BSP_SetParent(node->children[1], node);
+	if (node->plane)
+	{
+		Mod_Q1BSP_LoadNodes_RecursiveSetParent(node->children[0], node);
+		Mod_Q1BSP_LoadNodes_RecursiveSetParent(node->children[1], node);
+	}
 }
 
 static void Mod_Q1BSP_LoadNodes(lump_t *l)
@@ -1977,14 +2170,14 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l)
 	dnode_t		*in;
 	mnode_t 	*out;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dnode_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadNodes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	out = (mnode_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
-	loadmodel->brushq1.nodes = out;
-	loadmodel->brushq1.numnodes = count;
+	loadmodel->brush.data_nodes = out;
+	loadmodel->brush.num_nodes = count;
 
 	for ( i=0 ; i<count ; i++, in++, out++)
 	{
@@ -1995,7 +2188,7 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l)
 		}
 
 		p = LittleLong(in->planenum);
-		out->plane = loadmodel->brushq1.planes + p;
+		out->plane = loadmodel->brush.data_planes + p;
 
 		out->firstsurface = LittleShort(in->firstface);
 		out->numsurfaces = LittleShort(in->numfaces);
@@ -2004,13 +2197,13 @@ static void Mod_Q1BSP_LoadNodes(lump_t *l)
 		{
 			p = LittleShort(in->children[j]);
 			if (p >= 0)
-				out->children[j] = loadmodel->brushq1.nodes + p;
+				out->children[j] = loadmodel->brush.data_nodes + p;
 			else
-				out->children[j] = (mnode_t *)(loadmodel->brushq1.data_leafs + (-1 - p));
+				out->children[j] = (mnode_t *)(loadmodel->brush.data_leafs + (-1 - p));
 		}
 	}
 
-	Mod_Q1BSP_SetParent(loadmodel->brushq1.nodes, NULL);	// sets nodes and leafs
+	Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL);	// sets nodes and leafs
 }
 
 static void Mod_Q1BSP_LoadLeafs(lump_t *l)
@@ -2019,18 +2212,18 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l)
 	mleaf_t *out;
 	int i, j, count, p;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dleaf_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadLeafs: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	out = (mleaf_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
-	loadmodel->brushq1.data_leafs = out;
-	loadmodel->brushq1.num_leafs = count;
+	loadmodel->brush.data_leafs = out;
+	loadmodel->brush.num_leafs = count;
 	// get visleafs from the submodel data
 	loadmodel->brush.num_pvsclusters = loadmodel->brushq1.submodels[0].visleafs;
 	loadmodel->brush.num_pvsclusterbytes = (loadmodel->brush.num_pvsclusters+7)>>3;
-	loadmodel->brush.data_pvsclusters = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes);
+	loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes);
 	memset(loadmodel->brush.data_pvsclusters, 0xFF, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes);
 
 	for ( i=0 ; i<count ; i++, in++, out++)
@@ -2045,13 +2238,13 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l)
 
 		out->contents = LittleLong(in->contents);
 
-		out->firstmarksurface = loadmodel->brushq1.marksurfaces + LittleShort(in->firstmarksurface);
-		out->nummarksurfaces = LittleShort(in->nummarksurfaces);
-		if (out->firstmarksurface < 0 || LittleShort(in->firstmarksurface) + out->nummarksurfaces > loadmodel->brushq1.nummarksurfaces)
+		out->firstleafsurface = loadmodel->brush.data_leafsurfaces + LittleShort(in->firstmarksurface);
+		out->numleafsurfaces = LittleShort(in->nummarksurfaces);
+		if (out->firstleafsurface < 0 || LittleShort(in->firstmarksurface) + out->numleafsurfaces > loadmodel->brush.num_leafsurfaces)
 		{
-			Con_Printf("Mod_Q1BSP_LoadLeafs: invalid marksurface range %i:%i outside range %i:%i\n", out->firstmarksurface, out->firstmarksurface + out->nummarksurfaces, 0, loadmodel->brushq1.nummarksurfaces);
-			out->firstmarksurface = NULL;
-			out->nummarksurfaces = 0;
+			Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", out->firstleafsurface, out->firstleafsurface + out->numleafsurfaces, 0, loadmodel->brush.num_leafsurfaces);
+			out->firstleafsurface = NULL;
+			out->numleafsurfaces = 0;
 		}
 
 		out->clusterindex = i - 1;
@@ -2075,88 +2268,34 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l)
 	}
 }
 
-static void Mod_Q1BSP_LoadClipnodes(lump_t *l)
+static void Mod_Q1BSP_LoadClipnodes(lump_t *l, hullinfo_t *hullinfo)
 {
 	dclipnode_t *in, *out;
 	int			i, count;
 	hull_t		*hull;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dclipnode_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadClipnodes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	out = (dclipnode_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
 	loadmodel->brushq1.clipnodes = out;
 	loadmodel->brushq1.numclipnodes = count;
 
-	if (loadmodel->brush.ishlbsp)
+	for (i = 1; i < hullinfo->numhulls; i++)
 	{
-		hull = &loadmodel->brushq1.hulls[1];
+		hull = &loadmodel->brushq1.hulls[i];
 		hull->clipnodes = out;
 		hull->firstclipnode = 0;
 		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->brushq1.planes;
-		hull->clip_mins[0] = -16;
-		hull->clip_mins[1] = -16;
-		hull->clip_mins[2] = -36;
-		hull->clip_maxs[0] = 16;
-		hull->clip_maxs[1] = 16;
-		hull->clip_maxs[2] = 36;
-		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-
-		hull = &loadmodel->brushq1.hulls[2];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->brushq1.planes;
-		hull->clip_mins[0] = -32;
-		hull->clip_mins[1] = -32;
-		hull->clip_mins[2] = -32;
-		hull->clip_maxs[0] = 32;
-		hull->clip_maxs[1] = 32;
-		hull->clip_maxs[2] = 32;
-		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-
-		hull = &loadmodel->brushq1.hulls[3];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->brushq1.planes;
-		hull->clip_mins[0] = -16;
-		hull->clip_mins[1] = -16;
-		hull->clip_mins[2] = -18;
-		hull->clip_maxs[0] = 16;
-		hull->clip_maxs[1] = 16;
-		hull->clip_maxs[2] = 18;
-		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-	}
-	else
-	{
-		hull = &loadmodel->brushq1.hulls[1];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->brushq1.planes;
-		hull->clip_mins[0] = -16;
-		hull->clip_mins[1] = -16;
-		hull->clip_mins[2] = -24;
-		hull->clip_maxs[0] = 16;
-		hull->clip_maxs[1] = 16;
-		hull->clip_maxs[2] = 32;
-		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-
-		hull = &loadmodel->brushq1.hulls[2];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->brushq1.planes;
-		hull->clip_mins[0] = -32;
-		hull->clip_mins[1] = -32;
-		hull->clip_mins[2] = -24;
-		hull->clip_maxs[0] = 32;
-		hull->clip_maxs[1] = 32;
-		hull->clip_maxs[2] = 64;
+		hull->planes = loadmodel->brush.data_planes;
+		hull->clip_mins[0] = hullinfo->hullsizes[i][0][0];
+		hull->clip_mins[1] = hullinfo->hullsizes[i][0][1];
+		hull->clip_mins[2] = hullinfo->hullsizes[i][0][2];
+		hull->clip_maxs[0] = hullinfo->hullsizes[i][1][0];
+		hull->clip_maxs[1] = hullinfo->hullsizes[i][1][1];
+		hull->clip_maxs[2] = hullinfo->hullsizes[i][1][2];
 		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 	}
 
@@ -2180,39 +2319,39 @@ static void Mod_Q1BSP_MakeHull0(void)
 
 	hull = &loadmodel->brushq1.hulls[0];
 
-	in = loadmodel->brushq1.nodes;
-	out = Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numnodes * sizeof(dclipnode_t));
+	in = loadmodel->brush.data_nodes;
+	out = (dclipnode_t *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_nodes * sizeof(dclipnode_t));
 
 	hull->clipnodes = out;
 	hull->firstclipnode = 0;
-	hull->lastclipnode = loadmodel->brushq1.numnodes - 1;
-	hull->planes = loadmodel->brushq1.planes;
+	hull->lastclipnode = loadmodel->brush.num_nodes - 1;
+	hull->planes = loadmodel->brush.data_planes;
 
-	for (i = 0;i < loadmodel->brushq1.numnodes;i++, out++, in++)
+	for (i = 0;i < loadmodel->brush.num_nodes;i++, out++, in++)
 	{
-		out->planenum = in->plane - loadmodel->brushq1.planes;
-		out->children[0] = in->children[0]->contents < 0 ? in->children[0]->contents : in->children[0] - loadmodel->brushq1.nodes;
-		out->children[1] = in->children[1]->contents < 0 ? in->children[1]->contents : in->children[1] - loadmodel->brushq1.nodes;
+		out->planenum = in->plane - loadmodel->brush.data_planes;
+		out->children[0] = in->children[0]->plane ? in->children[0] - loadmodel->brush.data_nodes : ((mleaf_t *)in->children[0])->contents;
+		out->children[1] = in->children[1]->plane ? in->children[1] - loadmodel->brush.data_nodes : ((mleaf_t *)in->children[1])->contents;
 	}
 }
 
-static void Mod_Q1BSP_LoadMarksurfaces(lump_t *l)
+static void Mod_Q1BSP_LoadLeaffaces(lump_t *l)
 {
 	int i, j;
 	short *in;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (short *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error("Mod_Q1BSP_LoadMarksurfaces: funny lump size in %s",loadmodel->name);
-	loadmodel->brushq1.nummarksurfaces = l->filelen / sizeof(*in);
-	loadmodel->brushq1.marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.nummarksurfaces * sizeof(int));
+		Host_Error("Mod_Q1BSP_LoadLeaffaces: funny lump size in %s",loadmodel->name);
+	loadmodel->brush.num_leafsurfaces = l->filelen / sizeof(*in);
+	loadmodel->brush.data_leafsurfaces = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_leafsurfaces * sizeof(int));
 
-	for (i = 0;i < loadmodel->brushq1.nummarksurfaces;i++)
+	for (i = 0;i < loadmodel->brush.num_leafsurfaces;i++)
 	{
 		j = (unsigned) LittleShort(in[i]);
-		if (j >= loadmodel->brushq1.numsurfaces)
-			Host_Error("Mod_Q1BSP_LoadMarksurfaces: bad surface number");
-		loadmodel->brushq1.marksurfaces[i] = j;
+		if (j >= loadmodel->num_surfaces)
+			Host_Error("Mod_Q1BSP_LoadLeaffaces: bad surface number");
+		loadmodel->brush.data_leafsurfaces[i] = j;
 	}
 }
 
@@ -2221,11 +2360,11 @@ static void Mod_Q1BSP_LoadSurfedges(lump_t *l)
 	int		i;
 	int		*in;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (int *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadSurfedges: funny lump size in %s",loadmodel->name);
 	loadmodel->brushq1.numsurfedges = l->filelen / sizeof(*in);
-	loadmodel->brushq1.surfedges = Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numsurfedges * sizeof(int));
+	loadmodel->brushq1.surfedges = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numsurfedges * sizeof(int));
 
 	for (i = 0;i < loadmodel->brushq1.numsurfedges;i++)
 		loadmodel->brushq1.surfedges[i] = LittleLong(in[i]);
@@ -2238,14 +2377,14 @@ static void Mod_Q1BSP_LoadPlanes(lump_t *l)
 	mplane_t	*out;
 	dplane_t 	*in;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (dplane_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q1BSP_LoadPlanes: funny lump size in %s", loadmodel->name);
 
-	loadmodel->brushq1.numplanes = l->filelen / sizeof(*in);
-	loadmodel->brushq1.planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numplanes * sizeof(*out));
+	loadmodel->brush.num_planes = l->filelen / sizeof(*in);
+	loadmodel->brush.data_planes = out = (mplane_t *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_planes * sizeof(*out));
 
-	for (i = 0;i < loadmodel->brushq1.numplanes;i++, in++, out++)
+	for (i = 0;i < loadmodel->brush.num_planes;i++, in++, out++)
 	{
 		out->normal[0] = LittleFloat(in->normal[0]);
 		out->normal[1] = LittleFloat(in->normal[1]);
@@ -2266,7 +2405,7 @@ static void Mod_Q1BSP_LoadMapBrushes(void)
 	char mapfilename[MAX_QPATH];
 	FS_StripExtension (loadmodel->name, mapfilename, sizeof (mapfilename));
 	strlcat (mapfilename, ".map", sizeof (mapfilename));
-	maptext = (qbyte*) FS_LoadFile(mapfilename, tempmempool, false);
+	maptext = (unsigned char*) FS_LoadFile(mapfilename, tempmempool, false);
 	if (!maptext)
 		return;
 	text = maptext;
@@ -2375,7 +2514,7 @@ AllocPortal
 static portal_t *AllocPortal(void)
 {
 	portal_t *p;
-	p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
+	p = (portal_t *)Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
 	p->chain = portalchain;
 	portalchain = p;
 	return p;
@@ -2388,11 +2527,13 @@ static void FreePortal(portal_t *p)
 
 static void Mod_Q1BSP_RecursiveRecalcNodeBBox(mnode_t *node)
 {
+	// process only nodes (leafs already had their box calculated)
+	if (!node->plane)
+		return;
+
 	// calculate children first
-	if (node->children[0]->contents >= 0)
-		Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[0]);
-	if (node->children[1]->contents >= 0)
-		Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[1]);
+	Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[0]);
+	Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[1]);
 
 	// make combined bounding box from children
 	node->mins[0] = min(node->children[0]->mins[0], node->children[1]->mins[0]);
@@ -2411,78 +2552,50 @@ static void Mod_Q1BSP_FinalizePortals(void)
 	mvertex_t *point;
 	mleaf_t *leaf, *endleaf;
 
-	// recalculate bounding boxes for all leafs(because qbsp is very sloppy)
-	leaf = loadmodel->brushq1.data_leafs;
-	endleaf = leaf + loadmodel->brushq1.num_leafs;
+	// tally up portal and point counts and recalculate bounding boxes for all
+	// leafs (because qbsp is very sloppy)
+	leaf = loadmodel->brush.data_leafs;
+	endleaf = leaf + loadmodel->brush.num_leafs;
 	for (;leaf < endleaf;leaf++)
 	{
 		VectorSet(leaf->mins,  2000000000,  2000000000,  2000000000);
 		VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
 	}
 	p = portalchain;
-	while (p)
-	{
-		if (p->numpoints >= 3)
-		{
-			for (i = 0;i < 2;i++)
-			{
-				leaf = (mleaf_t *)p->nodes[i];
-				for (j = 0;j < p->numpoints;j++)
-				{
-					if (leaf->mins[0] > p->points[j*3+0]) leaf->mins[0] = p->points[j*3+0];
-					if (leaf->mins[1] > p->points[j*3+1]) leaf->mins[1] = p->points[j*3+1];
-					if (leaf->mins[2] > p->points[j*3+2]) leaf->mins[2] = p->points[j*3+2];
-					if (leaf->maxs[0] < p->points[j*3+0]) leaf->maxs[0] = p->points[j*3+0];
-					if (leaf->maxs[1] < p->points[j*3+1]) leaf->maxs[1] = p->points[j*3+1];
-					if (leaf->maxs[2] < p->points[j*3+2]) leaf->maxs[2] = p->points[j*3+2];
-				}
-			}
-		}
-		p = p->chain;
-	}
-
-	Mod_Q1BSP_RecursiveRecalcNodeBBox(loadmodel->brushq1.nodes);
-
-	// tally up portal and point counts
-	p = portalchain;
 	numportals = 0;
 	numpoints = 0;
 	while (p)
 	{
 		// note: this check must match the one below or it will usually corrupt memory
 		// the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
-		if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1]
-		 && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID
-		 && p->nodes[0]->contents != CONTENTS_SKY && p->nodes[1]->contents != CONTENTS_SKY)
+		if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1] && ((mleaf_t *)p->nodes[0])->clusterindex >= 0 && ((mleaf_t *)p->nodes[1])->clusterindex >= 0)
 		{
 			numportals += 2;
 			numpoints += p->numpoints * 2;
 		}
 		p = p->chain;
 	}
-	loadmodel->brushq1.portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
-	loadmodel->brushq1.numportals = numportals;
-	loadmodel->brushq1.portalpoints = (void *)((qbyte *) loadmodel->brushq1.portals + numportals * sizeof(mportal_t));
-	loadmodel->brushq1.numportalpoints = numpoints;
+	loadmodel->brush.data_portals = (mportal_t *)Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
+	loadmodel->brush.num_portals = numportals;
+	loadmodel->brush.data_portalpoints = (mvertex_t *)((unsigned char *) loadmodel->brush.data_portals + numportals * sizeof(mportal_t));
+	loadmodel->brush.num_portalpoints = numpoints;
 	// clear all leaf portal chains
-	for (i = 0;i < loadmodel->brushq1.num_leafs;i++)
-		loadmodel->brushq1.data_leafs[i].portals = NULL;
+	for (i = 0;i < loadmodel->brush.num_leafs;i++)
+		loadmodel->brush.data_leafs[i].portals = NULL;
 	// process all portals in the global portal chain, while freeing them
-	portal = loadmodel->brushq1.portals;
-	point = loadmodel->brushq1.portalpoints;
+	portal = loadmodel->brush.data_portals;
+	point = loadmodel->brush.data_portalpoints;
 	p = portalchain;
 	portalchain = NULL;
 	while (p)
 	{
 		pnext = p->chain;
 
-		if (p->numpoints >= 3)
+		if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1])
 		{
 			// note: this check must match the one above or it will usually corrupt memory
 			// the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
-			if (p->nodes[0] != p->nodes[1]
-			 && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID
-			 && p->nodes[0]->contents != CONTENTS_SKY && p->nodes[1]->contents != CONTENTS_SKY)
+			if (((mleaf_t *)p->nodes[0])->clusterindex >= 0 && ((mleaf_t *)p->nodes[1])->clusterindex >= 0)
 			{
 				// first make the back to front portal(forward portal)
 				portal->points = point;
@@ -2530,10 +2643,26 @@ static void Mod_Q1BSP_FinalizePortals(void)
 				// advance to next portal
 				portal++;
 			}
+			// add the portal's polygon points to the leaf bounding boxes
+			for (i = 0;i < 2;i++)
+			{
+				leaf = (mleaf_t *)p->nodes[i];
+				for (j = 0;j < p->numpoints;j++)
+				{
+					if (leaf->mins[0] > p->points[j*3+0]) leaf->mins[0] = p->points[j*3+0];
+					if (leaf->mins[1] > p->points[j*3+1]) leaf->mins[1] = p->points[j*3+1];
+					if (leaf->mins[2] > p->points[j*3+2]) leaf->mins[2] = p->points[j*3+2];
+					if (leaf->maxs[0] < p->points[j*3+0]) leaf->maxs[0] = p->points[j*3+0];
+					if (leaf->maxs[1] < p->points[j*3+1]) leaf->maxs[1] = p->points[j*3+1];
+					if (leaf->maxs[2] < p->points[j*3+2]) leaf->maxs[2] = p->points[j*3+2];
+				}
+			}
 		}
 		FreePortal(p);
 		p = pnext;
 	}
+	// now recalculate the node bounding boxes from the leafs
+	Mod_Q1BSP_RecursiveRecalcNodeBBox(loadmodel->brush.data_nodes);
 }
 
 /*
@@ -2578,7 +2707,7 @@ static void RemovePortalFromNodes(portal_t *portal)
 		portalpointer = (void **) &node->portals;
 		while (1)
 		{
-			t = *portalpointer;
+			t = (portal_t *)*portalpointer;
 			if (!t)
 				Host_Error("RemovePortalFromNodes: portal not in leaf");
 
@@ -2619,7 +2748,7 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node)
 	double frontpoints[3*MAX_PORTALPOINTS], backpoints[3*MAX_PORTALPOINTS];
 
 	// if a leaf, we're done
-	if (node->contents)
+	if (!node->plane)
 		return;
 
 	plane = node->plane;
@@ -2670,69 +2799,69 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node)
 		Con_Print("Mod_Q1BSP_RecursiveNodePortals: WARNING: new portal has too many points\n");
 		nodeportal->numpoints = 0;
 	}
-	else
-	{
-		AddPortalToNodes(nodeportal, front, back);
 
-		// split the portals of this node along this node's plane and assign them to the children of this node
-		// (migrating the portals downward through the tree)
-		for (portal = (portal_t *)node->portals;portal;portal = nextportal)
-		{
-			if (portal->nodes[0] == portal->nodes[1])
-				Host_Error("Mod_Q1BSP_RecursiveNodePortals: portal has same node on both sides(2)");
-			if (portal->nodes[0] == node)
-				side = 0;
-			else if (portal->nodes[1] == node)
-				side = 1;
-			else
-				Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
-			nextportal = portal->next[side];
+	AddPortalToNodes(nodeportal, front, back);
 
-			other_node = portal->nodes[!side];
-			RemovePortalFromNodes(portal);
+	// split the portals of this node along this node's plane and assign them to the children of this node
+	// (migrating the portals downward through the tree)
+	for (portal = (portal_t *)node->portals;portal;portal = nextportal)
+	{
+		if (portal->nodes[0] == portal->nodes[1])
+			Host_Error("Mod_Q1BSP_RecursiveNodePortals: portal has same node on both sides(2)");
+		if (portal->nodes[0] == node)
+			side = 0;
+		else if (portal->nodes[1] == node)
+			side = 1;
+		else
+			Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
+		nextportal = portal->next[side];
+		if (!portal->numpoints)
+			continue;
 
-			// cut the portal into two portals, one on each side of the node plane
-			PolygonD_Divide(portal->numpoints, portal->points, plane->normal[0], plane->normal[1], plane->normal[2], plane->dist, 1.0/32.0, MAX_PORTALPOINTS, frontpoints, &numfrontpoints, MAX_PORTALPOINTS, backpoints, &numbackpoints);
+		other_node = portal->nodes[!side];
+		RemovePortalFromNodes(portal);
 
-			if (!numfrontpoints)
-			{
-				if (side == 0)
-					AddPortalToNodes(portal, back, other_node);
-				else
-					AddPortalToNodes(portal, other_node, back);
-				continue;
-			}
-			if (!numbackpoints)
-			{
-				if (side == 0)
-					AddPortalToNodes(portal, front, other_node);
-				else
-					AddPortalToNodes(portal, other_node, front);
-				continue;
-			}
-
-			// the portal is split
-			splitportal = AllocPortal();
-			temp = splitportal->chain;
-			*splitportal = *portal;
-			splitportal->chain = temp;
-			for (i = 0;i < numbackpoints*3;i++)
-				splitportal->points[i] = backpoints[i];
-			splitportal->numpoints = numbackpoints;
-			for (i = 0;i < numfrontpoints*3;i++)
-				portal->points[i] = frontpoints[i];
-			portal->numpoints = numfrontpoints;
+		// cut the portal into two portals, one on each side of the node plane
+		PolygonD_Divide(portal->numpoints, portal->points, plane->normal[0], plane->normal[1], plane->normal[2], plane->dist, 1.0/32.0, MAX_PORTALPOINTS, frontpoints, &numfrontpoints, MAX_PORTALPOINTS, backpoints, &numbackpoints);
 
+		if (!numfrontpoints)
+		{
+			if (side == 0)
+				AddPortalToNodes(portal, back, other_node);
+			else
+				AddPortalToNodes(portal, other_node, back);
+			continue;
+		}
+		if (!numbackpoints)
+		{
 			if (side == 0)
-			{
 				AddPortalToNodes(portal, front, other_node);
-				AddPortalToNodes(splitportal, back, other_node);
-			}
 			else
-			{
 				AddPortalToNodes(portal, other_node, front);
-				AddPortalToNodes(splitportal, other_node, back);
-			}
+			continue;
+		}
+
+		// the portal is split
+		splitportal = AllocPortal();
+		temp = splitportal->chain;
+		*splitportal = *portal;
+		splitportal->chain = temp;
+		for (i = 0;i < numbackpoints*3;i++)
+			splitportal->points[i] = backpoints[i];
+		splitportal->numpoints = numbackpoints;
+		for (i = 0;i < numfrontpoints*3;i++)
+			portal->points[i] = frontpoints[i];
+		portal->numpoints = numfrontpoints;
+
+		if (side == 0)
+		{
+			AddPortalToNodes(portal, front, other_node);
+			AddPortalToNodes(splitportal, back, other_node);
+		}
+		else
+		{
+			AddPortalToNodes(portal, other_node, front);
+			AddPortalToNodes(splitportal, other_node, back);
 		}
 	}
 
@@ -2743,66 +2872,20 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node)
 static void Mod_Q1BSP_MakePortals(void)
 {
 	portalchain = NULL;
-	Mod_Q1BSP_RecursiveNodePortals(loadmodel->brushq1.nodes);
+	Mod_Q1BSP_RecursiveNodePortals(loadmodel->brush.data_nodes);
 	Mod_Q1BSP_FinalizePortals();
 }
 
-static void Mod_Q1BSP_BuildSurfaceNeighbors(msurface_t *surfaces, int numsurfaces, mempool_t *mempool)
-{
-#if 0
-	int surfnum, vertnum, vertnum2, snum, vnum, vnum2;
-	msurface_t *surf, *s;
-	float *v0, *v1, *v2, *v3;
-	for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
-		surf->neighborsurfaces = Mem_Alloc(mempool, surf->poly_numverts * sizeof(msurface_t *));
-	for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
-	{
-		for (vertnum = surf->poly_numverts - 1, vertnum2 = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;vertnum2 < surf->poly_numverts;vertnum = vertnum2, vertnum2++, v0 = v1, v1 += 3)
-		{
-			if (surf->neighborsurfaces[vertnum])
-				continue;
-			surf->neighborsurfaces[vertnum] = NULL;
-			for (s = surfaces, snum = 0;snum < numsurfaces;s++, snum++)
-			{
-				if (s->poly_mins[0] > (surf->poly_maxs[0] + 1) || s->poly_maxs[0] < (surf->poly_mins[0] - 1)
-				 || s->poly_mins[1] > (surf->poly_maxs[1] + 1) || s->poly_maxs[1] < (surf->poly_mins[1] - 1)
-				 || s->poly_mins[2] > (surf->poly_maxs[2] + 1) || s->poly_maxs[2] < (surf->poly_mins[2] - 1)
-				 || s == surf)
-					continue;
-				for (vnum = 0;vnum < s->poly_numverts;vnum++)
-					if (s->neighborsurfaces[vnum] == surf)
-						break;
-				if (vnum < s->poly_numverts)
-					continue;
-				for (vnum = s->poly_numverts - 1, vnum2 = 0, v2 = s->poly_verts + (s->poly_numverts - 1) * 3, v3 = s->poly_verts;vnum2 < s->poly_numverts;vnum = vnum2, vnum2++, v2 = v3, v3 += 3)
-				{
-					if (s->neighborsurfaces[vnum] == NULL
-					 && ((v0[0] == v2[0] && v0[1] == v2[1] && v0[2] == v2[2] && v1[0] == v3[0] && v1[1] == v3[1] && v1[2] == v3[2])
-					  || (v1[0] == v2[0] && v1[1] == v2[1] && v1[2] == v2[2] && v0[0] == v3[0] && v0[1] == v3[1] && v0[2] == v3[2])))
-					{
-						surf->neighborsurfaces[vertnum] = s;
-						s->neighborsurfaces[vnum] = surf;
-						break;
-					}
-				}
-				if (vnum < s->poly_numverts)
-					break;
-			}
-		}
-	}
-#endif
-}
-
 static void Mod_Q1BSP_BuildLightmapUpdateChains(mempool_t *mempool, model_t *model)
 {
 	int i, j, stylecounts[256], totalcount, remapstyles[256];
-	msurface_t *surf;
+	msurface_t *surface;
 	memset(stylecounts, 0, sizeof(stylecounts));
 	for (i = 0;i < model->nummodelsurfaces;i++)
 	{
-		surf = model->brushq1.surfaces + model->firstmodelsurface + i;
+		surface = model->data_surfaces + model->firstmodelsurface + i;
 		for (j = 0;j < MAXLIGHTMAPS;j++)
-			stylecounts[surf->styles[j]]++;
+			stylecounts[surface->lightmapinfo->styles[j]]++;
 	}
 	totalcount = 0;
 	model->brushq1.light_styles = 0;
@@ -2816,10 +2899,10 @@ static void Mod_Q1BSP_BuildLightmapUpdateChains(mempool_t *mempool, model_t *mod
 	}
 	if (!totalcount)
 		return;
-	model->brushq1.light_style = Mem_Alloc(mempool, model->brushq1.light_styles * sizeof(qbyte));
-	model->brushq1.light_stylevalue = Mem_Alloc(mempool, model->brushq1.light_styles * sizeof(int));
-	model->brushq1.light_styleupdatechains = Mem_Alloc(mempool, model->brushq1.light_styles * sizeof(msurface_t **));
-	model->brushq1.light_styleupdatechainsbuffer = Mem_Alloc(mempool, totalcount * sizeof(msurface_t *));
+	model->brushq1.light_style = (unsigned char *)Mem_Alloc(mempool, model->brushq1.light_styles * sizeof(unsigned char));
+	model->brushq1.light_stylevalue = (int *)Mem_Alloc(mempool, model->brushq1.light_styles * sizeof(int));
+	model->brushq1.light_styleupdatechains = (msurface_t ***)Mem_Alloc(mempool, model->brushq1.light_styles * sizeof(msurface_t **));
+	model->brushq1.light_styleupdatechainsbuffer = (msurface_t **)Mem_Alloc(mempool, totalcount * sizeof(msurface_t *));
 	model->brushq1.light_styles = 0;
 	for (i = 0;i < 255;i++)
 		if (stylecounts[i])
@@ -2832,10 +2915,10 @@ static void Mod_Q1BSP_BuildLightmapUpdateChains(mempool_t *mempool, model_t *mod
 	}
 	for (i = 0;i < model->nummodelsurfaces;i++)
 	{
-		surf = model->brushq1.surfaces + model->firstmodelsurface + i;
+		surface = model->data_surfaces + model->firstmodelsurface + i;
 		for (j = 0;j < MAXLIGHTMAPS;j++)
-			if (surf->styles[j] != 255)
-				*model->brushq1.light_styleupdatechains[remapstyles[surf->styles[j]]]++ = surf;
+			if (surface->lightmapinfo->styles[j] != 255)
+				*model->brushq1.light_styleupdatechains[remapstyles[surface->lightmapinfo->styles[j]]]++ = surface;
 	}
 	j = 0;
 	for (i = 0;i < model->brushq1.light_styles;i++)
@@ -2848,11 +2931,10 @@ static void Mod_Q1BSP_BuildLightmapUpdateChains(mempool_t *mempool, model_t *mod
 
 //Returns PVS data for a given point
 //(note: can return NULL)
-static qbyte *Mod_Q1BSP_GetPVS(model_t *model, const vec3_t p)
+static unsigned char *Mod_Q1BSP_GetPVS(model_t *model, const vec3_t p)
 {
 	mnode_t *node;
-	Mod_CheckLoaded(model);
-	node = model->brushq1.nodes;
+	node = model->brush.data_nodes;
 	while (node->plane)
 		node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct(p,node->plane->normal)) < node->plane->dist];
 	if (((mleaf_t *)node)->clusterindex >= 0)
@@ -2861,7 +2943,7 @@ static qbyte *Mod_Q1BSP_GetPVS(model_t *model, const vec3_t p)
 		return NULL;
 }
 
-static void Mod_Q1BSP_FatPVS_RecursiveBSPNode(model_t *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbytes, mnode_t *node)
+static void Mod_Q1BSP_FatPVS_RecursiveBSPNode(model_t *model, const vec3_t org, vec_t radius, unsigned char *pvsbuffer, int pvsbytes, mnode_t *node)
 {
 	while (node->plane)
 	{
@@ -2881,7 +2963,7 @@ static void Mod_Q1BSP_FatPVS_RecursiveBSPNode(model_t *model, const vec3_t org,
 	if (((mleaf_t *)node)->clusterindex >= 0)
 	{
 		int i;
-		qbyte *pvs = model->brush.data_pvsclusters + ((mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
+		unsigned char *pvs = model->brush.data_pvsclusters + ((mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
 		for (i = 0;i < pvsbytes;i++)
 			pvsbuffer[i] |= pvs[i];
 	}
@@ -2889,17 +2971,17 @@ static void Mod_Q1BSP_FatPVS_RecursiveBSPNode(model_t *model, const vec3_t org,
 
 //Calculates a PVS that is the inclusive or of all leafs within radius pixels
 //of the given point.
-static int Mod_Q1BSP_FatPVS(model_t *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbufferlength)
+static int Mod_Q1BSP_FatPVS(model_t *model, const vec3_t org, vec_t radius, unsigned char *pvsbuffer, int pvsbufferlength)
 {
-	int bytes = ((model->brushq1.num_leafs - 1) + 7) >> 3;
+	int bytes = model->brush.num_pvsclusterbytes;
 	bytes = min(bytes, pvsbufferlength);
-	if (r_novis.integer || !Mod_Q1BSP_GetPVS(model, org))
+	if (r_novis.integer || !model->brush.num_pvsclusters || !Mod_Q1BSP_GetPVS(model, org))
 	{
 		memset(pvsbuffer, 0xFF, bytes);
 		return bytes;
 	}
 	memset(pvsbuffer, 0, bytes);
-	Mod_Q1BSP_FatPVS_RecursiveBSPNode(model, org, radius, pvsbuffer, bytes, model->brushq1.nodes);
+	Mod_Q1BSP_FatPVS_RecursiveBSPNode(model, org, radius, pvsbuffer, bytes, model->brush.data_nodes);
 	return bytes;
 }
 
@@ -2909,7 +2991,16 @@ static void Mod_Q1BSP_RoundUpToHullSize(model_t *cmodel, const vec3_t inmins, co
 	const hull_t *hull;
 
 	VectorSubtract(inmaxs, inmins, size);
-	if (cmodel->brush.ishlbsp)
+	if (cmodel->brush.ismcbsp)
+	{
+		if (size[0] < 3)
+			hull = &cmodel->brushq1.hulls[0]; // 0x0x0
+		else if (size[2] < 48) // pick the nearest of 40 or 56
+			hull = &cmodel->brushq1.hulls[2]; // 16x16x40
+		else
+			hull = &cmodel->brushq1.hulls[1]; // 16x16x56
+	}
+	else if (cmodel->brush.ishlbsp)
 	{
 		if (size[0] < 3)
 			hull = &cmodel->brushq1.hulls[0]; // 0x0x0
@@ -2936,77 +3027,102 @@ static void Mod_Q1BSP_RoundUpToHullSize(model_t *cmodel, const vec3_t inmins, co
 	VectorAdd(inmins, hull->clip_size, outmaxs);
 }
 
-/*
-void Mod_Q1BSP_RecursiveGetVisible(mnode_t *node, model_t *model, const vec3_t point, const vec3_t mins, const vec3_t maxs, int maxleafs, mleaf_t *leaflist, int *numleafs, int maxsurfaces, msurface_t *surfacelist, int *numsurfaces, const qbyte *pvs)
-{
-	mleaf_t *leaf;
-	for (;;)
-	{
-		if (!BoxesOverlap(node->mins, node->maxs, mins, maxs))
-			return;
-		if (!node->plane)
-			break;
-		Mod_Q1BSP_RecursiveGetVisible(node->children[0], model, point, mins, maxs, maxleafs, leaflist, numleafs, maxsurfaces, surfacelist, numsurfaces, pvs);
-		node = node->children[1];
-	}
-	leaf = (mleaf_t *)node;
-	if ((pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex)))
-	{
-		int marksurfacenum;
-		msurface_t *surf;
-		if (maxleafs && *numleafs < maxleafs)
-			leaflist[(*numleafs)++] = leaf;
-		if (maxsurfaces)
-		{
-			for (marksurfacenum = 0;marksurfacenum < leaf->nummarksurfaces;marksurfacenum++)
-			{
-				surf = model->brushq1.surfaces + leaf->firstmarksurface[marksurfacenum];
-				if (surf->shadowmark != shadowmarkcount)
-				{
-					surf->shadowmark = shadowmarkcount;
-					if (BoxesOverlap(mins, maxs, surf->poly_mins, surf->poly_maxs) && ((surf->flags & SURF_PLANEBACK) ? PlaneDiff(point, surf->plane) < 0 : PlaneDiff(point, surf->plane) > 0) && *numsurfaces < maxsurfaces)
-						surfacelist[(*numsurfaces)++] = surf;
-				}
-			}
-		}
-	}
-}
-
-void Mod_Q1BSP_GetVisible(model_t *model, const vec3_t point, const vec3_t mins, const vec3_t maxs, int maxleafs, mleaf_t *leaflist, int *numleafs, int maxsurfaces, msurface_t *surfacelist, int *numsurfaces)
-{
-	// FIXME: support portals
-	if (maxsurfaces)
-		*numsurfaces = 0;
-	if (maxleafs)
-		*numleafs = 0;
-	pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
-	Mod_Q1BSP_RecursiveGetVisible(ent->model->brushq1.nodes + ent->model->brushq1.firstclipnode, model, point, mins, maxs, maxleafs, leaflist, numleafs, maxsurfaces, surfacelist, numsurfaces);
-}
-*/
-
-extern void R_Q1BSP_DrawSky(entity_render_t *ent);
-extern void R_Q1BSP_Draw(entity_render_t *ent);
-extern void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer);
-extern void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
-extern void R_Q1BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist);
-void Mod_Q1BSP_Load(model_t *mod, void *buffer)
+void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend)
 {
 	int i, j, k;
 	dheader_t *header;
 	dmodel_t *bm;
 	mempool_t *mainmempool;
 	float dist, modelyawradius, modelradius, *vec;
-	msurface_t *surf;
+	msurface_t *surface;
 	int numshadowmeshtriangles;
+	dheader_t _header;
+	hullinfo_t hullinfo;
 
 	mod->type = mod_brushq1;
 
-	header = (dheader_t *)buffer;
+	if (!memcmp (buffer, "MCBSPpad", 8))
+	{
+		unsigned char	*index;
+
+		mod->brush.ismcbsp = true;
+		mod->brush.ishlbsp = false;
 
-	i = LittleLong(header->version);
-	if (i != BSPVERSION && i != 30)
-		Host_Error("Mod_Q1BSP_Load: %s has wrong version number(%i should be %i(Quake) or 30(HalfLife))", mod->name, i, BSPVERSION);
-	mod->brush.ishlbsp = i == 30;
+		mod_base = (unsigned char*)buffer;
+
+		index = mod_base;
+		index += 8;
+		i = SB_ReadInt (&index);
+		if (i != MCBSPVERSION)
+			Host_Error("Mod_Q1BSP_Load: %s has wrong version number(%i should be %i)", mod->name, i, MCBSPVERSION);
+
+	// read hull info
+		hullinfo.numhulls = LittleLong(*(int*)index); index += 4;
+		hullinfo.filehulls = hullinfo.numhulls;
+		VectorClear (hullinfo.hullsizes[0][0]);
+		VectorClear (hullinfo.hullsizes[0][1]);
+		for (i = 1; i < hullinfo.numhulls; i++)
+		{
+			hullinfo.hullsizes[i][0][0] = SB_ReadFloat (&index);
+			hullinfo.hullsizes[i][0][1] = SB_ReadFloat (&index);
+			hullinfo.hullsizes[i][0][2] = SB_ReadFloat (&index);
+			hullinfo.hullsizes[i][1][0] = SB_ReadFloat (&index);
+			hullinfo.hullsizes[i][1][1] = SB_ReadFloat (&index);
+			hullinfo.hullsizes[i][1][2] = SB_ReadFloat (&index);
+		}
+
+	// read lumps
+		_header.version = 0;
+		for (i = 0; i < HEADER_LUMPS; i++)
+		{
+			_header.lumps[i].fileofs = SB_ReadInt (&index);
+			_header.lumps[i].filelen = SB_ReadInt (&index);
+		}
+
+		header = &_header;
+	}
+	else
+	{
+		header = (dheader_t *)buffer;
+
+		i = LittleLong(header->version);
+		if (i != BSPVERSION && i != 30)
+			Host_Error("Mod_Q1BSP_Load: %s has wrong version number(%i should be %i(Quake) or 30(HalfLife)", mod->name, i, BSPVERSION);
+		mod->brush.ishlbsp = i == 30;
+		mod->brush.ismcbsp = false;
+
+	// fill in hull info
+		VectorClear (hullinfo.hullsizes[0][0]);
+		VectorClear (hullinfo.hullsizes[0][1]);
+		if (mod->brush.ishlbsp)
+		{
+			hullinfo.numhulls = 4;
+			hullinfo.filehulls = 4;
+			VectorSet (hullinfo.hullsizes[1][0], -16, -16, -36);
+			VectorSet (hullinfo.hullsizes[1][1], 16, 16, 36);
+			VectorSet (hullinfo.hullsizes[2][0], -32, -32, -32);
+			VectorSet (hullinfo.hullsizes[2][1], 32, 32, 32);
+			VectorSet (hullinfo.hullsizes[3][0], -16, -16, -18);
+			VectorSet (hullinfo.hullsizes[3][1], 16, 16, 18);
+		}
+		else
+		{
+			hullinfo.numhulls = 3;
+			hullinfo.filehulls = 4;
+			VectorSet (hullinfo.hullsizes[1][0], -16, -16, -24);
+			VectorSet (hullinfo.hullsizes[1][1], 16, 16, 32);
+			VectorSet (hullinfo.hullsizes[2][0], -32, -32, -24);
+			VectorSet (hullinfo.hullsizes[2][1], 32, 32, 64);
+		}
+
+	// read lumps
+		mod_base = (unsigned char*)buffer;
+		for (i = 0; i < HEADER_LUMPS; i++)
+		{
+			header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs);
+			header->lumps[i].filelen = LittleLong(header->lumps[i].filelen);
+		}
+	}
 
 	mod->soundfromcenter = true;
 	mod->TraceBox = Mod_Q1BSP_TraceBox;
@@ -3015,23 +3131,19 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 	mod->brush.GetPVS = Mod_Q1BSP_GetPVS;
 	mod->brush.FatPVS = Mod_Q1BSP_FatPVS;
 	mod->brush.BoxTouchingPVS = Mod_Q1BSP_BoxTouchingPVS;
+	mod->brush.BoxTouchingLeafPVS = Mod_Q1BSP_BoxTouchingLeafPVS;
+	mod->brush.BoxTouchingVisibleLeafs = Mod_Q1BSP_BoxTouchingVisibleLeafs;
+	mod->brush.FindBoxClusters = Mod_Q1BSP_FindBoxClusters;
 	mod->brush.LightPoint = Mod_Q1BSP_LightPoint;
 	mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
 	mod->brush.AmbientSoundLevelsForPoint = Mod_Q1BSP_AmbientSoundLevelsForPoint;
 	mod->brush.RoundUpToHullSize = Mod_Q1BSP_RoundUpToHullSize;
-	mod->brushq1.PointInLeaf = Mod_Q1BSP_PointInLeaf;
+	mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf;
 
 	if (loadmodel->isworldmodel)
-		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
-
-// swap all the lumps
-	mod_base = (qbyte *)header;
-
-	header->version = LittleLong(header->version);
-	for (i = 0;i < HEADER_LUMPS;i++)
 	{
-		header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs);
-		header->lumps[i].filelen = LittleLong(header->lumps[i].filelen);
+		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
+		Cvar_SetValue("mcbsp", mod->brush.ismcbsp);
 	}
 
 // load into heap
@@ -3048,13 +3160,13 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 	Mod_Q1BSP_LoadPlanes(&header->lumps[LUMP_PLANES]);
 	Mod_Q1BSP_LoadTexinfo(&header->lumps[LUMP_TEXINFO]);
 	Mod_Q1BSP_LoadFaces(&header->lumps[LUMP_FACES]);
-	Mod_Q1BSP_LoadMarksurfaces(&header->lumps[LUMP_MARKSURFACES]);
+	Mod_Q1BSP_LoadLeaffaces(&header->lumps[LUMP_MARKSURFACES]);
 	Mod_Q1BSP_LoadVisibility(&header->lumps[LUMP_VISIBILITY]);
 	// load submodels before leafs because they contain the number of vis leafs
-	Mod_Q1BSP_LoadSubmodels(&header->lumps[LUMP_MODELS]);
+	Mod_Q1BSP_LoadSubmodels(&header->lumps[LUMP_MODELS], &hullinfo);
 	Mod_Q1BSP_LoadLeafs(&header->lumps[LUMP_LEAFS]);
 	Mod_Q1BSP_LoadNodes(&header->lumps[LUMP_NODES]);
-	Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES]);
+	Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES], &hullinfo);
 
 	if (!mod->brushq1.lightdata)
 		mod->brush.LightPoint = NULL;
@@ -3076,19 +3188,27 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 
 	// make a single combined shadow mesh to allow optimized shadow volume creation
 	numshadowmeshtriangles = 0;
-	for (j = 0, surf = loadmodel->brushq1.surfaces;j < loadmodel->brushq1.numsurfaces;j++, surf++)
+	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
 	{
-		surf->num_firstshadowmeshtriangle = numshadowmeshtriangles;
-		numshadowmeshtriangles += surf->mesh.num_triangles;
+		surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
+		numshadowmeshtriangles += surface->num_triangles;
 	}
 	loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
-	for (j = 0, surf = loadmodel->brushq1.surfaces;j < loadmodel->brushq1.numsurfaces;j++, surf++)
-		Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, surf->mesh.data_vertex3f, NULL, NULL, NULL, NULL, surf->mesh.num_triangles, surf->mesh.data_element3i);
+	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
+		Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, surface->groupmesh->data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle));
 	loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true);
 	Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles);
 
 	if (loadmodel->brush.numsubmodels)
-		loadmodel->brush.submodels = Mem_Alloc(loadmodel->mempool, loadmodel->brush.numsubmodels * sizeof(model_t *));
+		loadmodel->brush.submodels = (model_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brush.numsubmodels * sizeof(model_t *));
+
+	if (loadmodel->isworldmodel)
+	{
+		// clear out any stale submodels or worldmodels lying around
+		// if we did this clear before now, an error might abort loading and
+		// leave things in a bad state
+		Mod_RemoveStaleWorldModels(loadmodel);
+	}
 
 	// LordHavoc: to clear the fog around the original quake submodel code, I
 	// will explain:
@@ -3129,6 +3249,8 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 			mod->mempool = NULL;
 		}
 
+		mod->brush.submodel = i;
+
 		if (loadmodel->brush.submodels)
 			loadmodel->brush.submodels[i] = mod;
 
@@ -3145,7 +3267,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 		mod->nummodelsurfaces = bm->numfaces;
 
 		// make the model surface list (used by shadowing/lighting)
-		mod->surfacelist = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
+		mod->surfacelist = (int *)Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
 		for (j = 0;j < mod->nummodelsurfaces;j++)
 			mod->surfacelist[j] = mod->firstmodelsurface + j;
 
@@ -3153,6 +3275,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 		mod->DrawSky = NULL;
 		mod->Draw = R_Q1BSP_Draw;
 		mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+		mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
 		mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
 		mod->DrawLight = R_Q1BSP_DrawLight;
 		if (i != 0)
@@ -3160,6 +3283,9 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 			mod->brush.GetPVS = NULL;
 			mod->brush.FatPVS = NULL;
 			mod->brush.BoxTouchingPVS = NULL;
+			mod->brush.BoxTouchingLeafPVS = NULL;
+			mod->brush.BoxTouchingVisibleLeafs = NULL;
+			mod->brush.FindBoxClusters = NULL;
 			mod->brush.LightPoint = NULL;
 			mod->brush.AmbientSoundLevelsForPoint = NULL;
 		}
@@ -3171,16 +3297,13 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 			mod->normalmaxs[0] = mod->normalmaxs[1] = mod->normalmaxs[2] = -1000000000.0f;
 			modelyawradius = 0;
 			modelradius = 0;
-			for (j = 0, surf = &mod->brushq1.surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
+			for (j = 0, surface = &mod->data_surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surface++)
 			{
 				// we only need to have a drawsky function if it is used(usually only on world model)
-				if (surf->texinfo->texture->flags & SURF_DRAWSKY)
+				if (surface->texture->basematerialflags & MATERIALFLAG_SKY)
 					mod->DrawSky = R_Q1BSP_DrawSky;
-				// LordHavoc: submodels always clip, even if water
-				if (mod->brush.numsubmodels - 1)
-					surf->flags |= SURF_SOLIDCLIP;
 				// calculate bounding shapes
-				for (k = 0, vec = surf->mesh.data_vertex3f;k < surf->mesh.num_vertices;k++, vec += 3)
+				for (k = 0, vec = (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex);k < surface->num_vertices;k++, vec += 3)
 				{
 					if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0];
 					if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1];
@@ -3211,9 +3334,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 			// LordHavoc: empty submodel(lacrima.bsp has such a glitch)
 			Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadmodel->name);
 		}
-		Mod_Q1BSP_BuildSurfaceNeighbors(mod->brushq1.surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, loadmodel->mempool);
-
-		mod->brushq1.num_visleafs = bm->visleafs;
+		//mod->brushq1.num_visleafs = bm->visleafs;
 	}
 
 	Mod_Q1BSP_LoadMapBrushes();
@@ -3221,7 +3342,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 	//Mod_Q1BSP_ProcessLightList();
 
 	if (developer.integer)
-		Con_Printf("Some stats for q1bsp model \"%s\": %i faces, %i nodes, %i leafs, %i visleafs, %i visleafportals\n", loadmodel->name, loadmodel->brushq1.numsurfaces, loadmodel->brushq1.numnodes, loadmodel->brushq1.num_leafs, loadmodel->brushq1.num_visleafs, loadmodel->brushq1.numportals);
+		Con_Printf("Some stats for q1bsp model \"%s\": %i faces, %i nodes, %i leafs, %i visleafs, %i visleafportals\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals);
 }
 
 static void Mod_Q2BSP_LoadEntities(lump_t *l)
@@ -3602,7 +3723,7 @@ static void Mod_Q2BSP_LoadModels(lump_t *l)
 */
 }
 
-void static Mod_Q2BSP_Load(model_t *mod, void *buffer)
+void static Mod_Q2BSP_Load(model_t *mod, void *buffer, void *bufferend)
 {
 	int i;
 	q2dheader_t *header;
@@ -3617,10 +3738,14 @@ void static Mod_Q2BSP_Load(model_t *mod, void *buffer)
 	if (i != Q2BSPVERSION)
 		Host_Error("Mod_Q2BSP_Load: %s has wrong version number (%i, should be %i)", mod->name, i, Q2BSPVERSION);
 	mod->brush.ishlbsp = false;
+	mod->brush.ismcbsp = false;
 	if (loadmodel->isworldmodel)
+	{
 		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
+		Cvar_SetValue("mcbsp", mod->brush.ismcbsp);
+	}
 
-	mod_base = (qbyte *)header;
+	mod_base = (unsigned char *)header;
 
 	// swap all the lumps
 	for (i = 0;i < (int) sizeof(*header) / 4;i++)
@@ -3663,7 +3788,7 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l)
 	loadmodel->brushq3.num_lightgrid_cellsize[2] = 128;
 	if (!l->filelen)
 		return;
-	loadmodel->brush.entities = Mem_Alloc(loadmodel->mempool, l->filelen);
+	loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen);
 	memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen);
 	data = loadmodel->brush.entities;
 	// some Q3 maps override the lightgrid_cellsize with a worldspawn key
@@ -3696,7 +3821,7 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l)
 static void Mod_Q3BSP_LoadTextures(lump_t *l)
 {
 	q3dtexture_t *in;
-	q3mtexture_t *out;
+	texture_t *out;
 	int i, count;
 	int j, c;
 	fssearch_t *search;
@@ -3708,22 +3833,20 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 	char firstpasstexturename[Q3PATHLENGTH];
 	char parameter[4][Q3PATHLENGTH];
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dtexture_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadTextures: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (texture_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_textures = out;
-	loadmodel->brushq3.num_textures = count;
+	loadmodel->data_textures = out;
+	loadmodel->num_textures = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
-		out->number = i;
 		strlcpy (out->name, in->name, sizeof (out->name));
 		out->surfaceflags = LittleLong(in->surfaceflags);
-		out->nativecontents = LittleLong(in->contents);
-		out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, out->nativecontents);
+		out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in->contents));
 		out->surfaceparms = -1;
 	}
 
@@ -3732,7 +3855,7 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 	{
 		for (i = 0;i < search->numfilenames;i++)
 		{
-			if ((f = FS_LoadFile(search->filenames[i], tempmempool, false)))
+			if ((f = (char *)FS_LoadFile(search->filenames[i], tempmempool, false)))
 			{
 				text = f;
 				while (COM_ParseToken(&text, false))
@@ -3777,7 +3900,7 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 									}
 									if (passnumber == 0 && numparameters >= 1)
 									{
-										if (!strcasecmp(parameter[0], "blendfunc"))
+										if (!strcasecmp(parameter[0], "blendfunc") && (flags & Q3SURFACEPARM_TRANS))
 										{
 											if (numparameters == 2 && !strcasecmp(parameter[1], "add"))
 												flags2 |= Q3TEXTUREFLAG_ADDITIVE;
@@ -3790,9 +3913,9 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 											strlcpy(firstpasstexturename, parameter[1], sizeof(firstpasstexturename));
 										else if (numparameters >= 3 && !strcasecmp(parameter[0], "animmap"))
 											strlcpy(firstpasstexturename, parameter[2], sizeof(firstpasstexturename));
+										else if (numparameters >= 2 && !strcasecmp(parameter[0], "alphafunc"))
+											flags2 |= Q3TEXTUREFLAG_ALPHATEST;
 									}
-									if (!strcasecmp(parameter[0], "alphafunc"))
-										flags2 |= Q3TEXTUREFLAG_ALPHATEST;
 									// break out a level if it was }
 									if (!strcasecmp(com_token, "}"))
 										break;
@@ -3905,19 +4028,39 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 									flags2 |= Q3TEXTUREFLAG_AUTOSPRITE2;
 							}
 						}
-						// force transparent render path for a number of odd
-						// shader effects to avoid bogging down the normal
-						// render path unnecessarily
-						if (flags2 & (Q3TEXTUREFLAG_ADDITIVE | Q3TEXTUREFLAG_AUTOSPRITE | Q3TEXTUREFLAG_AUTOSPRITE2 | Q3TEXTUREFLAG_ALPHATEST))
-							flags |= Q3SURFACEPARM_TRANS;
 						// add shader to list (shadername and flags)
 						// actually here we just poke into the texture settings
-						for (j = 0, out = loadmodel->brushq3.data_textures;j < loadmodel->brushq3.num_textures;j++, out++)
+						for (j = 0, out = loadmodel->data_textures;j < loadmodel->num_textures;j++, out++)
 						{
 							if (!strcasecmp(out->name, shadername))
 							{
 								out->surfaceparms = flags;
 								out->textureflags = flags2;
+								out->basematerialflags = 0;
+								if (out->surfaceparms & Q3SURFACEPARM_NODRAW)
+									out->basematerialflags |= MATERIALFLAG_NODRAW;
+								else if (out->surfaceparms & Q3SURFACEPARM_SKY)
+									out->basematerialflags |= MATERIALFLAG_SKY;
+								else if (out->surfaceparms & Q3SURFACEPARM_LAVA)
+									out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_FULLBRIGHT;
+								else if (out->surfaceparms & Q3SURFACEPARM_SLIME)
+									out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_WATERALPHA;
+								else if (out->surfaceparms & Q3SURFACEPARM_WATER)
+									out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_WATERALPHA;
+								else
+									out->basematerialflags |= MATERIALFLAG_WALL;
+								if (out->textureflags & Q3TEXTUREFLAG_ALPHATEST)
+								{
+									// FIXME: support alpha test?
+									out->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
+								}
+								else if (out->surfaceparms & Q3SURFACEPARM_TRANS)
+								{
+									if (out->textureflags & Q3TEXTUREFLAG_ADDITIVE)
+										out->basematerialflags |= MATERIALFLAG_ADD | MATERIALFLAG_TRANSPARENT;
+									else
+										out->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
+								}
 								strlcpy(out->firstpasstexturename, firstpasstexturename, sizeof(out->firstpasstexturename));
 								if ((flags & Q3SURFACEPARM_SKY) && sky[0])
 								{
@@ -3940,13 +4083,19 @@ parseerror:
 	}
 
 	c = 0;
-	for (j = 0, out = loadmodel->brushq3.data_textures;j < loadmodel->brushq3.num_textures;j++, out++)
+	for (j = 0, out = loadmodel->data_textures;j < loadmodel->num_textures;j++, out++)
 	{
 		if (out->surfaceparms == -1)
 		{
 			c++;
 			Con_DPrintf("%s: No shader found for texture \"%s\"\n", loadmodel->name, out->name);
 			out->surfaceparms = 0;
+			if (out->surfaceflags & Q3SURFACEFLAG_NODRAW)
+				out->basematerialflags |= MATERIALFLAG_NODRAW;
+			else if (out->surfaceflags & Q3SURFACEFLAG_SKY)
+				out->basematerialflags |= MATERIALFLAG_SKY;
+			else
+				out->basematerialflags |= MATERIALFLAG_WALL;
 			// these are defaults
 			//if (!strncmp(out->name, "textures/skies/", 15))
 			//	out->surfaceparms |= Q3SURFACEPARM_SKY;
@@ -3956,9 +4105,12 @@ parseerror:
 			//if (R_TextureHasAlpha(out->skin.base))
 			//	out->surfaceparms |= Q3SURFACEPARM_TRANS;
 		}
-		if (!Mod_LoadSkinFrame(&out->skin, out->name, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, true, true))
-			if (!Mod_LoadSkinFrame(&out->skin, out->firstpasstexturename, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, true, true))
-				Con_Printf("%s: texture loading for shader \"%s\" failed (first layer \"%s\" not found either)\n", loadmodel->name, out->name, out->firstpasstexturename);
+		if (!Mod_LoadSkinFrame(&out->skin, out->name, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, true))
+			if (!Mod_LoadSkinFrame(&out->skin, out->firstpasstexturename, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, true))
+				if (cls.state != ca_dedicated)
+					Con_Printf("%s: texture loading for shader \"%s\" failed (first layer \"%s\" not found either)\n", loadmodel->name, out->name, out->firstpasstexturename);
+		// no animation
+		out->currentframe = out;
 	}
 	if (c)
 		Con_DPrintf("%s: %i textures missing shaders\n", loadmodel->name, c);
@@ -3970,21 +4122,21 @@ static void Mod_Q3BSP_LoadPlanes(lump_t *l)
 	mplane_t *out;
 	int i, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dplane_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadPlanes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (mplane_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_planes = out;
-	loadmodel->brushq3.num_planes = count;
+	loadmodel->brush.data_planes = out;
+	loadmodel->brush.num_planes = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
-		out->normal[0] = LittleLong(in->normal[0]);
-		out->normal[1] = LittleLong(in->normal[1]);
-		out->normal[2] = LittleLong(in->normal[2]);
-		out->dist = LittleLong(in->dist);
+		out->normal[0] = LittleFloat(in->normal[0]);
+		out->normal[1] = LittleFloat(in->normal[1]);
+		out->normal[2] = LittleFloat(in->normal[2]);
+		out->dist = LittleFloat(in->dist);
 		PlaneClassify(out);
 	}
 }
@@ -3995,25 +4147,25 @@ static void Mod_Q3BSP_LoadBrushSides(lump_t *l)
 	q3mbrushside_t *out;
 	int i, n, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dbrushside_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadBrushSides: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (q3mbrushside_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_brushsides = out;
-	loadmodel->brushq3.num_brushsides = count;
+	loadmodel->brush.data_brushsides = out;
+	loadmodel->brush.num_brushsides = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
 		n = LittleLong(in->planeindex);
-		if (n < 0 || n >= loadmodel->brushq3.num_planes)
-			Host_Error("Mod_Q3BSP_LoadBrushSides: invalid planeindex %i (%i planes)\n", n, loadmodel->brushq3.num_planes);
-		out->plane = loadmodel->brushq3.data_planes + n;
+		if (n < 0 || n >= loadmodel->brush.num_planes)
+			Host_Error("Mod_Q3BSP_LoadBrushSides: invalid planeindex %i (%i planes)\n", n, loadmodel->brush.num_planes);
+		out->plane = loadmodel->brush.data_planes + n;
 		n = LittleLong(in->textureindex);
-		if (n < 0 || n >= loadmodel->brushq3.num_textures)
-			Host_Error("Mod_Q3BSP_LoadBrushSides: invalid textureindex %i (%i textures)\n", n, loadmodel->brushq3.num_textures);
-		out->texture = loadmodel->brushq3.data_textures + n;
+		if (n < 0 || n >= loadmodel->num_textures)
+			Host_Error("Mod_Q3BSP_LoadBrushSides: invalid textureindex %i (%i textures)\n", n, loadmodel->num_textures);
+		out->texture = loadmodel->data_textures + n;
 	}
 }
 
@@ -4024,14 +4176,14 @@ static void Mod_Q3BSP_LoadBrushes(lump_t *l)
 	int i, j, n, c, count, maxplanes;
 	mplane_t *planes;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dbrush_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadBrushes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (q3mbrush_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_brushes = out;
-	loadmodel->brushq3.num_brushes = count;
+	loadmodel->brush.data_brushes = out;
+	loadmodel->brush.num_brushes = count;
 
 	maxplanes = 0;
 	planes = NULL;
@@ -4040,14 +4192,14 @@ static void Mod_Q3BSP_LoadBrushes(lump_t *l)
 	{
 		n = LittleLong(in->firstbrushside);
 		c = LittleLong(in->numbrushsides);
-		if (n < 0 || n + c > loadmodel->brushq3.num_brushsides)
-			Host_Error("Mod_Q3BSP_LoadBrushes: invalid brushside range %i : %i (%i brushsides)\n", n, n + c, loadmodel->brushq3.num_brushsides);
-		out->firstbrushside = loadmodel->brushq3.data_brushsides + n;
+		if (n < 0 || n + c > loadmodel->brush.num_brushsides)
+			Host_Error("Mod_Q3BSP_LoadBrushes: invalid brushside range %i : %i (%i brushsides)\n", n, n + c, loadmodel->brush.num_brushsides);
+		out->firstbrushside = loadmodel->brush.data_brushsides + n;
 		out->numbrushsides = c;
 		n = LittleLong(in->textureindex);
-		if (n < 0 || n >= loadmodel->brushq3.num_textures)
-			Host_Error("Mod_Q3BSP_LoadBrushes: invalid textureindex %i (%i textures)\n", n, loadmodel->brushq3.num_textures);
-		out->texture = loadmodel->brushq3.data_textures + n;
+		if (n < 0 || n >= loadmodel->num_textures)
+			Host_Error("Mod_Q3BSP_LoadBrushes: invalid textureindex %i (%i textures)\n", n, loadmodel->num_textures);
+		out->texture = loadmodel->data_textures + n;
 
 		// make a list of mplane_t structs to construct a colbrush from
 		if (maxplanes < out->numbrushsides)
@@ -4055,7 +4207,7 @@ static void Mod_Q3BSP_LoadBrushes(lump_t *l)
 			maxplanes = out->numbrushsides;
 			if (planes)
 				Mem_Free(planes);
-			planes = Mem_Alloc(tempmempool, sizeof(mplane_t) * maxplanes);
+			planes = (mplane_t *)Mem_Alloc(tempmempool, sizeof(mplane_t) * maxplanes);
 		}
 		for (j = 0;j < out->numbrushsides;j++)
 		{
@@ -4072,14 +4224,14 @@ static void Mod_Q3BSP_LoadBrushes(lump_t *l)
 static void Mod_Q3BSP_LoadEffects(lump_t *l)
 {
 	q3deffect_t *in;
-	q3meffect_t *out;
+	q3deffect_t *out;
 	int i, n, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3deffect_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadEffects: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (q3deffect_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
 	loadmodel->brushq3.data_effects = out;
 	loadmodel->brushq3.num_effects = count;
@@ -4088,9 +4240,12 @@ static void Mod_Q3BSP_LoadEffects(lump_t *l)
 	{
 		strlcpy (out->shadername, in->shadername, sizeof (out->shadername));
 		n = LittleLong(in->brushindex);
-		if (n < 0 || n >= loadmodel->brushq3.num_brushes)
-			Host_Error("Mod_Q3BSP_LoadEffects: invalid brushindex %i (%i brushes)\n", n, loadmodel->brushq3.num_brushes);
-		out->brush = loadmodel->brushq3.data_brushes + n;
+		if (n >= loadmodel->brush.num_brushes)
+		{
+			Con_Printf("Mod_Q3BSP_LoadEffects: invalid brushindex %i (%i brushes), setting to -1\n", n, loadmodel->brush.num_brushes);
+			n = -1;
+		}
+		out->brushindex = n;
 		out->unknown = LittleLong(in->unknown);
 	}
 }
@@ -4100,17 +4255,14 @@ static void Mod_Q3BSP_LoadVertices(lump_t *l)
 	q3dvertex_t *in;
 	int i, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dvertex_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadVertices: funny lump size in %s",loadmodel->name);
 	loadmodel->brushq3.num_vertices = count = l->filelen / sizeof(*in);
-	loadmodel->brushq3.data_vertex3f = Mem_Alloc(loadmodel->mempool, count * (sizeof(float) * (3 + 2 + 2 + 3 + 3 + 3 + 4)));
+	loadmodel->brushq3.data_vertex3f = (float *)Mem_Alloc(loadmodel->mempool, count * (sizeof(float) * (3 + 2 + 2 + 4)));
 	loadmodel->brushq3.data_texcoordtexture2f = loadmodel->brushq3.data_vertex3f + count * 3;
 	loadmodel->brushq3.data_texcoordlightmap2f = loadmodel->brushq3.data_texcoordtexture2f + count * 2;
-	loadmodel->brushq3.data_svector3f = loadmodel->brushq3.data_texcoordlightmap2f + count * 2;
-	loadmodel->brushq3.data_tvector3f = loadmodel->brushq3.data_svector3f + count * 3;
-	loadmodel->brushq3.data_normal3f = loadmodel->brushq3.data_tvector3f + count * 3;
-	loadmodel->brushq3.data_color4f = loadmodel->brushq3.data_normal3f + count * 3;
+	loadmodel->brushq3.data_color4f = loadmodel->brushq3.data_texcoordlightmap2f + count * 2;
 
 	for (i = 0;i < count;i++, in++)
 	{
@@ -4122,15 +4274,6 @@ static void Mod_Q3BSP_LoadVertices(lump_t *l)
 		loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 0] = LittleFloat(in->lightmap2f[0]);
 		loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 1] = LittleFloat(in->lightmap2f[1]);
 		// svector/tvector are calculated later in face loading
-		loadmodel->brushq3.data_svector3f[i * 3 + 0] = 0;
-		loadmodel->brushq3.data_svector3f[i * 3 + 1] = 0;
-		loadmodel->brushq3.data_svector3f[i * 3 + 2] = 0;
-		loadmodel->brushq3.data_tvector3f[i * 3 + 0] = 0;
-		loadmodel->brushq3.data_tvector3f[i * 3 + 1] = 0;
-		loadmodel->brushq3.data_tvector3f[i * 3 + 2] = 0;
-		loadmodel->brushq3.data_normal3f[i * 3 + 0] = LittleFloat(in->normal3f[0]);
-		loadmodel->brushq3.data_normal3f[i * 3 + 1] = LittleFloat(in->normal3f[1]);
-		loadmodel->brushq3.data_normal3f[i * 3 + 2] = LittleFloat(in->normal3f[2]);
 		loadmodel->brushq3.data_color4f[i * 4 + 0] = in->color4ub[0] * (1.0f / 255.0f);
 		loadmodel->brushq3.data_color4f[i * 4 + 1] = in->color4ub[1] * (1.0f / 255.0f);
 		loadmodel->brushq3.data_color4f[i * 4 + 2] = in->color4ub[2] * (1.0f / 255.0f);
@@ -4144,15 +4287,14 @@ static void Mod_Q3BSP_LoadTriangles(lump_t *l)
 	int *out;
 	int i, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (int *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(int[3]))
 		Host_Error("Mod_Q3BSP_LoadTriangles: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out) * 2);
+	out = (int *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
 	loadmodel->brushq3.num_triangles = count / 3;
 	loadmodel->brushq3.data_element3i = out;
-	loadmodel->brushq3.data_neighbor3i = out + count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
@@ -4173,11 +4315,11 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l)
 
 	if (!l->filelen)
 		return;
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dlightmap_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadLightmaps: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (rtexture_t **)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
 	loadmodel->brushq3.data_lightmaps = out;
 	loadmodel->brushq3.num_lightmaps = count;
@@ -4189,7 +4331,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l)
 static void Mod_Q3BSP_LoadFaces(lump_t *l)
 {
 	q3dface_t *in, *oldin;
-	q3msurface_t *out, *oldout;
+	msurface_t *out, *oldout;
 	int i, oldi, j, n, count, invalidelements, patchsize[2], finalwidth, finalheight, xtess, ytess, finalvertices, finaltriangles, firstvertex, firstelement, type, oldnumtriangles, oldnumtriangles2, meshnum, meshvertices, meshtriangles, numvertices, numtriangles;
 	//int *originalelement3i;
 	//int *originalneighbor3i;
@@ -4203,14 +4345,14 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 	float *v;
 	surfmesh_t *mesh, *tempmeshlist[1024];
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dface_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadFaces: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (msurface_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_faces = out;
-	loadmodel->brushq3.num_faces = count;
+	loadmodel->data_surfaces = out;
+	loadmodel->num_surfaces = count;
 
 	i = 0;
 	for (meshnum = 0;i < count;meshnum++)
@@ -4234,12 +4376,12 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 			}
 
 			n = LittleLong(in->textureindex);
-			if (n < 0 || n >= loadmodel->brushq3.num_textures)
+			if (n < 0 || n >= loadmodel->num_textures)
 			{
-				Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i: invalid textureindex %i (%i textures)\n", i, n, loadmodel->brushq3.num_textures);
+				Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i: invalid textureindex %i (%i textures)\n", i, n, loadmodel->num_textures);
 				continue;
 			}
-			out->texture = loadmodel->brushq3.data_textures + n;
+			out->texture = loadmodel->data_textures + n;
 			n = LittleLong(in->effectindex);
 			if (n < -1 || n >= loadmodel->brushq3.num_effects)
 			{
@@ -4326,58 +4468,52 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 				// don't render it
 				continue;
 			}
-			out->mesh.num_vertices = numvertices;
-			out->mesh.num_triangles = numtriangles;
-			if (meshvertices + out->mesh.num_vertices > 65536)
+			out->num_vertices = numvertices;
+			out->num_triangles = numtriangles;
+			if (meshvertices + out->num_vertices > 65536)
 				break;
-			meshvertices += out->mesh.num_vertices;
-			meshtriangles += out->mesh.num_triangles;
+			meshvertices += out->num_vertices;
+			meshtriangles += out->num_triangles;
 		}
 
 		i = oldi;
 		in = oldin;
 		out = oldout;
-		mesh = tempmeshlist[meshnum] = Mod_AllocSurfMesh(loadmodel->mempool, meshvertices, meshtriangles, 0, 0, false, false, true);
+		mesh = tempmeshlist[meshnum] = Mod_AllocSurfMesh(loadmodel->mempool, meshvertices, meshtriangles, false, true, false);
 		meshvertices = 0;
 		meshtriangles = 0;
-		for (;i < count && meshvertices + out->mesh.num_vertices <= mesh->num_vertices;i++, in++, out++)
+		for (;i < count && meshvertices + out->num_vertices <= mesh->num_vertices;i++, in++, out++)
 		{
-			if (out->mesh.num_vertices < 3 || out->mesh.num_triangles < 1)
+			if (out->num_vertices < 3 || out->num_triangles < 1)
 				continue;
 
 			type = LittleLong(in->type);
 			firstvertex = LittleLong(in->firstvertex);
 			firstelement = LittleLong(in->firstelement);
-			out->mesh.data_vertex3f = mesh->data_vertex3f + meshvertices * 3;
-			out->mesh.data_svector3f = mesh->data_svector3f + meshvertices * 3;
-			out->mesh.data_tvector3f = mesh->data_tvector3f + meshvertices * 3;
-			out->mesh.data_normal3f = mesh->data_normal3f + meshvertices * 3;
-			out->mesh.data_texcoordtexture2f = mesh->data_texcoordtexture2f + meshvertices * 2;
-			out->mesh.data_texcoordlightmap2f = mesh->data_texcoordlightmap2f + meshvertices * 2;
-			out->mesh.data_lightmapcolor4f = mesh->data_lightmapcolor4f + meshvertices * 4;
-			out->mesh.data_element3i = mesh->data_element3i + meshtriangles * 3;
-			out->mesh.data_neighbor3i = mesh->data_neighbor3i + meshtriangles * 3;
+			out->groupmesh = mesh;
+			out->num_firstvertex = meshvertices;
+			out->num_firsttriangle = meshtriangles;
 			switch(type)
 			{
 			case Q3FACETYPE_POLYGON:
 			case Q3FACETYPE_MESH:
 				// no processing necessary
-				for (j = 0;j < out->mesh.num_vertices;j++)
+				for (j = 0;j < out->num_vertices;j++)
 				{
-					out->mesh.data_vertex3f[j * 3 + 0] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 0];
-					out->mesh.data_vertex3f[j * 3 + 1] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 1];
-					out->mesh.data_vertex3f[j * 3 + 2] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 2];
-					out->mesh.data_texcoordtexture2f[j * 2 + 0] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 0];
-					out->mesh.data_texcoordtexture2f[j * 2 + 1] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 1];
-					out->mesh.data_texcoordlightmap2f[j * 2 + 0] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 0];
-					out->mesh.data_texcoordlightmap2f[j * 2 + 1] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 1];
-					out->mesh.data_lightmapcolor4f[j * 4 + 0] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 0];
-					out->mesh.data_lightmapcolor4f[j * 4 + 1] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 1];
-					out->mesh.data_lightmapcolor4f[j * 4 + 2] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 2];
-					out->mesh.data_lightmapcolor4f[j * 4 + 3] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 3];
+					(out->groupmesh->data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 0] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 0];
+					(out->groupmesh->data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 1] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 1];
+					(out->groupmesh->data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 2] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 2];
+					(out->groupmesh->data_texcoordtexture2f + 2 * out->num_firstvertex)[j * 2 + 0] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 0];
+					(out->groupmesh->data_texcoordtexture2f + 2 * out->num_firstvertex)[j * 2 + 1] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 1];
+					(out->groupmesh->data_texcoordlightmap2f + 2 * out->num_firstvertex)[j * 2 + 0] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 0];
+					(out->groupmesh->data_texcoordlightmap2f + 2 * out->num_firstvertex)[j * 2 + 1] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 1];
+					(out->groupmesh->data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 0] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 0];
+					(out->groupmesh->data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 1] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 1];
+					(out->groupmesh->data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 2] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 2];
+					(out->groupmesh->data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 3] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 3];
 				}
-				for (j = 0;j < out->mesh.num_triangles*3;j++)
-					out->mesh.data_element3i[j] = loadmodel->brushq3.data_element3i[firstelement + j];
+				for (j = 0;j < out->num_triangles*3;j++)
+					(out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] = loadmodel->brushq3.data_element3i[firstelement + j] + out->num_firstvertex;
 				break;
 			case Q3FACETYPE_PATCH:
 				patchsize[0] = LittleLong(in->specific.patch.patchsize[0]);
@@ -4410,18 +4546,18 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 				type = Q3FACETYPE_MESH;
 				// generate geometry
 				// (note: normals are skipped because they get recalculated)
-				Q3PatchTesselateFloat(3, sizeof(float[3]), out->mesh.data_vertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess);
-				Q3PatchTesselateFloat(2, sizeof(float[2]), out->mesh.data_texcoordtexture2f, patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordtexture2f, xtess, ytess);
-				Q3PatchTesselateFloat(2, sizeof(float[2]), out->mesh.data_texcoordlightmap2f, patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordlightmap2f, xtess, ytess);
-				Q3PatchTesselateFloat(4, sizeof(float[4]), out->mesh.data_lightmapcolor4f, patchsize[0], patchsize[1], sizeof(float[4]), originalcolor4f, xtess, ytess);
-				Q3PatchTriangleElements(out->mesh.data_element3i, finalwidth, finalheight);
-				out->mesh.num_triangles = Mod_RemoveDegenerateTriangles(out->mesh.num_triangles, out->mesh.data_element3i, out->mesh.data_element3i, out->mesh.data_vertex3f);
+				Q3PatchTesselateFloat(3, sizeof(float[3]), (out->groupmesh->data_vertex3f + 3 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess);
+				Q3PatchTesselateFloat(2, sizeof(float[2]), (out->groupmesh->data_texcoordtexture2f + 2 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordtexture2f, xtess, ytess);
+				Q3PatchTesselateFloat(2, sizeof(float[2]), (out->groupmesh->data_texcoordlightmap2f + 2 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordlightmap2f, xtess, ytess);
+				Q3PatchTesselateFloat(4, sizeof(float[4]), (out->groupmesh->data_lightmapcolor4f + 4 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[4]), originalcolor4f, xtess, ytess);
+				Q3PatchTriangleElements((out->groupmesh->data_element3i + 3 * out->num_firsttriangle), finalwidth, finalheight, out->num_firstvertex);
+				out->num_triangles = Mod_RemoveDegenerateTriangles(out->num_triangles, (out->groupmesh->data_element3i + 3 * out->num_firsttriangle), (out->groupmesh->data_element3i + 3 * out->num_firsttriangle), out->groupmesh->data_vertex3f);
 				if (developer.integer >= 2)
 				{
-					if (out->mesh.num_triangles < finaltriangles)
-						Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve subdivided to %i vertices / %i triangles, %i degenerate triangles removed (leaving %i)\n", patchsize[0], patchsize[1], out->mesh.num_vertices, finaltriangles, finaltriangles - out->mesh.num_triangles, out->mesh.num_triangles);
+					if (out->num_triangles < finaltriangles)
+						Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve subdivided to %i vertices / %i triangles, %i degenerate triangles removed (leaving %i)\n", patchsize[0], patchsize[1], out->num_vertices, finaltriangles, finaltriangles - out->num_triangles, out->num_triangles);
 					else
-						Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve subdivided to %i vertices / %i triangles\n", patchsize[0], patchsize[1], out->mesh.num_vertices, out->mesh.num_triangles);
+						Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve subdivided to %i vertices / %i triangles\n", patchsize[0], patchsize[1], out->num_vertices, out->num_triangles);
 				}
 				// q3map does not put in collision brushes for curves... ugh
 				// build the lower quality collision geometry
@@ -4446,53 +4582,51 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 				finalvertices = finalwidth * finalheight;
 				finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2;
 
-				out->mesh.data_collisionvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * finalvertices);
-				out->mesh.data_collisionelement3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * finaltriangles);
-				out->mesh.num_collisionvertices = finalvertices;
-				out->mesh.num_collisiontriangles = finaltriangles;
-				Q3PatchTesselateFloat(3, sizeof(float[3]), out->mesh.data_collisionvertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess);
-				Q3PatchTriangleElements(out->mesh.data_collisionelement3i, finalwidth, finalheight);
+				out->data_collisionvertex3f = (float *)Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * finalvertices);
+				out->data_collisionelement3i = (int *)Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * finaltriangles);
+				out->num_collisionvertices = finalvertices;
+				out->num_collisiontriangles = finaltriangles;
+				Q3PatchTesselateFloat(3, sizeof(float[3]), out->data_collisionvertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess);
+				Q3PatchTriangleElements(out->data_collisionelement3i, finalwidth, finalheight, 0);
 
-				//Mod_SnapVertices(3, out->mesh.num_vertices, out->mesh.data_vertex3f, 0.25);
-				Mod_SnapVertices(3, out->mesh.num_collisionvertices, out->mesh.data_collisionvertex3f, 1);
+				//Mod_SnapVertices(3, out->num_vertices, (out->groupmesh->data_vertex3f + 3 * out->num_firstvertex), 0.25);
+				Mod_SnapVertices(3, out->num_collisionvertices, out->data_collisionvertex3f, 1);
 
-				oldnumtriangles = out->mesh.num_triangles;
-				oldnumtriangles2 = out->mesh.num_collisiontriangles;
-				out->mesh.num_collisiontriangles = Mod_RemoveDegenerateTriangles(out->mesh.num_collisiontriangles, out->mesh.data_collisionelement3i, out->mesh.data_collisionelement3i, out->mesh.data_collisionvertex3f);
+				oldnumtriangles = out->num_triangles;
+				oldnumtriangles2 = out->num_collisiontriangles;
+				out->num_collisiontriangles = Mod_RemoveDegenerateTriangles(out->num_collisiontriangles, out->data_collisionelement3i, out->data_collisionelement3i, out->data_collisionvertex3f);
 				if (developer.integer)
-					Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve became %i:%i vertices / %i:%i triangles (%i:%i degenerate)\n", patchsize[0], patchsize[1], out->mesh.num_vertices, out->mesh.num_collisionvertices, oldnumtriangles, oldnumtriangles2, oldnumtriangles - out->mesh.num_triangles, oldnumtriangles2 - out->mesh.num_collisiontriangles);
+					Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve became %i:%i vertices / %i:%i triangles (%i:%i degenerate)\n", patchsize[0], patchsize[1], out->num_vertices, out->num_collisionvertices, oldnumtriangles, oldnumtriangles2, oldnumtriangles - out->num_triangles, oldnumtriangles2 - out->num_collisiontriangles);
 				break;
 			default:
 				break;
 			}
-			meshvertices += out->mesh.num_vertices;
-			meshtriangles += out->mesh.num_triangles;
-			for (j = 0, invalidelements = 0;j < out->mesh.num_triangles * 3;j++)
-				if (out->mesh.data_element3i[j] < 0 || out->mesh.data_element3i[j] >= out->mesh.num_vertices)
+			meshvertices += out->num_vertices;
+			meshtriangles += out->num_triangles;
+			for (j = 0, invalidelements = 0;j < out->num_triangles * 3;j++)
+				if ((out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] < out->num_firstvertex || (out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] >= out->num_firstvertex + out->num_vertices)
 					invalidelements++;
 			if (invalidelements)
 			{
-				Con_Printf("Mod_Q3BSP_LoadFaces: Warning: face #%i has %i invalid elements, type = %i, texture->name = \"%s\", texture->surfaceflags = %i, texture->nativecontents = %i, firstvertex = %i, numvertices = %i, firstelement = %i, numelements = %i, elements list:\n", i, invalidelements, type, out->texture->name, out->texture->surfaceflags, out->texture->nativecontents, firstvertex, out->mesh.num_vertices, firstelement, out->mesh.num_triangles * 3);
-				for (j = 0;j < out->mesh.num_triangles * 3;j++)
+				Con_Printf("Mod_Q3BSP_LoadFaces: Warning: face #%i has %i invalid elements, type = %i, texture->name = \"%s\", texture->surfaceflags = %i, firstvertex = %i, numvertices = %i, firstelement = %i, numelements = %i, elements list:\n", i, invalidelements, type, out->texture->name, out->texture->surfaceflags, firstvertex, out->num_vertices, firstelement, out->num_triangles * 3);
+				for (j = 0;j < out->num_triangles * 3;j++)
 				{
-					Con_Printf(" %i", out->mesh.data_element3i[j]);
-					if (out->mesh.data_element3i[j] < 0 || out->mesh.data_element3i[j] >= out->mesh.num_vertices)
-						out->mesh.data_element3i[j] = 0;
+					Con_Printf(" %i", (out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] - out->num_firstvertex);
+					if ((out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] < out->num_firstvertex || (out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] >= out->num_firstvertex + out->num_vertices)
+						(out->groupmesh->data_element3i + 3 * out->num_firsttriangle)[j] = out->num_firstvertex;
 				}
 				Con_Print("\n");
 			}
-			// for shadow volumes
-			Mod_BuildTriangleNeighbors(out->mesh.data_neighbor3i, out->mesh.data_element3i, out->mesh.num_triangles);
 			// for per pixel lighting
-			Mod_BuildTextureVectorsAndNormals(out->mesh.num_vertices, out->mesh.num_triangles, out->mesh.data_vertex3f, out->mesh.data_texcoordtexture2f, out->mesh.data_element3i, out->mesh.data_svector3f, out->mesh.data_tvector3f, out->mesh.data_normal3f);
+			Mod_BuildTextureVectorsAndNormals(out->num_firstvertex, out->num_vertices, out->num_triangles, out->groupmesh->data_vertex3f, out->groupmesh->data_texcoordtexture2f, (out->groupmesh->data_element3i + 3 * out->num_firsttriangle), out->groupmesh->data_svector3f, out->groupmesh->data_tvector3f, out->groupmesh->data_normal3f, true);
 			// calculate a bounding box
 			VectorClear(out->mins);
 			VectorClear(out->maxs);
-			if (out->mesh.num_vertices)
+			if (out->num_vertices)
 			{
-				VectorCopy(out->mesh.data_vertex3f, out->mins);
-				VectorCopy(out->mesh.data_vertex3f, out->maxs);
-				for (j = 1, v = out->mesh.data_vertex3f + 3;j < out->mesh.num_vertices;j++, v += 3)
+				VectorCopy((out->groupmesh->data_vertex3f + 3 * out->num_firstvertex), out->mins);
+				VectorCopy((out->groupmesh->data_vertex3f + 3 * out->num_firstvertex), out->maxs);
+				for (j = 1, v = (out->groupmesh->data_vertex3f + 3 * out->num_firstvertex) + 3;j < out->num_vertices;j++, v += 3)
 				{
 					out->mins[0] = min(out->mins[0], v[0]);
 					out->maxs[0] = max(out->maxs[0], v[0]);
@@ -4508,6 +4642,11 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 				out->maxs[1] += 1.0f;
 				out->maxs[2] += 1.0f;
 			}
+			// set lightmap styles for consistency with q1bsp
+			//out->lightmapinfo->styles[0] = 0;
+			//out->lightmapinfo->styles[1] = 255;
+			//out->lightmapinfo->styles[2] = 255;
+			//out->lightmapinfo->styles[3] = 255;
 		}
 	}
 
@@ -4515,22 +4654,34 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
 	loadmodel->nummeshes = meshnum;
 	if (loadmodel->nummeshes)
 	{
-		loadmodel->meshlist = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *) * loadmodel->nummeshes);
+		loadmodel->meshlist = (surfmesh_t **)Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *) * loadmodel->nummeshes);
 		memcpy(loadmodel->meshlist, tempmeshlist, sizeof(surfmesh_t *) * loadmodel->nummeshes);
 	}
+
+	// free the no longer needed vertex data
+	loadmodel->brushq3.num_vertices = 0;
+	Mem_Free(loadmodel->brushq3.data_vertex3f);
+	loadmodel->brushq3.data_vertex3f = NULL;
+	loadmodel->brushq3.data_texcoordtexture2f = NULL;
+	loadmodel->brushq3.data_texcoordlightmap2f = NULL;
+	loadmodel->brushq3.data_color4f = NULL;
+	// free the no longer needed triangle data
+	loadmodel->brushq3.num_triangles = 0;
+	Mem_Free(loadmodel->brushq3.data_element3i);
+	loadmodel->brushq3.data_element3i = NULL;
 }
 
 static void Mod_Q3BSP_LoadModels(lump_t *l)
 {
 	q3dmodel_t *in;
-	q3mmodel_t *out;
+	q3dmodel_t *out;
 	int i, j, n, c, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dmodel_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadModels: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (q3dmodel_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
 	loadmodel->brushq3.data_models = out;
 	loadmodel->brushq3.num_models = count;
@@ -4544,15 +4695,15 @@ static void Mod_Q3BSP_LoadModels(lump_t *l)
 		}
 		n = LittleLong(in->firstface);
 		c = LittleLong(in->numfaces);
-		if (n < 0 || n + c > loadmodel->brushq3.num_faces)
-			Host_Error("Mod_Q3BSP_LoadModels: invalid face range %i : %i (%i faces)\n", n, n + c, loadmodel->brushq3.num_faces);
-		out->firstface = loadmodel->brushq3.data_faces + n;
+		if (n < 0 || n + c > loadmodel->num_surfaces)
+			Host_Error("Mod_Q3BSP_LoadModels: invalid face range %i : %i (%i faces)\n", n, n + c, loadmodel->num_surfaces);
+		out->firstface = n;
 		out->numfaces = c;
 		n = LittleLong(in->firstbrush);
 		c = LittleLong(in->numbrushes);
-		if (n < 0 || n + c > loadmodel->brushq3.num_brushes)
-			Host_Error("Mod_Q3BSP_LoadModels: invalid brush range %i : %i (%i brushes)\n", n, n + c, loadmodel->brushq3.num_brushes);
-		out->firstbrush = loadmodel->brushq3.data_brushes + n;
+		if (n < 0 || n + c > loadmodel->brush.num_brushes)
+			Host_Error("Mod_Q3BSP_LoadModels: invalid brush range %i : %i (%i brushes)\n", n, n + c, loadmodel->brush.num_brushes);
+		out->firstbrush = n;
 		out->numbrushes = c;
 	}
 }
@@ -4560,68 +4711,65 @@ static void Mod_Q3BSP_LoadModels(lump_t *l)
 static void Mod_Q3BSP_LoadLeafBrushes(lump_t *l)
 {
 	int *in;
-	q3mbrush_t **out;
+	int *out;
 	int i, n, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (int *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadLeafBrushes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (int *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_leafbrushes = out;
-	loadmodel->brushq3.num_leafbrushes = count;
+	loadmodel->brush.data_leafbrushes = out;
+	loadmodel->brush.num_leafbrushes = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
 		n = LittleLong(*in);
-		if (n < 0 || n >= loadmodel->brushq3.num_brushes)
-			Host_Error("Mod_Q3BSP_LoadLeafBrushes: invalid brush index %i (%i brushes)\n", n, loadmodel->brushq3.num_brushes);
-		*out = loadmodel->brushq3.data_brushes + n;
+		if (n < 0 || n >= loadmodel->brush.num_brushes)
+			Host_Error("Mod_Q3BSP_LoadLeafBrushes: invalid brush index %i (%i brushes)\n", n, loadmodel->brush.num_brushes);
+		*out = n;
 	}
 }
 
 static void Mod_Q3BSP_LoadLeafFaces(lump_t *l)
 {
 	int *in;
-	q3msurface_t **out;
+	int *out;
 	int i, n, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (int *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadLeafFaces: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (int *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_leaffaces = out;
-	loadmodel->brushq3.num_leaffaces = count;
-
-	loadmodel->brushq3.data_leaffacenums = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+	loadmodel->brush.data_leafsurfaces = out;
+	loadmodel->brush.num_leafsurfaces = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
 		n = LittleLong(*in);
-		if (n < 0 || n >= loadmodel->brushq3.num_faces)
-			Host_Error("Mod_Q3BSP_LoadLeafFaces: invalid face index %i (%i faces)\n", n, loadmodel->brushq3.num_faces);
-		*out = loadmodel->brushq3.data_faces + n;
-		loadmodel->brushq3.data_leaffacenums[i] = n;
+		if (n < 0 || n >= loadmodel->num_surfaces)
+			Host_Error("Mod_Q3BSP_LoadLeafFaces: invalid face index %i (%i faces)\n", n, loadmodel->num_surfaces);
+		*out = n;
 	}
 }
 
 static void Mod_Q3BSP_LoadLeafs(lump_t *l)
 {
 	q3dleaf_t *in;
-	q3mleaf_t *out;
+	mleaf_t *out;
 	int i, j, n, c, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dleaf_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadLeafs: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (mleaf_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_leafs = out;
-	loadmodel->brushq3.num_leafs = count;
+	loadmodel->brush.data_leafs = out;
+	loadmodel->brush.num_leafs = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
@@ -4637,69 +4785,56 @@ static void Mod_Q3BSP_LoadLeafs(lump_t *l)
 		}
 		n = LittleLong(in->firstleafface);
 		c = LittleLong(in->numleaffaces);
-		if (n < 0 || n + c > loadmodel->brushq3.num_leaffaces)
-			Host_Error("Mod_Q3BSP_LoadLeafs: invalid leafface range %i : %i (%i leaffaces)\n", n, n + c, loadmodel->brushq3.num_leaffaces);
-		out->firstleafface = loadmodel->brushq3.data_leaffaces + n;
-		out->firstleaffacenum = loadmodel->brushq3.data_leaffacenums + n;
-		out->numleaffaces = c;
+		if (n < 0 || n + c > loadmodel->brush.num_leafsurfaces)
+			Host_Error("Mod_Q3BSP_LoadLeafs: invalid leafsurface range %i : %i (%i leafsurfaces)\n", n, n + c, loadmodel->brush.num_leafsurfaces);
+		out->firstleafsurface = loadmodel->brush.data_leafsurfaces + n;
+		out->numleafsurfaces = c;
 		n = LittleLong(in->firstleafbrush);
 		c = LittleLong(in->numleafbrushes);
-		if (n < 0 || n + c > loadmodel->brushq3.num_leafbrushes)
-			Host_Error("Mod_Q3BSP_LoadLeafs: invalid leafbrush range %i : %i (%i leafbrushes)\n", n, n + c, loadmodel->brushq3.num_leafbrushes);
-		out->firstleafbrush = loadmodel->brushq3.data_leafbrushes + n;
+		if (n < 0 || n + c > loadmodel->brush.num_leafbrushes)
+			Host_Error("Mod_Q3BSP_LoadLeafs: invalid leafbrush range %i : %i (%i leafbrushes)\n", n, n + c, loadmodel->brush.num_leafbrushes);
+		out->firstleafbrush = loadmodel->brush.data_leafbrushes + n;
 		out->numleafbrushes = c;
 	}
 }
 
-static void Mod_Q3BSP_LoadNodes_RecursiveSetParent(q3mnode_t *node, q3mnode_t *parent)
-{
-	if (node->parent)
-		Host_Error("Mod_Q3BSP_LoadNodes_RecursiveSetParent: runaway recursion\n");
-	node->parent = parent;
-	if (node->plane)
-	{
-		Mod_Q3BSP_LoadNodes_RecursiveSetParent(node->children[0], node);
-		Mod_Q3BSP_LoadNodes_RecursiveSetParent(node->children[1], node);
-	}
-}
-
 static void Mod_Q3BSP_LoadNodes(lump_t *l)
 {
 	q3dnode_t *in;
-	q3mnode_t *out;
+	mnode_t *out;
 	int i, j, n, count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dnode_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadNodes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	out = (mnode_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->brushq3.data_nodes = out;
-	loadmodel->brushq3.num_nodes = count;
+	loadmodel->brush.data_nodes = out;
+	loadmodel->brush.num_nodes = count;
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
 		out->parent = NULL;
 		n = LittleLong(in->planeindex);
-		if (n < 0 || n >= loadmodel->brushq3.num_planes)
-			Host_Error("Mod_Q3BSP_LoadNodes: invalid planeindex %i (%i planes)\n", n, loadmodel->brushq3.num_planes);
-		out->plane = loadmodel->brushq3.data_planes + n;
+		if (n < 0 || n >= loadmodel->brush.num_planes)
+			Host_Error("Mod_Q3BSP_LoadNodes: invalid planeindex %i (%i planes)\n", n, loadmodel->brush.num_planes);
+		out->plane = loadmodel->brush.data_planes + n;
 		for (j = 0;j < 2;j++)
 		{
 			n = LittleLong(in->childrenindex[j]);
 			if (n >= 0)
 			{
-				if (n >= loadmodel->brushq3.num_nodes)
-					Host_Error("Mod_Q3BSP_LoadNodes: invalid child node index %i (%i nodes)\n", n, loadmodel->brushq3.num_nodes);
-				out->children[j] = loadmodel->brushq3.data_nodes + n;
+				if (n >= loadmodel->brush.num_nodes)
+					Host_Error("Mod_Q3BSP_LoadNodes: invalid child node index %i (%i nodes)\n", n, loadmodel->brush.num_nodes);
+				out->children[j] = loadmodel->brush.data_nodes + n;
 			}
 			else
 			{
 				n = -1 - n;
-				if (n >= loadmodel->brushq3.num_leafs)
-					Host_Error("Mod_Q3BSP_LoadNodes: invalid child leaf index %i (%i leafs)\n", n, loadmodel->brushq3.num_leafs);
-				out->children[j] = (q3mnode_t *)(loadmodel->brushq3.data_leafs + n);
+				if (n >= loadmodel->brush.num_leafs)
+					Host_Error("Mod_Q3BSP_LoadNodes: invalid child leaf index %i (%i leafs)\n", n, loadmodel->brush.num_leafs);
+				out->children[j] = (mnode_t *)(loadmodel->brush.data_leafs + n);
 			}
 		}
 		for (j = 0;j < 3;j++)
@@ -4711,7 +4846,7 @@ static void Mod_Q3BSP_LoadNodes(lump_t *l)
 	}
 
 	// set the parent pointers
-	Mod_Q3BSP_LoadNodes_RecursiveSetParent(loadmodel->brushq3.data_nodes, NULL);
+	Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL);
 }
 
 static void Mod_Q3BSP_LoadLightGrid(lump_t *l)
@@ -4720,7 +4855,7 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l)
 	q3dlightgrid_t *out;
 	int count;
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dlightgrid_t *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadLightGrid: funny lump size in %s",loadmodel->name);
 	loadmodel->brushq3.num_lightgrid_scale[0] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[0];
@@ -4736,40 +4871,22 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l)
 	loadmodel->brushq3.num_lightgrid_isize[1] = loadmodel->brushq3.num_lightgrid_imaxs[1] - loadmodel->brushq3.num_lightgrid_imins[1] + 1;
 	loadmodel->brushq3.num_lightgrid_isize[2] = loadmodel->brushq3.num_lightgrid_imaxs[2] - loadmodel->brushq3.num_lightgrid_imins[2] + 1;
 	count = loadmodel->brushq3.num_lightgrid_isize[0] * loadmodel->brushq3.num_lightgrid_isize[1] * loadmodel->brushq3.num_lightgrid_isize[2];
+	Matrix4x4_CreateScale3(&loadmodel->brushq3.num_lightgrid_indexfromworld, loadmodel->brushq3.num_lightgrid_scale[0], loadmodel->brushq3.num_lightgrid_scale[1], loadmodel->brushq3.num_lightgrid_scale[2]);
+	Matrix4x4_ConcatTranslate(&loadmodel->brushq3.num_lightgrid_indexfromworld, -loadmodel->brushq3.num_lightgrid_imins[0] * loadmodel->brushq3.num_lightgrid_cellsize[0], -loadmodel->brushq3.num_lightgrid_imins[1] * loadmodel->brushq3.num_lightgrid_cellsize[1], -loadmodel->brushq3.num_lightgrid_imins[2] * loadmodel->brushq3.num_lightgrid_cellsize[2]);
+
+	// if lump is empty there is nothing to load, we can deal with that in the LightPoint code
 	if (l->filelen)
 	{
 		if (l->filelen < count * (int)sizeof(*in))
 			Host_Error("Mod_Q3BSP_LoadLightGrid: invalid lightgrid lump size %i bytes, should be %i bytes (%ix%ix%i)\n", l->filelen, count * sizeof(*in), loadmodel->brushq3.num_lightgrid_dimensions[0], loadmodel->brushq3.num_lightgrid_dimensions[1], loadmodel->brushq3.num_lightgrid_dimensions[2]);
 		if (l->filelen != count * (int)sizeof(*in))
 			Con_Printf("Mod_Q3BSP_LoadLightGrid: Warning: calculated lightgrid size %i bytes does not match lump size %i\n", count * sizeof(*in), l->filelen);
-	}
-
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
-	loadmodel->brushq3.data_lightgrid = out;
-	loadmodel->brushq3.num_lightgrid = count;
-
-	// no swapping or validation necessary
-	if (l->filelen)
+		out = (q3dlightgrid_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+		loadmodel->brushq3.data_lightgrid = out;
+		loadmodel->brushq3.num_lightgrid = count;
+		// no swapping or validation necessary
 		memcpy(out, in, count * (int)sizeof(*out));
-	else
-	{
-		// no data, fill with white
-		int i;
-		for (i = 0;i < count;i++)
-		{
-			out[i].ambientrgb[0] = 128;
-			out[i].ambientrgb[1] = 128;
-			out[i].ambientrgb[2] = 128;
-			out[i].diffusergb[0] = 0;
-			out[i].diffusergb[1] = 0;
-			out[i].diffusergb[2] = 0;
-			out[i].diffusepitch = 0;
-			out[i].diffuseyaw = 0;
-		}
 	}
-
-	Matrix4x4_CreateScale3(&loadmodel->brushq3.num_lightgrid_indexfromworld, loadmodel->brushq3.num_lightgrid_scale[0], loadmodel->brushq3.num_lightgrid_scale[1], loadmodel->brushq3.num_lightgrid_scale[2]);
-	Matrix4x4_ConcatTranslate(&loadmodel->brushq3.num_lightgrid_indexfromworld, -loadmodel->brushq3.num_lightgrid_imins[0] * loadmodel->brushq3.num_lightgrid_cellsize[0], -loadmodel->brushq3.num_lightgrid_imins[1] * loadmodel->brushq3.num_lightgrid_cellsize[1], -loadmodel->brushq3.num_lightgrid_imins[2] * loadmodel->brushq3.num_lightgrid_cellsize[2]);
 }
 
 static void Mod_Q3BSP_LoadPVS(lump_t *l)
@@ -4783,18 +4900,18 @@ static void Mod_Q3BSP_LoadPVS(lump_t *l)
 		// unvised maps often have cluster indices even without pvs, so check
 		// leafs to find real number of clusters
 		loadmodel->brush.num_pvsclusters = 1;
-		for (i = 0;i < loadmodel->brushq3.num_leafs;i++)
-			loadmodel->brush.num_pvsclusters = max(loadmodel->brush.num_pvsclusters, loadmodel->brushq3.data_leafs[i].clusterindex + 1);
+		for (i = 0;i < loadmodel->brush.num_leafs;i++)
+			loadmodel->brush.num_pvsclusters = max(loadmodel->brush.num_pvsclusters, loadmodel->brush.data_leafs[i].clusterindex + 1);
 
 		// create clusters
 		loadmodel->brush.num_pvsclusterbytes = (loadmodel->brush.num_pvsclusters + 7) / 8;
 		totalchains = loadmodel->brush.num_pvsclusterbytes * loadmodel->brush.num_pvsclusters;
-		loadmodel->brush.data_pvsclusters = Mem_Alloc(loadmodel->mempool, totalchains);
+		loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, totalchains);
 		memset(loadmodel->brush.data_pvsclusters, 0xFF, totalchains);
 		return;
 	}
 
-	in = (void *)(mod_base + l->fileofs);
+	in = (q3dpvs_t *)(mod_base + l->fileofs);
 	if (l->filelen < 9)
 		Host_Error("Mod_Q3BSP_LoadPVS: funny lump size in %s",loadmodel->name);
 
@@ -4806,14 +4923,8 @@ static void Mod_Q3BSP_LoadPVS(lump_t *l)
 	if (l->filelen < totalchains + (int)sizeof(*in))
 		Host_Error("Mod_Q3BSP_LoadPVS: lump too small ((numclusters = %i) * (chainlength = %i) + sizeof(q3dpvs_t) == %i bytes, lump is %i bytes)\n", loadmodel->brush.num_pvsclusters, loadmodel->brush.num_pvsclusterbytes, totalchains + sizeof(*in), l->filelen);
 
-	loadmodel->brush.data_pvsclusters = Mem_Alloc(loadmodel->mempool, totalchains);
-	memcpy(loadmodel->brush.data_pvsclusters, (qbyte *)(in + 1), totalchains);
-}
-
-static void Mod_Q3BSP_FindNonSolidLocation(model_t *model, const vec3_t in, vec3_t out, vec_t radius)
-{
-	// FIXME: finish this code
-	VectorCopy(in, out);
+	loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, totalchains);
+	memcpy(loadmodel->brush.data_pvsclusters, (unsigned char *)(in + 1), totalchains);
 }
 
 static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
@@ -4821,7 +4932,6 @@ static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientc
 	int i, j, k, index[3];
 	float transformed[3], blend1, blend2, blend, yaw, pitch, sinpitch;
 	q3dlightgrid_t *a, *s;
-	// FIXME: write this
 	if (!model->brushq3.num_lightgrid)
 	{
 		ambientcolor[0] = 1;
@@ -4874,34 +4984,34 @@ static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientc
 	//Con_Printf("result: ambient %f %f %f diffuse %f %f %f diffusenormal %f %f %f\n", ambientcolor[0], ambientcolor[1], ambientcolor[2], diffusecolor[0], diffusecolor[1], diffusecolor[2], diffusenormal[0], diffusenormal[1], diffusenormal[2]);
 }
 
-static void Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace_t *trace, q3mnode_t *node, const vec3_t point, int markframe)
+static void Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace_t *trace, model_t *model, mnode_t *node, const vec3_t point, int markframe)
 {
 	int i;
-	q3mleaf_t *leaf;
+	mleaf_t *leaf;
 	colbrushf_t *brush;
 	// find which leaf the point is in
 	while (node->plane)
 		node = node->children[DotProduct(point, node->plane->normal) < node->plane->dist];
 	// point trace the brushes
-	leaf = (q3mleaf_t *)node;
+	leaf = (mleaf_t *)node;
 	for (i = 0;i < leaf->numleafbrushes;i++)
 	{
-		brush = leaf->firstleafbrush[i]->colbrushf;
+		brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
 		if (brush && brush->markframe != markframe && BoxesOverlap(point, point, brush->mins, brush->maxs))
 		{
 			brush->markframe = markframe;
-			Collision_TracePointBrushFloat(trace, point, leaf->firstleafbrush[i]->colbrushf);
+			Collision_TracePointBrushFloat(trace, point, brush);
 		}
 	}
 	// can't do point traces on curves (they have no thickness)
 }
 
-static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, q3mnode_t *node, const vec3_t start, const vec3_t end, vec_t startfrac, vec_t endfrac, const vec3_t linestart, const vec3_t lineend, int markframe, const vec3_t segmentmins, const vec3_t segmentmaxs)
+static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, model_t *model, mnode_t *node, const vec3_t start, const vec3_t end, vec_t startfrac, vec_t endfrac, const vec3_t linestart, const vec3_t lineend, int markframe, const vec3_t segmentmins, const vec3_t segmentmaxs)
 {
 	int i, startside, endside;
 	float dist1, dist2, midfrac, mid[3], nodesegmentmins[3], nodesegmentmaxs[3];
-	q3mleaf_t *leaf;
-	q3msurface_t *face;
+	mleaf_t *leaf;
+	msurface_t *surface;
 	colbrushf_t *brush;
 	if (startfrac > trace->realfraction)
 		return;
@@ -4933,9 +5043,9 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, q3mnode_t *node
 				midfrac = dist1 / (dist1 - dist2);
 				VectorLerp(start, midfrac, end, mid);
 				// take the near side first
-				Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, node->children[startside], start, mid, startfrac, midfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+				Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, node->children[startside], start, mid, startfrac, midfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
 				if (midfrac <= trace->realfraction)
-					Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, node->children[endside], mid, end, midfrac, endfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+					Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, node->children[endside], mid, end, midfrac, endfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
 				return;
 			}
 		}
@@ -4948,14 +5058,14 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, q3mnode_t *node
 	nodesegmentmaxs[1] = max(start[1], end[1]);
 	nodesegmentmaxs[2] = max(start[2], end[2]);
 	// line trace the brushes
-	leaf = (q3mleaf_t *)node;
+	leaf = (mleaf_t *)node;
 	for (i = 0;i < leaf->numleafbrushes;i++)
 	{
-		brush = leaf->firstleafbrush[i]->colbrushf;
+		brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
 		if (brush && brush->markframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, brush->mins, brush->maxs))
 		{
 			brush->markframe = markframe;
-			Collision_TraceLineBrushFloat(trace, linestart, lineend, leaf->firstleafbrush[i]->colbrushf, leaf->firstleafbrush[i]->colbrushf);
+			Collision_TraceLineBrushFloat(trace, linestart, lineend, brush, brush);
 			if (startfrac > trace->realfraction)
 				return;
 		}
@@ -4964,13 +5074,13 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, q3mnode_t *node
 	if (mod_q3bsp_curves_collisions.integer && !VectorCompare(start, end))
 	{
 		// line trace the curves
-		for (i = 0;i < leaf->numleaffaces;i++)
+		for (i = 0;i < leaf->numleafsurfaces;i++)
 		{
-			face = leaf->firstleafface[i];
-			if (face->mesh.num_collisiontriangles && face->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, face->mins, face->maxs))
+			surface = model->data_surfaces + leaf->firstleafsurface[i];
+			if (surface->num_collisiontriangles && surface->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, surface->mins, surface->maxs))
 			{
-				face->collisionmarkframe = markframe;
-				Collision_TraceLineTriangleMeshFloat(trace, linestart, lineend, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i, face->mesh.data_collisionvertex3f, face->texture->supercontents, segmentmins, segmentmaxs);
+				surface->collisionmarkframe = markframe;
+				Collision_TraceLineTriangleMeshFloat(trace, linestart, lineend, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->texture->supercontents, segmentmins, segmentmaxs);
 				if (startfrac > trace->realfraction)
 					return;
 			}
@@ -4978,14 +5088,14 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, q3mnode_t *node
 	}
 }
 
-static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, q3mnode_t *node, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int markframe, const vec3_t segmentmins, const vec3_t segmentmaxs)
+static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, model_t *model, mnode_t *node, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int markframe, const vec3_t segmentmins, const vec3_t segmentmaxs)
 {
 	int i;
-	//int sides;
+	int sides;
 	float nodesegmentmins[3], nodesegmentmaxs[3];
-	q3mleaf_t *leaf;
+	mleaf_t *leaf;
 	colbrushf_t *brush;
-	q3msurface_t *face;
+	msurface_t *surface;
 	/*
 		// find which nodes the line is in and recurse for them
 		while (node->plane)
@@ -5202,6 +5312,57 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, q3mnode_t *nod
 		}
 	*/
 #if 1
+	for (;;)
+	{
+		mplane_t *plane = node->plane;
+		if (!plane)
+			break;
+		// axial planes are much more common than non-axial, so an optimized
+		// axial case pays off here
+		if (plane->type < 3)
+		{
+			// this is an axial plane, compare bounding box directly to it and
+			// recurse sides accordingly
+			// recurse down node sides
+			// use an inlined axial BoxOnPlaneSide to slightly reduce overhead
+			//sides = BoxOnPlaneSide(nodesegmentmins, nodesegmentmaxs, plane);
+			sides = ((segmentmaxs[plane->type] >= plane->dist) | ((segmentmins[plane->type] < plane->dist) << 1));
+			if (sides == 3)
+			{
+				// segment box crosses plane
+				Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+				sides = 2;
+			}
+		}
+		else
+		{
+			// this is a non-axial plane, entire trace bounding box
+			// comparisons against it are likely to be very sloppy, so in if
+			// the whole box is split by the plane we then test the start/end
+			// boxes against it to be sure
+			sides = BoxOnPlaneSide(segmentmins, segmentmaxs, plane);
+			if (sides == 3)
+			{
+				// segment box crosses plane
+				// now check start and end brush boxes to handle a lot of 'diagonal' cases more efficiently...
+				sides = BoxOnPlaneSide(thisbrush_start->mins, thisbrush_start->maxs, plane) | BoxOnPlaneSide(thisbrush_end->mins, thisbrush_end->maxs, plane);
+				if (sides == 3)
+				{
+					Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+					sides = 2;
+				}
+			}
+		}
+		// take whichever side the segment box is on
+		node = node->children[sides - 1];
+	}
+	nodesegmentmins[0] = max(segmentmins[0], node->mins[0]);
+	nodesegmentmins[1] = max(segmentmins[1], node->mins[1]);
+	nodesegmentmins[2] = max(segmentmins[2], node->mins[2]);
+	nodesegmentmaxs[0] = min(segmentmaxs[0], node->maxs[0]);
+	nodesegmentmaxs[1] = min(segmentmaxs[1], node->maxs[1]);
+	nodesegmentmaxs[2] = min(segmentmaxs[2], node->maxs[2]);
+#elif 1
 	for (;;)
 	{
 		nodesegmentmins[0] = max(segmentmins[0], node->mins[0]);
@@ -5214,7 +5375,7 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, q3mnode_t *nod
 			return;
 		if (!node->plane)
 			break;
-		Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+		Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
 		node = node->children[1];
 	}
 #elif 0
@@ -5332,25 +5493,25 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, q3mnode_t *nod
 	}
 #endif
 	// hit a leaf
-	leaf = (q3mleaf_t *)node;
+	leaf = (mleaf_t *)node;
 	for (i = 0;i < leaf->numleafbrushes;i++)
 	{
-		brush = leaf->firstleafbrush[i]->colbrushf;
+		brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
 		if (brush && brush->markframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, brush->mins, brush->maxs))
 		{
 			brush->markframe = markframe;
-			Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, leaf->firstleafbrush[i]->colbrushf, leaf->firstleafbrush[i]->colbrushf);
+			Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, brush, brush);
 		}
 	}
 	if (mod_q3bsp_curves_collisions.integer)
 	{
-		for (i = 0;i < leaf->numleaffaces;i++)
+		for (i = 0;i < leaf->numleafsurfaces;i++)
 		{
-			face = leaf->firstleafface[i];
-			if (face->mesh.num_collisiontriangles && face->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, face->mins, face->maxs))
+			surface = model->data_surfaces + leaf->firstleafsurface[i];
+			if (surface->num_collisiontriangles && surface->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, surface->mins, surface->maxs))
 			{
-				face->collisionmarkframe = markframe;
-				Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i, face->mesh.data_collisionvertex3f, face->texture->supercontents, segmentmins, segmentmaxs);
+				surface->collisionmarkframe = markframe;
+				Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->texture->supercontents, segmentmins, segmentmaxs);
 			}
 		}
 	}
@@ -5363,7 +5524,8 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
 	colbrushf_t *thisbrush_start, *thisbrush_end;
 	matrix4x4_t startmatrix, endmatrix;
 	static int markframe = 0;
-	q3msurface_t *face;
+	msurface_t *surface;
+	q3mbrush_t *brush;
 	memset(trace, 0, sizeof(*trace));
 	trace->fraction = 1;
 	trace->realfraction = 1;
@@ -5381,35 +5543,30 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
 		if (VectorCompare(boxstartmins, boxendmins))
 		{
 			// point trace
-			if (model->brushq3.submodel)
+			if (model->brush.submodel)
 			{
-				for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-					if (model->brushq3.data_thismodel->firstbrush[i].colbrushf)
-						Collision_TracePointBrushFloat(trace, boxstartmins, model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+				for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+					if (brush->colbrushf)
+						Collision_TracePointBrushFloat(trace, boxstartmins, brush->colbrushf);
 			}
 			else
-				Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace, model->brushq3.data_nodes, boxstartmins, ++markframe);
+				Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace, model, model->brush.data_nodes, boxstartmins, ++markframe);
 		}
 		else
 		{
 			// line trace
-			if (model->brushq3.submodel)
+			if (model->brush.submodel)
 			{
-				for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-					if (model->brushq3.data_thismodel->firstbrush[i].colbrushf)
-						Collision_TraceLineBrushFloat(trace, boxstartmins, boxendmins, model->brushq3.data_thismodel->firstbrush[i].colbrushf, model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+				for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+					if (brush->colbrushf)
+						Collision_TraceLineBrushFloat(trace, boxstartmins, boxendmins, brush->colbrushf, brush->colbrushf);
 				if (mod_q3bsp_curves_collisions.integer)
-				{
-					for (i = 0;i < model->brushq3.data_thismodel->numfaces;i++)
-					{
-						face = model->brushq3.data_thismodel->firstface + i;
-						if (face->mesh.num_collisiontriangles)
-							Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i, face->mesh.data_collisionvertex3f, face->texture->supercontents, segmentmins, segmentmaxs);
-					}
-				}
+					for (i = 0, surface = model->data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++)
+						if (surface->num_collisiontriangles)
+							Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->texture->supercontents, segmentmins, segmentmaxs);
 			}
 			else
-				Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model->brushq3.data_nodes, boxstartmins, boxendmins, 0, 1, boxstartmins, boxendmins, ++markframe, segmentmins, segmentmaxs);
+				Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, model->brush.data_nodes, boxstartmins, boxendmins, 0, 1, boxstartmins, boxendmins, ++markframe, segmentmins, segmentmaxs);
 		}
 	}
 	else
@@ -5417,150 +5574,44 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
 		// box trace, performed as brush trace
 		thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs);
 		thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs);
-		if (model->brushq3.submodel)
+		if (model->brush.submodel)
 		{
-			for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
-				if (model->brushq3.data_thismodel->firstbrush[i].colbrushf)
-					Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, model->brushq3.data_thismodel->firstbrush[i].colbrushf, model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+			for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+				if (brush->colbrushf)
+					Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, brush->colbrushf, brush->colbrushf);
 			if (mod_q3bsp_curves_collisions.integer)
-			{
-				for (i = 0;i < model->brushq3.data_thismodel->numfaces;i++)
-				{
-					face = model->brushq3.data_thismodel->firstface + i;
-					if (face->mesh.num_collisiontriangles)
-						Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, face->mesh.num_collisiontriangles, face->mesh.data_collisionelement3i, face->mesh.data_collisionvertex3f, face->texture->supercontents, segmentmins, segmentmaxs);
-				}
-			}
-		}
-		else
-			Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model->brushq3.data_nodes, thisbrush_start, thisbrush_end, ++markframe, segmentmins, segmentmaxs);
-	}
-}
-
-static int Mod_Q3BSP_BoxTouchingPVS(model_t *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs)
-{
-	int clusterindex, side, nodestackindex = 0;
-	q3mnode_t *node, *nodestack[1024];
-	node = model->brushq3.data_nodes;
-	if (!model->brush.num_pvsclusters)
-		return true;
-	for (;;)
-	{
-		if (node->plane)
-		{
-			// node - recurse down the BSP tree
-			side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
-			if (side < 2)
-			{
-				// box is on one side of plane, take that path
-				node = node->children[side];
-			}
-			else
-			{
-				// box crosses plane, take one path and remember the other
-				if (nodestackindex < 1024)
-					nodestack[nodestackindex++] = node->children[0];
-				node = node->children[1];
-			}
-		}
-		else
-		{
-			// leaf - check cluster bit
-			clusterindex = ((q3mleaf_t *)node)->clusterindex;
-#if 0
-			if (clusterindex >= model->brush.num_pvsclusters)
-			{
-				Con_Printf("%i >= %i\n", clusterindex, model->brush.num_pvsclusters);
-				return true;
-			}
-#endif
-			if (CHECKPVSBIT(pvs, clusterindex))
-			{
-				// it is visible, return immediately with the news
-				return true;
-			}
-			else
-			{
-				// nothing to see here, try another path we didn't take earlier
-				if (nodestackindex == 0)
-					break;
-				node = nodestack[--nodestackindex];
-			}
+				for (i = 0, surface = model->data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++)
+					if (surface->num_collisiontriangles)
+						Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->texture->supercontents, segmentmins, segmentmaxs);
 		}
-	}
-	// it is not visible
-	return false;
-}
-
-//Returns PVS data for a given point
-//(note: can return NULL)
-static qbyte *Mod_Q3BSP_GetPVS(model_t *model, const vec3_t p)
-{
-	q3mnode_t *node;
-	Mod_CheckLoaded(model);
-	node = model->brushq3.data_nodes;
-	while (node->plane)
-		node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct(p,node->plane->normal)) < node->plane->dist];
-	if (((q3mleaf_t *)node)->clusterindex >= 0)
-		return model->brush.data_pvsclusters + ((q3mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
-	else
-		return NULL;
-}
-
-static void Mod_Q3BSP_FatPVS_RecursiveBSPNode(model_t *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbytes, q3mnode_t *node)
-{
-	while (node->plane)
-	{
-		float d = PlaneDiff(org, node->plane);
-		if (d > radius)
-			node = node->children[0];
-		else if (d < -radius)
-			node = node->children[1];
 		else
-		{
-			// go down both sides
-			Mod_Q3BSP_FatPVS_RecursiveBSPNode(model, org, radius, pvsbuffer, pvsbytes, node->children[0]);
-			node = node->children[1];
-		}
-	}
-	// if this leaf is in a cluster, accumulate the pvs bits
-	if (((q3mleaf_t *)node)->clusterindex >= 0)
-	{
-		int i;
-		qbyte *pvs = model->brush.data_pvsclusters + ((q3mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
-		for (i = 0;i < pvsbytes;i++)
-			pvsbuffer[i] |= pvs[i];
-	}
-}
-
-//Calculates a PVS that is the inclusive or of all leafs within radius pixels
-//of the given point.
-static int Mod_Q3BSP_FatPVS(model_t *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbufferlength)
-{
-	int bytes = model->brush.num_pvsclusterbytes;
-	bytes = min(bytes, pvsbufferlength);
-	if (r_novis.integer || !model->brush.num_pvsclusters || !Mod_Q3BSP_GetPVS(model, org))
-	{
-		memset(pvsbuffer, 0xFF, bytes);
-		return bytes;
+			Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, model->brush.data_nodes, thisbrush_start, thisbrush_end, ++markframe, segmentmins, segmentmaxs);
 	}
-	memset(pvsbuffer, 0, bytes);
-	Mod_Q3BSP_FatPVS_RecursiveBSPNode(model, org, radius, pvsbuffer, bytes, model->brushq3.data_nodes);
-	return bytes;
 }
 
-
 static int Mod_Q3BSP_SuperContentsFromNativeContents(model_t *model, int nativecontents)
 {
 	int supercontents = 0;
-	if (nativecontents & Q2CONTENTS_SOLID)
+	if (nativecontents & CONTENTSQ3_SOLID)
 		supercontents |= SUPERCONTENTS_SOLID;
-	if (nativecontents & Q2CONTENTS_WATER)
+	if (nativecontents & CONTENTSQ3_WATER)
 		supercontents |= SUPERCONTENTS_WATER;
-	if (nativecontents & Q2CONTENTS_SLIME)
+	if (nativecontents & CONTENTSQ3_SLIME)
 		supercontents |= SUPERCONTENTS_SLIME;
-	if (nativecontents & Q2CONTENTS_LAVA)
+	if (nativecontents & CONTENTSQ3_LAVA)
 		supercontents |= SUPERCONTENTS_LAVA;
+	if (nativecontents & CONTENTSQ3_BODY)
+		supercontents |= SUPERCONTENTS_BODY;
+	if (nativecontents & CONTENTSQ3_CORPSE)
+		supercontents |= SUPERCONTENTS_CORPSE;
+	if (nativecontents & CONTENTSQ3_NODROP)
+		supercontents |= SUPERCONTENTS_NODROP;
+	if (nativecontents & CONTENTSQ3_PLAYERCLIP)
+		supercontents |= SUPERCONTENTS_PLAYERCLIP;
+	if (nativecontents & CONTENTSQ3_MONSTERCLIP)
+		supercontents |= SUPERCONTENTS_MONSTERCLIP;
+	if (nativecontents & CONTENTSQ3_DONOTENTER)
+		supercontents |= SUPERCONTENTS_DONOTENTER;
 	return supercontents;
 }
 
@@ -5568,104 +5619,29 @@ static int Mod_Q3BSP_NativeContentsFromSuperContents(model_t *model, int superco
 {
 	int nativecontents = 0;
 	if (supercontents & SUPERCONTENTS_SOLID)
-		nativecontents |= Q2CONTENTS_SOLID;
+		nativecontents |= CONTENTSQ3_SOLID;
 	if (supercontents & SUPERCONTENTS_WATER)
-		nativecontents |= Q2CONTENTS_WATER;
+		nativecontents |= CONTENTSQ3_WATER;
 	if (supercontents & SUPERCONTENTS_SLIME)
-		nativecontents |= Q2CONTENTS_SLIME;
+		nativecontents |= CONTENTSQ3_SLIME;
 	if (supercontents & SUPERCONTENTS_LAVA)
-		nativecontents |= Q2CONTENTS_LAVA;
+		nativecontents |= CONTENTSQ3_LAVA;
+	if (supercontents & SUPERCONTENTS_BODY)
+		nativecontents |= CONTENTSQ3_BODY;
+	if (supercontents & SUPERCONTENTS_CORPSE)
+		nativecontents |= CONTENTSQ3_CORPSE;
+	if (supercontents & SUPERCONTENTS_NODROP)
+		nativecontents |= CONTENTSQ3_NODROP;
+	if (supercontents & SUPERCONTENTS_PLAYERCLIP)
+		nativecontents |= CONTENTSQ3_PLAYERCLIP;
+	if (supercontents & SUPERCONTENTS_MONSTERCLIP)
+		nativecontents |= CONTENTSQ3_MONSTERCLIP;
+	if (supercontents & SUPERCONTENTS_DONOTENTER)
+		nativecontents |= CONTENTSQ3_DONOTENTER;
 	return nativecontents;
 }
 
-/*
-void Mod_Q3BSP_RecursiveGetVisible(q3mnode_t *node, model_t *model, const vec3_t point, const vec3_t mins, const vec3_t maxs, int maxleafs, q3mleaf_t *leaflist, int *numleafs, int maxsurfaces, q3msurface_t *surfacelist, int *numsurfaces, const qbyte *pvs)
-{
-	mleaf_t *leaf;
-	for (;;)
-	{
-		if (!BoxesOverlap(node->mins, node->maxs, mins, maxs))
-			return;
-		if (!node->plane)
-			break;
-		Mod_Q3BSP_RecursiveGetVisible(node->children[0], model, point, mins, maxs, maxleafs, leaflist, numleafs, maxsurfaces, surfacelist, numsurfaces, pvs);
-		node = node->children[1];
-	}
-	leaf = (mleaf_t *)node;
-	if ((pvs == NULL || CHECKPVSBIT(pvs, leaf->clusterindex)))
-	{
-		int marksurfacenum;
-		q3msurface_t *surf;
-		if (maxleafs && *numleafs < maxleafs)
-			leaflist[(*numleaf)++] = leaf;
-		if (maxsurfaces)
-		{
-			for (marksurfacenum = 0;marksurfacenum < leaf->nummarksurfaces;marksurfacenum++)
-			{
-				face = leaf->firstleafface[marksurfacenum];
-				if (face->shadowmark != shadowmarkcount)
-				{
-					face->shadowmark = shadowmarkcount;
-					if (BoxesOverlap(mins, maxs, face->mins, face->maxs) && *numsurfaces < maxsurfaces)
-						surfacelist[(*numsurfaces)++] = face;
-				}
-			}
-		}
-	}
-}
-
-void Mod_Q3BSP_GetVisible(model_t *model, const vec3_t point, const vec3_t mins, const vec3_t maxs, int maxleafs, q3mleaf_t *leaflist, int *numleafs, int maxsurfaces, q3msurface_t *surfacelist, int *numsurfaces)
-{
-	// FIXME: support portals
-	if (maxsurfaces)
-		*numsurfaces = 0;
-	if (maxleafs)
-		*numleafs = 0;
-	if (model->submodel)
-	{
-		if (maxsurfaces)
-		{
-			for (marksurfacenum = 0;marksurfacenum < leaf->nummarksurfaces;marksurfacenum++)
-			{
-				face = ent->model->brushq3.surfaces + leaf->firstmarksurface[marksurfacenum];
-				if (BoxesOverlap(mins, maxs, face->mins, face->maxs) && *numsurfaces < maxsurfaces)
-					surfacelist[(*numsurfaces)++] = face;
-			}
-		}
-	}
-	else
-	{
-		pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
-		Mod_Q3BSP_RecursiveGetVisible(ent->model->brushq3.data_nodes, model, point, mins, maxs, maxleafs, leaflist, numleafs, maxsurfaces, surfacelist, numsurfaces, pvs);
-	}
-}
-*/
-
-void Mod_Q3BSP_BuildTextureFaceLists(void)
-{
-	int i, j;
-	loadmodel->brushq3.data_texturefaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummodelsurfaces * sizeof(q3msurface_t *));
-	loadmodel->brushq3.data_texturefacenums = Mem_Alloc(loadmodel->mempool, loadmodel->nummodelsurfaces * sizeof(int));
-	for (i = 0;i < loadmodel->brushq3.num_textures;i++)
-		loadmodel->brushq3.data_textures[i].numfaces = 0;
-	for (i = 0;i < loadmodel->nummodelsurfaces;i++)
-		loadmodel->brushq3.data_faces[loadmodel->surfacelist[i]].texture->numfaces++;
-	j = 0;
-	for (i = 0;i < loadmodel->brushq3.num_textures;i++)
-	{
-		loadmodel->brushq3.data_textures[i].facelist = loadmodel->brushq3.data_texturefaces + j;
-		loadmodel->brushq3.data_textures[i].facenumlist = loadmodel->brushq3.data_texturefacenums + j;
-		j += loadmodel->brushq3.data_textures[i].numfaces;
-		loadmodel->brushq3.data_textures[i].numfaces = 0;
-	}
-	for (i = 0;i < loadmodel->nummodelsurfaces;i++)
-	{
-		loadmodel->brushq3.data_faces[loadmodel->surfacelist[i]].texture->facenumlist[loadmodel->brushq3.data_faces[loadmodel->surfacelist[i]].texture->numfaces] = loadmodel->surfacelist[i];
-		loadmodel->brushq3.data_faces[loadmodel->surfacelist[i]].texture->facelist[loadmodel->brushq3.data_faces[loadmodel->surfacelist[i]].texture->numfaces++] = loadmodel->brushq3.data_faces + loadmodel->surfacelist[i];
-	}
-}
-
-void Mod_Q3BSP_RecursiveFindNumLeafs(q3mnode_t *node)
+void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node)
 {
 	int numleafs;
 	while (node->plane)
@@ -5673,22 +5649,17 @@ void Mod_Q3BSP_RecursiveFindNumLeafs(q3mnode_t *node)
 		Mod_Q3BSP_RecursiveFindNumLeafs(node->children[0]);
 		node = node->children[1];
 	}
-	numleafs = ((q3mleaf_t *)node - loadmodel->brushq3.data_leafs) + 1;
-	if (loadmodel->brushq3.num_leafs < numleafs)
-		loadmodel->brushq3.num_leafs = numleafs;
+	numleafs = ((mleaf_t *)node - loadmodel->brush.data_leafs) + 1;
+	if (loadmodel->brush.num_leafs < numleafs)
+		loadmodel->brush.num_leafs = numleafs;
 }
 
-extern void R_Q3BSP_DrawSky(struct entity_render_s *ent);
-extern void R_Q3BSP_Draw(struct entity_render_s *ent);
-extern void R_Q3BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer);
-extern void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist);
-extern void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist);
-void Mod_Q3BSP_Load(model_t *mod, void *buffer)
+void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend)
 {
 	int i, j, numshadowmeshtriangles;
 	q3dheader_t *header;
 	float corner[3], yawradius, modelradius;
-	q3msurface_t *face;
+	msurface_t *surface;
 
 	mod->type = mod_brushq3;
 	mod->numframes = 2; // although alternate textures are not supported it is annoying to complain about no such frame 1
@@ -5699,25 +5670,34 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
 	i = LittleLong(header->version);
 	if (i != Q3BSPVERSION)
 		Host_Error("Mod_Q3BSP_Load: %s has wrong version number (%i, should be %i)", mod->name, i, Q3BSPVERSION);
-	if (mod->isworldmodel)
-		Cvar_SetValue("halflifebsp", false);
+	mod->brush.ishlbsp = false;
+	mod->brush.ismcbsp = false;
+	if (loadmodel->isworldmodel)
+	{
+		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
+		Cvar_SetValue("mcbsp", mod->brush.ismcbsp);
+	}
 
 	mod->soundfromcenter = true;
 	mod->TraceBox = Mod_Q3BSP_TraceBox;
 	mod->brush.SuperContentsFromNativeContents = Mod_Q3BSP_SuperContentsFromNativeContents;
 	mod->brush.NativeContentsFromSuperContents = Mod_Q3BSP_NativeContentsFromSuperContents;
-	mod->brush.GetPVS = Mod_Q3BSP_GetPVS;
-	mod->brush.FatPVS = Mod_Q3BSP_FatPVS;
-	mod->brush.BoxTouchingPVS = Mod_Q3BSP_BoxTouchingPVS;
+	mod->brush.GetPVS = Mod_Q1BSP_GetPVS;
+	mod->brush.FatPVS = Mod_Q1BSP_FatPVS;
+	mod->brush.BoxTouchingPVS = Mod_Q1BSP_BoxTouchingPVS;
+	mod->brush.BoxTouchingLeafPVS = Mod_Q1BSP_BoxTouchingLeafPVS;
+	mod->brush.BoxTouchingVisibleLeafs = Mod_Q1BSP_BoxTouchingVisibleLeafs;
+	mod->brush.FindBoxClusters = Mod_Q1BSP_FindBoxClusters;
 	mod->brush.LightPoint = Mod_Q3BSP_LightPoint;
-	mod->brush.FindNonSolidLocation = Mod_Q3BSP_FindNonSolidLocation;
-	//mod->DrawSky = R_Q3BSP_DrawSky;
-	mod->Draw = R_Q3BSP_Draw;
-	mod->GetLightInfo = R_Q3BSP_GetLightInfo;
-	mod->DrawShadowVolume = R_Q3BSP_DrawShadowVolume;
-	mod->DrawLight = R_Q3BSP_DrawLight;
+	mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
+	mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf;
+	mod->Draw = R_Q1BSP_Draw;
+	mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+	mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
+	mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+	mod->DrawLight = R_Q1BSP_DrawLight;
 
-	mod_base = (qbyte *)header;
+	mod_base = (unsigned char *)header;
 
 	// swap all the lumps
 	header->ident = LittleLong(header->ident);
@@ -5747,24 +5727,36 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
 	Mod_Q3BSP_LoadPVS(&header->lumps[Q3LUMP_PVS]);
 	loadmodel->brush.numsubmodels = loadmodel->brushq3.num_models;
 
+	// the MakePortals code works fine on the q3bsp data as well
+	Mod_Q1BSP_MakePortals();
+
 	// make a single combined shadow mesh to allow optimized shadow volume creation
 	numshadowmeshtriangles = 0;
-	for (j = 0, face = loadmodel->brushq3.data_faces;j < loadmodel->brushq3.num_faces;j++, face++)
+	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
 	{
-		face->num_firstshadowmeshtriangle = numshadowmeshtriangles;
-		numshadowmeshtriangles += face->mesh.num_triangles;
+		surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
+		numshadowmeshtriangles += surface->num_triangles;
 	}
 	loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
-	for (j = 0, face = loadmodel->brushq3.data_faces;j < loadmodel->brushq3.num_faces;j++, face++)
-		Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, face->mesh.data_vertex3f, NULL, NULL, NULL, NULL, face->mesh.num_triangles, face->mesh.data_element3i);
+	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
+		if (surface->groupmesh)
+			Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, surface->groupmesh->data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle));
 	loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true);
 	Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles);
 
-	loadmodel->brushq3.num_leafs = 0;
-	Mod_Q3BSP_RecursiveFindNumLeafs(loadmodel->brushq3.data_nodes);
+	loadmodel->brush.num_leafs = 0;
+	Mod_Q3BSP_RecursiveFindNumLeafs(loadmodel->brush.data_nodes);
+
+	if (loadmodel->isworldmodel)
+	{
+		// clear out any stale submodels or worldmodels lying around
+		// if we did this clear before now, an error might abort loading and
+		// leave things in a bad state
+		Mod_RemoveStaleWorldModels(loadmodel);
+	}
 
 	mod = loadmodel;
-	for (i = 0;i < loadmodel->brushq3.num_models;i++)
+	for (i = 0;i < loadmodel->brush.numsubmodels;i++)
 	{
 		if (i > 0)
 		{
@@ -5785,20 +5777,25 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
 			mod->brush.GetPVS = NULL;
 			mod->brush.FatPVS = NULL;
 			mod->brush.BoxTouchingPVS = NULL;
+			mod->brush.BoxTouchingLeafPVS = NULL;
+			mod->brush.BoxTouchingVisibleLeafs = NULL;
+			mod->brush.FindBoxClusters = NULL;
 			mod->brush.LightPoint = NULL;
-			mod->brush.FindNonSolidLocation = Mod_Q3BSP_FindNonSolidLocation;
+			mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
 		}
-		mod->brushq3.data_thismodel = loadmodel->brushq3.data_models + i;
-		mod->brushq3.submodel = i;
+		mod->brush.submodel = i;
 
 		// make the model surface list (used by shadowing/lighting)
-		mod->nummodelsurfaces = mod->brushq3.data_thismodel->numfaces;
-		mod->surfacelist = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
+		mod->firstmodelsurface = mod->brushq3.data_models[i].firstface;
+		mod->nummodelsurfaces = mod->brushq3.data_models[i].numfaces;
+		mod->firstmodelbrush = mod->brushq3.data_models[i].firstbrush;
+		mod->nummodelbrushes = mod->brushq3.data_models[i].numbrushes;
+		mod->surfacelist = (int *)Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
 		for (j = 0;j < mod->nummodelsurfaces;j++)
-			mod->surfacelist[j] = (mod->brushq3.data_thismodel->firstface - mod->brushq3.data_faces) + j;
+			mod->surfacelist[j] = mod->firstmodelsurface + j;
 
-		VectorCopy(mod->brushq3.data_thismodel->mins, mod->normalmins);
-		VectorCopy(mod->brushq3.data_thismodel->maxs, mod->normalmaxs);
+		VectorCopy(mod->brushq3.data_models[i].mins, mod->normalmins);
+		VectorCopy(mod->brushq3.data_models[i].maxs, mod->normalmaxs);
 		corner[0] = max(fabs(mod->normalmins[0]), fabs(mod->normalmaxs[0]));
 		corner[1] = max(fabs(mod->normalmins[1]), fabs(mod->normalmaxs[1]));
 		corner[2] = max(fabs(mod->normalmins[2]), fabs(mod->normalmaxs[2]));
@@ -5813,28 +5810,26 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
 		mod->radius = modelradius;
 		mod->radius2 = modelradius * modelradius;
 
-		for (j = 0;j < mod->brushq3.data_thismodel->numfaces;j++)
-			if (mod->brushq3.data_thismodel->firstface[j].texture->surfaceflags & Q3SURFACEFLAG_SKY)
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+			if (mod->data_surfaces[j + mod->firstmodelsurface].texture->surfaceflags & Q3SURFACEFLAG_SKY)
 				break;
-		if (j < mod->brushq3.data_thismodel->numfaces)
-			mod->DrawSky = R_Q3BSP_DrawSky;
+		if (j < mod->nummodelsurfaces)
+			mod->DrawSky = R_Q1BSP_DrawSky;
 	}
-
-	Mod_Q3BSP_BuildTextureFaceLists();
 }
 
-void Mod_IBSP_Load(model_t *mod, void *buffer)
+void Mod_IBSP_Load(model_t *mod, void *buffer, void *bufferend)
 {
 	int i = LittleLong(((int *)buffer)[1]);
 	if (i == Q3BSPVERSION)
-		Mod_Q3BSP_Load(mod,buffer);
+		Mod_Q3BSP_Load(mod,buffer, bufferend);
 	else if (i == Q2BSPVERSION)
-		Mod_Q2BSP_Load(mod,buffer);
+		Mod_Q2BSP_Load(mod,buffer, bufferend);
 	else
 		Host_Error("Mod_IBSP_Load: unknown/unsupported version %i\n", i);
 }
 
-void Mod_MAP_Load(model_t *mod, void *buffer)
+void Mod_MAP_Load(model_t *mod, void *buffer, void *bufferend)
 {
 	Host_Error("Mod_MAP_Load: not yet implemented\n");
 }