X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=model_brush.c;h=4815fbe2c40bff3436767e739d8d7503337168d2;hb=26a744901b44783350d7af3cb429544fed04506e;hp=92244c451766043a293caeeef637f281afffb23c;hpb=5715fdeb47caa02252ab9b6c0895310e43bea716;p=xonotic%2Fdarkplaces.git

diff --git a/model_brush.c b/model_brush.c
index 92244c45..4815fbe2 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -19,2606 +19,5587 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "image.h"
+#include "r_shadow.h"
+#include "polygon.h"
+#include "curves.h"
+#include "wad.h"
 
-// note: model_shared.c sets up r_notexture, and r_surf_notexture
-
-qbyte mod_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 r_novis = {0, "r_novis", "0"};
 cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"};
 cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
-cvar_t r_vertexsurfacesthreshold = {CVAR_SAVE, "r_vertexsurfacesthreshold", "0"};
 cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
-cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
-
-#define NUM_DETAILTEXTURES 1
-static rtexture_t *detailtextures[NUM_DETAILTEXTURES];
-static rtexturepool_t *detailtexturepool;
-
-/*
-===============
-Mod_BrushInit
-===============
-*/
-void Mod_BrushInit (void)
+cvar_t r_subdivisions_tolerance = {0, "r_subdivisions_tolerance", "4"};
+cvar_t r_subdivisions_mintess = {0, "r_subdivisions_mintess", "1"};
+cvar_t r_subdivisions_maxtess = {0, "r_subdivisions_maxtess", "1024"};
+cvar_t r_subdivisions_maxvertices = {0, "r_subdivisions_maxvertices", "65536"};
+cvar_t r_subdivisions_collision_tolerance = {0, "r_subdivisions_collision_tolerance", "15"};
+cvar_t r_subdivisions_collision_mintess = {0, "r_subdivisions_collision_mintess", "1"};
+cvar_t r_subdivisions_collision_maxtess = {0, "r_subdivisions_collision_maxtess", "1024"};
+cvar_t r_subdivisions_collision_maxvertices = {0, "r_subdivisions_collision_maxvertices", "4225"};
+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"};
+
+void Mod_BrushInit(void)
 {
 //	Cvar_RegisterVariable(&r_subdivide_size);
 	Cvar_RegisterVariable(&halflifebsp);
 	Cvar_RegisterVariable(&r_novis);
 	Cvar_RegisterVariable(&r_miplightmaps);
 	Cvar_RegisterVariable(&r_lightmaprgba);
-	Cvar_RegisterVariable(&r_vertexsurfacesthreshold);
 	Cvar_RegisterVariable(&r_nosurftextures);
-	Cvar_RegisterVariable(&r_sortsurfaces);
-	memset(mod_novis, 0xff, sizeof(mod_novis));
-}
-
-void Mod_BrushStartup (void)
-{
-	int i, x, y, light;
-	float vc[3], vx[3], vy[3], vn[3], lightdir[3];
-#define DETAILRESOLUTION 256
-	qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION];
-	detailtexturepool = R_AllocTexturePool();
-	lightdir[0] = 0.5;
-	lightdir[1] = 1;
-	lightdir[2] = -0.25;
-	VectorNormalize(lightdir);
-	for (i = 0;i < NUM_DETAILTEXTURES;i++)
-	{
-		fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4);
-		for (y = 0;y < DETAILRESOLUTION;y++)
-		{
-			for (x = 0;x < DETAILRESOLUTION;x++)
-			{
-				vc[0] = x;
-				vc[1] = y;
-				vc[2] = noise[y][x] * (1.0f / 32.0f);
-				vx[0] = x + 1;
-				vx[1] = y;
-				vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f);
-				vy[0] = x;
-				vy[1] = y + 1;
-				vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f);
-				VectorSubtract(vx, vc, vx);
-				VectorSubtract(vy, vc, vy);
-				CrossProduct(vx, vy, vn);
-				VectorNormalize(vn);
-				light = 128 - DotProduct(vn, lightdir) * 128;
-				light = bound(0, light, 255);
-				data[y][x][0] = data[y][x][1] = data[y][x][2] = light;
-				data[y][x][3] = 255;
-			}
-		}
-		detailtextures[i] = R_LoadTexture(detailtexturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE);
-	}
+	Cvar_RegisterVariable(&r_subdivisions_tolerance);
+	Cvar_RegisterVariable(&r_subdivisions_mintess);
+	Cvar_RegisterVariable(&r_subdivisions_maxtess);
+	Cvar_RegisterVariable(&r_subdivisions_maxvertices);
+	Cvar_RegisterVariable(&r_subdivisions_collision_tolerance);
+	Cvar_RegisterVariable(&r_subdivisions_collision_mintess);
+	Cvar_RegisterVariable(&r_subdivisions_collision_maxtess);
+	Cvar_RegisterVariable(&r_subdivisions_collision_maxvertices);
+	Cvar_RegisterVariable(&mod_q3bsp_curves_collisions);
+	Cvar_RegisterVariable(&mod_q3bsp_optimizedtraceline);
+	Cvar_RegisterVariable(&mod_q3bsp_debugtracebrush);
 }
 
-void Mod_BrushShutdown (void)
+static mleaf_t *Mod_Q1BSP_PointInLeaf(model_t *model, const vec3_t p)
 {
-	int i;
-	for (i = 0;i < NUM_DETAILTEXTURES;i++)
-		R_FreeTexture(detailtextures[i]);
-	R_FreeTexturePool(&detailtexturepool);
-}
+	mnode_t *node;
 
-/*
-===============
-Mod_PointInLeaf
-===============
-*/
-mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
-{
-	mnode_t		*node;
+	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->nodes + model->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];
+	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;
 }
 
-void Mod_FindNonSolidLocation(vec3_t pos, model_t *mod)
+static void Mod_Q1BSP_AmbientSoundLevelsForPoint(model_t *model, const vec3_t p, qbyte *out, int outsize)
 {
-	if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[0]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[0]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[0]-=1;
-	pos[1]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[1]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[1]-=1;
-	pos[2]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[2]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-	pos[2]-=1;
+	int i;
+	mleaf_t *leaf;
+	leaf = Mod_Q1BSP_PointInLeaf(model, p);
+	if (leaf)
+	{
+		i = min(outsize, (int)sizeof(leaf->ambient_sound_level));
+		if (i)
+		{
+			memcpy(out, leaf->ambient_sound_level, i);
+			out += i;
+			outsize -= i;
+		}
+	}
+	if (outsize)
+		memset(out, 0, outsize);
 }
 
-
-/*
-===================
-Mod_DecompressVis
-===================
-*/
-static qbyte *Mod_DecompressVis (qbyte *in, model_t *model)
+static int Mod_Q1BSP_BoxTouchingPVS(model_t *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs)
 {
-	static qbyte decompressed[MAX_MAP_LEAFS/8];
-	int c;
-	qbyte *out;
-	int row;
-
-	row = (model->numleafs+7)>>3;
-	out = decompressed;
-
-	do
+	int clusterindex, side, nodestackindex = 0;
+	mnode_t *node, *nodestack[1024];
+	if (!model->brush.num_pvsclusters)
+		return true;
+	node = model->brush.data_nodes;
+	for (;;)
 	{
-		if (*in)
+		if (node->plane)
 		{
-			*out++ = *in++;
-			continue;
+			// 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];
+			}
 		}
-
-		c = in[1];
-		in += 2;
-		while (c)
+		else
 		{
-			*out++ = 0;
-			c--;
+			// leaf - check cluster bit
+			clusterindex = ((mleaf_t *)node)->clusterindex;
+			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];
+			}
 		}
-	} while (out - decompressed < row);
-
-	return decompressed;
-}
-
-qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
-{
-	if (r_novis.integer || leaf == model->leafs || leaf->compressed_vis == NULL)
-		return mod_novis;
-	return Mod_DecompressVis (leaf->compressed_vis, model);
+	}
+	// it is not visible
+	return false;
 }
 
-/*
-=================
-Mod_LoadTextures
-=================
-*/
-static void Mod_LoadTextures (lump_t *l)
+static int Mod_Q1BSP_BoxTouchingLeafPVS(model_t *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs)
 {
-	int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
-	miptex_t *dmiptex;
-	texture_t *tx, *tx2, *anims[10], *altanims[10];
-	dmiptexlump_t *m;
-	qbyte *data, *mtdata, *data2;
-	char name[256];
-
-	loadmodel->textures = NULL;
-
-	if (!l->filelen)
-		return;
-
-	m = (dmiptexlump_t *)(mod_base + l->fileofs);
-
-	m->nummiptex = LittleLong (m->nummiptex);
-
-	// add two slots for notexture walls and notexture liquids
-	loadmodel->numtextures = m->nummiptex + 2;
-	loadmodel->textures = Mem_Alloc(loadmodel->mempool, loadmodel->numtextures * sizeof(*loadmodel->textures));
-
-	// fill out all slots with notexture
-	for (i = 0;i < loadmodel->numtextures;i++)
-	{
-		loadmodel->textures[i] = tx = Mem_Alloc(loadmodel->mempool, sizeof(texture_t));
-		tx->width = 16;
-		tx->height = 16;
-		tx->texture = r_notexture;
-		if (i == loadmodel->numtextures - 1)
-			tx->flags = SURF_DRAWTURB | SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID;
-	}
-
-	// just to work around bounds checking when debugging with it (array index out of bounds error thing)
-	dofs = m->dataofs;
-	// LordHavoc: mostly rewritten map texture loader
-	for (i = 0;i < m->nummiptex;i++)
+	int clusterindex, side, nodestackindex = 0;
+	mnode_t *node, *nodestack[1024];
+	if (!model->brush.num_leafs)
+		return true;
+	node = model->brush.data_nodes;
+	for (;;)
 	{
-		dofs[i] = LittleLong(dofs[i]);
-		if (dofs[i] == -1 || r_nosurftextures.integer)
-			continue;
-		dmiptex = (miptex_t *)((qbyte *)m + dofs[i]);
-
-		// make sure name is no more than 15 characters
-		for (j = 0;dmiptex->name[j] && j < 15;j++)
-			name[j] = dmiptex->name[j];
-		name[j] = 0;
-
-		mtwidth = LittleLong (dmiptex->width);
-		mtheight = LittleLong (dmiptex->height);
-		mtdata = NULL;
-		j = LittleLong (dmiptex->offsets[0]);
-		if (j)
+		if (node->plane)
 		{
-			// texture included
-			if (j < 40 || j + mtwidth * mtheight > l->filelen)
+			// node - recurse down the BSP tree
+			side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
+			if (side < 2)
 			{
-				Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
-				continue;
+				// 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];
 			}
-			mtdata = (qbyte *)dmiptex + j;
 		}
-
-		if ((mtwidth & 15) || (mtheight & 15))
-			Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
-
-		// LordHavoc: force all names to lowercase
-		for (j = 0;name[j];j++)
-			if (name[j] >= 'A' && name[j] <= 'Z')
-				name[j] += 'a' - 'A';
-
-		tx = loadmodel->textures[i];
-		strcpy(tx->name, name);
-		tx->width = mtwidth;
-		tx->height = mtheight;
-		tx->texture = NULL;
-		tx->glowtexture = NULL;
-		tx->fogtexture = NULL;
-
-		if (!tx->name[0])
+		else
 		{
-			sprintf(tx->name, "unnamed%i", i);
-			Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
+			// leaf - check cluster bit
+			clusterindex = ((mleaf_t *)node) - model->brush.data_leafs;
+			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];
+			}
 		}
+	}
+	// it is not visible
+	return false;
+}
 
-		// LordHavoc: HL sky textures are entirely different than quake
-		if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
+static int Mod_Q1BSP_BoxTouchingVisibleLeafs(model_t *model, const qbyte *visibleleafs, const vec3_t mins, const vec3_t maxs)
+{
+	int side, nodestackindex = 0;
+	mnode_t *node, *nodestack[1024];
+	node = model->brush.data_nodes;
+	for (;;)
+	{
+		if (node->plane)
 		{
-			if (loadmodel->isworldmodel)
+			// node - recurse down the BSP tree
+			side = BoxOnPlaneSide(mins, maxs, node->plane) - 1;
+			if (side < 2)
 			{
-				data = loadimagepixels(tx->name, false, 0, 0);
-				if (data)
-				{
-					if (image_width == 256 && image_height == 128)
-					{
- 						R_InitSky (data, 4);
-						Mem_Free(data);
-					}
-					else
-					{
-						Mem_Free(data);
-						Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
-						if (mtdata != NULL)
-							R_InitSky (mtdata, 1);
-					}
-				}
-				else if (mtdata != NULL)
-					R_InitSky (mtdata, 1);
+				// 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 if ((tx->texture = loadtextureimagewithmask(loadmodel->texturepool, tx->name, 0, 0, false, true, true)))
-		{
-			tx->fogtexture = image_masktex;
-			strcpy(name, tx->name);
-			strcat(name, "_glow");
-			tx->glowtexture = loadtextureimage(loadmodel->texturepool, name, 0, 0, false, true, true);
 		}
 		else
 		{
-			if (loadmodel->ishlbsp)
+			// leaf - check if it is visible
+			if (visibleleafs[(mleaf_t *)node - model->brush.data_leafs])
 			{
-				if (mtdata && (data = W_ConvertWAD3Texture(dmiptex)))
-				{
-					// texture included
-					tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-					if (R_TextureHasAlpha(tx->texture))
-					{
-						// make mask texture
-						for (j = 0;j < image_width * image_height;j++)
-							data[j*4+0] = data[j*4+1] = data[j*4+2] = 255;
-						strcpy(name, tx->name);
-						strcat(name, "_fog");
-						tx->fogtexture = R_LoadTexture (loadmodel->texturepool, name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-					}
-					Mem_Free(data);
-				}
-				else if ((data = W_GetTexture(tx->name)))
-				{
-					// get the size from the wad texture
-					tx->width = image_width;
-					tx->height = image_height;
-					tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-					if (R_TextureHasAlpha(tx->texture))
-					{
-						// make mask texture
-						for (j = 0;j < image_width * image_height;j++)
-							data[j*4+0] = data[j*4+1] = data[j*4+2] = 255;
-						strcpy(name, tx->name);
-						strcat(name, "_fog");
-						tx->fogtexture = R_LoadTexture (loadmodel->texturepool, name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-					}
-					Mem_Free(data);
-				}
-				else
-				{
-					tx->width = 16;
-					tx->height = 16;
-					tx->texture = r_notexture;
-				}
+				// it is visible, return immediately with the news
+				return true;
 			}
 			else
 			{
-				if (mtdata) // texture included
+				// 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
+{
+	vec3_t center;
+	vec_t radius;
+	vec3_t nudge;
+	vec_t bestdist;
+	model_t *model;
+}
+findnonsolidlocationinfo_t;
+
+static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *info, mleaf_t *leaf)
+{
+	int i, surfacenum, k, *tri, *mark;
+	float dist, f, vert[3][3], edge[3][3], facenormal[3], edgenormal[3][3], point[3];
+	msurface_t *surface;
+	for (surfacenum = 0, mark = leaf->firstleafsurface;surfacenum < leaf->numleafsurfaces;surfacenum++, mark++)
+	{
+		surface = info->model->data_surfaces + *mark;
+		if (surface->texture->supercontents & SUPERCONTENTS_SOLID)
+		{
+			for (k = 0;k < surface->num_triangles;k++)
+			{
+				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])
 				{
-					int fullbrights;
-					data = mtdata;
-					fullbrights = false;
-					if (r_fullbrights.value && tx->name[0] != '*')
+					VectorNormalize(facenormal);
+					f = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
+					if (f <= info->bestdist && f >= -info->bestdist)
 					{
-						for (j = 0;j < tx->width*tx->height;j++)
+						VectorSubtract(vert[0], vert[2], edge[2]);
+						VectorNormalize(edge[0]);
+						VectorNormalize(edge[1]);
+						VectorNormalize(edge[2]);
+						CrossProduct(facenormal, edge[0], edgenormal[0]);
+						CrossProduct(facenormal, edge[1], edgenormal[1]);
+						CrossProduct(facenormal, edge[2], edgenormal[2]);
+						// face distance
+						if (DotProduct(info->center, edgenormal[0]) < DotProduct(vert[0], edgenormal[0])
+						 && DotProduct(info->center, edgenormal[1]) < DotProduct(vert[1], edgenormal[1])
+						 && DotProduct(info->center, edgenormal[2]) < DotProduct(vert[2], edgenormal[2]))
 						{
-							if (data[j] >= 224) // fullbright
+							// we got lucky, the center is within the face
+							dist = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
+							if (dist < 0)
 							{
-								fullbrights = true;
-								break;
+								dist = -dist;
+								if (info->bestdist > dist)
+								{
+									info->bestdist = dist;
+									VectorScale(facenormal, (info->radius - -dist), info->nudge);
+								}
+							}
+							else
+							{
+								if (info->bestdist > dist)
+								{
+									info->bestdist = dist;
+									VectorScale(facenormal, (info->radius - dist), info->nudge);
+								}
+							}
+						}
+						else
+						{
+							// check which edge or vertex the center is nearest
+							for (i = 0;i < 3;i++)
+							{
+								f = DotProduct(info->center, edge[i]);
+								if (f >= DotProduct(vert[0], edge[i])
+								 && f <= DotProduct(vert[1], edge[i]))
+								{
+									// on edge
+									VectorMA(info->center, -f, edge[i], point);
+									dist = sqrt(DotProduct(point, point));
+									if (info->bestdist > dist)
+									{
+										info->bestdist = dist;
+										VectorScale(point, (info->radius / dist), info->nudge);
+									}
+									// skip both vertex checks
+									// (both are further away than this edge)
+									i++;
+								}
+								else
+								{
+									// not on edge, check first vertex of edge
+									VectorSubtract(info->center, vert[i], point);
+									dist = sqrt(DotProduct(point, point));
+									if (info->bestdist > dist)
+									{
+										info->bestdist = dist;
+										VectorScale(point, (info->radius / dist), info->nudge);
+									}
+								}
 							}
 						}
 					}
-					if (fullbrights)
-					{
-						data2 = Mem_Alloc(loadmodel->mempool, tx->width*tx->height);
-						for (j = 0;j < tx->width*tx->height;j++)
-							data2[j] = data[j] >= 224 ? 0 : data[j]; // no fullbrights
-						tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, tx->width, tx->height, data2, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE);
-						strcpy(name, tx->name);
-						strcat(name, "_glow");
-						for (j = 0;j < tx->width*tx->height;j++)
-							data2[j] = data[j] >= 224 ? data[j] : 0; // only fullbrights
-						tx->glowtexture = R_LoadTexture (loadmodel->texturepool, name, tx->width, tx->height, data2, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE);
-						Mem_Free(data2);
-					}
-					else
-						tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, tx->width, tx->height, data, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE);
-				}
-				else // no texture, and no external replacement texture was found
-				{
-					tx->width = 16;
-					tx->height = 16;
-					tx->texture = r_notexture;
 				}
 			}
 		}
+	}
+}
 
-		if (tx->name[0] == '*')
-		{
-			tx->flags |= (SURF_DRAWTURB | SURF_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 | SURF_CLIPSOLID);
-		}
-		else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
-			tx->flags |= (SURF_DRAWSKY | SURF_CLIPSOLID);
-		else
-		{
-			tx->flags |= SURF_LIGHTMAP;
-			if (!R_TextureHasAlpha(tx->texture))
-				tx->flags |= SURF_CLIPSOLID;
-		}
+static void Mod_Q1BSP_FindNonSolidLocation_r(findnonsolidlocationinfo_t *info, mnode_t *node)
+{
+	if (node->plane)
+	{
+		float f = PlaneDiff(info->center, node->plane);
+		if (f >= -info->bestdist)
+			Mod_Q1BSP_FindNonSolidLocation_r(info, node->children[0]);
+		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);
+	}
+}
 
-		tx->detailtexture = detailtextures[i % NUM_DETAILTEXTURES];
+static void Mod_Q1BSP_FindNonSolidLocation(model_t *model, const vec3_t in, vec3_t out, float radius)
+{
+	int i;
+	findnonsolidlocationinfo_t info;
+	if (model == NULL)
+	{
+		VectorCopy(in, out);
+		return;
+	}
+	VectorCopy(in, info.center);
+	info.radius = radius;
+	info.model = model;
+	i = 0;
+	do
+	{
+		VectorClear(info.nudge);
+		info.bestdist = radius;
+		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);
+	VectorCopy(info.center, out);
+}
 
-	// sequence the animations
-	for (i = 0;i < m->nummiptex;i++)
+int Mod_Q1BSP_SuperContentsFromNativeContents(model_t *model, int nativecontents)
+{
+	switch(nativecontents)
 	{
-		tx = loadmodel->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])
-			continue;	// already sequenced
+		case CONTENTS_EMPTY:
+			return 0;
+		case CONTENTS_SOLID:
+			return SUPERCONTENTS_SOLID;
+		case CONTENTS_WATER:
+			return SUPERCONTENTS_WATER;
+		case CONTENTS_SLIME:
+			return SUPERCONTENTS_SLIME;
+		case CONTENTS_LAVA:
+			return SUPERCONTENTS_LAVA;
+		case CONTENTS_SKY:
+			return SUPERCONTENTS_SKY;
+	}
+	return 0;
+}
 
-		// find the number of frames in the animation
-		memset (anims, 0, sizeof(anims));
-		memset (altanims, 0, sizeof(altanims));
+int Mod_Q1BSP_NativeContentsFromSuperContents(model_t *model, int supercontents)
+{
+	if (supercontents & SUPERCONTENTS_SOLID)
+		return CONTENTS_SOLID;
+	if (supercontents & SUPERCONTENTS_SKY)
+		return CONTENTS_SKY;
+	if (supercontents & SUPERCONTENTS_LAVA)
+		return CONTENTS_LAVA;
+	if (supercontents & SUPERCONTENTS_SLIME)
+		return CONTENTS_SLIME;
+	if (supercontents & SUPERCONTENTS_WATER)
+		return CONTENTS_WATER;
+	return CONTENTS_EMPTY;
+}
 
-		for (j = i;j < m->nummiptex;j++)
-		{
-			tx2 = loadmodel->textures[j];
-			if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2))
-				continue;
+typedef struct
+{
+	// the hull we're tracing through
+	const hull_t *hull;
 
-			num = tx2->name[1];
-			if (num >= '0' && num <= '9')
-				anims[num - '0'] = tx2;
-			else if (num >= 'a' && num <= 'j')
-				altanims[num - 'a'] = tx2;
-			else
-				Con_Printf ("Bad animating texture %s\n", tx->name);
-		}
+	// the trace structure to fill in
+	trace_t *trace;
 
-		max = altmax = 0;
-		for (j = 0;j < 10;j++)
-		{
-			if (anims[j])
-				max = j + 1;
-			if (altanims[j])
-				altmax = j + 1;
-		}
-		//Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
+	// start, end, and end - start (in model space)
+	double start[3];
+	double end[3];
+	double dist[3];
+}
+RecursiveHullCheckTraceInfo_t;
 
-		incomplete = false;
-		for (j = 0;j < max;j++)
+// 1/32 epsilon to keep floating point happy
+#define DIST_EPSILON (0.03125)
+
+#define HULLCHECKSTATE_EMPTY 0
+#define HULLCHECKSTATE_SOLID 1
+#define HULLCHECKSTATE_DONE 2
+
+static int Mod_Q1BSP_RecursiveHullCheck(RecursiveHullCheckTraceInfo_t *t, int num, double p1f, double p2f, double p1[3], double p2[3])
+{
+	// status variables, these don't need to be saved on the stack when
+	// recursing...  but are because this should be thread-safe
+	// (note: tracing against a bbox is not thread-safe, yet)
+	int ret;
+	mplane_t *plane;
+	double t1, t2;
+
+	// variables that need to be stored on the stack when recursing
+	dclipnode_t *node;
+	int side;
+	double midf, mid[3];
+
+	// LordHavoc: a goto!  everyone flee in terror... :)
+loc0:
+	// check for empty
+	if (num < 0)
+	{
+		num = Mod_Q1BSP_SuperContentsFromNativeContents(NULL, num);
+		if (!t->trace->startfound)
 		{
-			if (!anims[j])
-			{
-				Con_Printf ("Missing frame %i of %s\n", j, tx->name);
-				incomplete = true;
-			}
+			t->trace->startfound = true;
+			t->trace->startsupercontents |= num;
 		}
-		for (j = 0;j < altmax;j++)
+		if (num & SUPERCONTENTS_LIQUIDSMASK)
+			t->trace->inwater = true;
+		if (num == 0)
+			t->trace->inopen = true;
+		if (num & t->trace->hitsupercontentsmask)
 		{
-			if (!altanims[j])
-			{
-				Con_Printf ("Missing altframe %i of %s\n", j, tx->name);
-				incomplete = true;
-			}
+			// if the first leaf is solid, set startsolid
+			if (t->trace->allsolid)
+				t->trace->startsolid = true;
+#if COLLISIONPARANOID >= 3
+			Con_Print("S");
+#endif
+			return HULLCHECKSTATE_SOLID;
 		}
-		if (incomplete)
-			continue;
+		else
+		{
+			t->trace->allsolid = false;
+#if COLLISIONPARANOID >= 3
+			Con_Print("E");
+#endif
+			return HULLCHECKSTATE_EMPTY;
+		}
+	}
 
-		if (altmax < 1)
+	// find the point distances
+	node = t->hull->clipnodes + num;
+
+	plane = t->hull->planes + node->planenum;
+	if (plane->type < 3)
+	{
+		t1 = p1[plane->type] - plane->dist;
+		t2 = p2[plane->type] - plane->dist;
+	}
+	else
+	{
+		t1 = DotProduct (plane->normal, p1) - plane->dist;
+		t2 = DotProduct (plane->normal, p2) - plane->dist;
+	}
+
+	if (t1 < 0)
+	{
+		if (t2 < 0)
 		{
-			// if there is no alternate animation, duplicate the primary
-			// animation into the alternate
-			altmax = max;
-			for (k = 0;k < 10;k++)
-				altanims[k] = anims[k];
+#if COLLISIONPARANOID >= 3
+			Con_Print("<");
+#endif
+			num = node->children[1];
+			goto loc0;
+		}
+		side = 1;
+	}
+	else
+	{
+		if (t2 >= 0)
+		{
+#if COLLISIONPARANOID >= 3
+			Con_Print(">");
+#endif
+			num = node->children[0];
+			goto loc0;
 		}
+		side = 0;
+	}
 
-		// link together the primary animation
-		for (j = 0;j < max;j++)
+	// the line intersects, find intersection point
+	// LordHavoc: this uses the original trace for maximum accuracy
+#if COLLISIONPARANOID >= 3
+	Con_Print("M");
+#endif
+	if (plane->type < 3)
+	{
+		t1 = t->start[plane->type] - plane->dist;
+		t2 = t->end[plane->type] - plane->dist;
+	}
+	else
+	{
+		t1 = DotProduct (plane->normal, t->start) - plane->dist;
+		t2 = DotProduct (plane->normal, t->end) - plane->dist;
+	}
+
+	midf = t1 / (t1 - t2);
+	midf = bound(p1f, midf, p2f);
+	VectorMA(t->start, midf, t->dist, mid);
+
+	// recurse both sides, front side first
+	ret = Mod_Q1BSP_RecursiveHullCheck(t, node->children[side], p1f, midf, p1, mid);
+	// if this side is not empty, return what it is (solid or done)
+	if (ret != HULLCHECKSTATE_EMPTY)
+		return ret;
+
+	ret = Mod_Q1BSP_RecursiveHullCheck(t, node->children[side ^ 1], midf, p2f, mid, p2);
+	// if other side is not solid, return what it is (empty or done)
+	if (ret != HULLCHECKSTATE_SOLID)
+		return ret;
+
+	// front is air and back is solid, this is the impact point...
+	if (side)
+	{
+		t->trace->plane.dist = -plane->dist;
+		VectorNegate (plane->normal, t->trace->plane.normal);
+	}
+	else
+	{
+		t->trace->plane.dist = plane->dist;
+		VectorCopy (plane->normal, t->trace->plane.normal);
+	}
+
+	// calculate the true fraction
+	t1 = DotProduct(t->trace->plane.normal, t->start) - t->trace->plane.dist;
+	t2 = DotProduct(t->trace->plane.normal, t->end) - t->trace->plane.dist;
+	midf = t1 / (t1 - t2);
+	t->trace->realfraction = bound(0, midf, 1);
+
+	// calculate the return fraction which is nudged off the surface a bit
+	midf = (t1 - DIST_EPSILON) / (t1 - t2);
+	t->trace->fraction = bound(0, midf, 1);
+
+#if COLLISIONPARANOID >= 3
+	Con_Print("D");
+#endif
+	return HULLCHECKSTATE_DONE;
+}
+
+#if COLLISIONPARANOID < 2
+static int Mod_Q1BSP_RecursiveHullCheckPoint(RecursiveHullCheckTraceInfo_t *t, int num)
+{
+	while (num >= 0)
+		num = t->hull->clipnodes[num].children[(t->hull->planes[t->hull->clipnodes[num].planenum].type < 3 ? t->start[t->hull->planes[t->hull->clipnodes[num].planenum].type] : DotProduct(t->hull->planes[t->hull->clipnodes[num].planenum].normal, t->start)) < t->hull->planes[t->hull->clipnodes[num].planenum].dist];
+	num = Mod_Q1BSP_SuperContentsFromNativeContents(NULL, num);
+	t->trace->startsupercontents |= num;
+	if (num & SUPERCONTENTS_LIQUIDSMASK)
+		t->trace->inwater = true;
+	if (num == 0)
+		t->trace->inopen = true;
+	if (num & t->trace->hitsupercontentsmask)
+	{
+		t->trace->allsolid = t->trace->startsolid = true;
+		return HULLCHECKSTATE_SOLID;
+	}
+	else
+	{
+		t->trace->allsolid = t->trace->startsolid = false;
+		return HULLCHECKSTATE_EMPTY;
+	}
+}
+#endif
+
+static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask)
+{
+	// this function currently only supports same size start and end
+	double boxsize[3];
+	RecursiveHullCheckTraceInfo_t rhc;
+
+	memset(&rhc, 0, sizeof(rhc));
+	memset(trace, 0, sizeof(trace_t));
+	rhc.trace = trace;
+	rhc.trace->hitsupercontentsmask = hitsupercontentsmask;
+	rhc.trace->fraction = 1;
+	rhc.trace->realfraction = 1;
+	rhc.trace->allsolid = true;
+	VectorSubtract(boxstartmaxs, boxstartmins, boxsize);
+	if (boxsize[0] < 3)
+		rhc.hull = &model->brushq1.hulls[0]; // 0x0x0
+	else if (model->brush.ishlbsp)
+	{
+		// LordHavoc: this has to have a minor tolerance (the .1) because of
+		// minor float precision errors from the box being transformed around
+		if (boxsize[0] < 32.1)
 		{
-			tx2 = anims[j];
-			tx2->animated = true;
-			tx2->anim_total[0] = max;
-			tx2->anim_total[1] = altmax;
-			for (k = 0;k < 10;k++)
-			{
-				tx2->anim_frames[0][k] = anims[k];
-				tx2->anim_frames[1][k] = altanims[k];
-			}
+			if (boxsize[2] < 54) // pick the nearest of 36 or 72
+				rhc.hull = &model->brushq1.hulls[3]; // 32x32x36
+			else
+				rhc.hull = &model->brushq1.hulls[1]; // 32x32x72
 		}
+		else
+			rhc.hull = &model->brushq1.hulls[2]; // 64x64x64
+	}
+	else
+	{
+		// LordHavoc: this has to have a minor tolerance (the .1) because of
+		// minor float precision errors from the box being transformed around
+		if (boxsize[0] < 32.1)
+			rhc.hull = &model->brushq1.hulls[1]; // 32x32x56
+		else
+			rhc.hull = &model->brushq1.hulls[2]; // 64x64x88
+	}
+	VectorSubtract(boxstartmins, rhc.hull->clip_mins, rhc.start);
+	VectorSubtract(boxendmins, rhc.hull->clip_mins, rhc.end);
+	VectorSubtract(rhc.end, rhc.start, rhc.dist);
+#if COLLISIONPARANOID >= 2
+	Con_Printf("t(%f %f %f,%f %f %f,%i %f %f %f)", rhc.start[0], rhc.start[1], rhc.start[2], rhc.end[0], rhc.end[1], rhc.end[2], rhc.hull - model->brushq1.hulls, rhc.hull->clip_mins[0], rhc.hull->clip_mins[1], rhc.hull->clip_mins[2]);
+	Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
+	Con_Print("\n");
+#else
+	if (DotProduct(rhc.dist, rhc.dist))
+		Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
+	else
+		Mod_Q1BSP_RecursiveHullCheckPoint(&rhc, rhc.hull->firstclipnode);
+#endif
+}
 
-		// if there really is an alternate anim...
-		if (anims[0] != altanims[0])
+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
+	colbrushf_t cbox;
+	colplanef_t cbox_planes[6];
+	cbox.supercontents = boxsupercontents;
+	cbox.numplanes = 6;
+	cbox.numpoints = 0;
+	cbox.numtriangles = 0;
+	cbox.planes = cbox_planes;
+	cbox.points = NULL;
+	cbox.elements = NULL;
+	cbox.markframe = 0;
+	cbox.mins[0] = 0;
+	cbox.mins[1] = 0;
+	cbox.mins[2] = 0;
+	cbox.maxs[0] = 0;
+	cbox.maxs[1] = 0;
+	cbox.maxs[2] = 0;
+	cbox_planes[0].normal[0] =  1;cbox_planes[0].normal[1] =  0;cbox_planes[0].normal[2] =  0;cbox_planes[0].dist = cmaxs[0] - mins[0];
+	cbox_planes[1].normal[0] = -1;cbox_planes[1].normal[1] =  0;cbox_planes[1].normal[2] =  0;cbox_planes[1].dist = maxs[0] - cmins[0];
+	cbox_planes[2].normal[0] =  0;cbox_planes[2].normal[1] =  1;cbox_planes[2].normal[2] =  0;cbox_planes[2].dist = cmaxs[1] - mins[1];
+	cbox_planes[3].normal[0] =  0;cbox_planes[3].normal[1] = -1;cbox_planes[3].normal[2] =  0;cbox_planes[3].dist = maxs[1] - cmins[1];
+	cbox_planes[4].normal[0] =  0;cbox_planes[4].normal[1] =  0;cbox_planes[4].normal[2] =  1;cbox_planes[4].dist = cmaxs[2] - mins[2];
+	cbox_planes[5].normal[0] =  0;cbox_planes[5].normal[1] =  0;cbox_planes[5].normal[2] = -1;cbox_planes[5].dist = maxs[2] - cmins[2];
+	memset(trace, 0, sizeof(trace_t));
+	trace->hitsupercontentsmask = hitsupercontentsmask;
+	trace->fraction = 1;
+	trace->realfraction = 1;
+	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));
+	//To keep everything totally uniform, bounding boxes are turned into small
+	//BSP trees instead of being compared directly.
+	// create a temp hull from bounding box sizes
+	box_planes[0].dist = cmaxs[0] - mins[0];
+	box_planes[1].dist = cmins[0] - maxs[0];
+	box_planes[2].dist = cmaxs[1] - mins[1];
+	box_planes[3].dist = cmins[1] - maxs[1];
+	box_planes[4].dist = cmaxs[2] - mins[2];
+	box_planes[5].dist = cmins[2] - maxs[2];
+#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++)
 		{
-			// link together the alternate animation
-			for (j = 0;j < altmax;j++)
-			{
-				tx2 = altanims[j];
-				tx2->animated = true;
-				// the primary/alternate are reversed here
-				tx2->anim_total[0] = altmax;
-				tx2->anim_total[1] = max;
-				for (k = 0;k < 10;k++)
-				{
-					tx2->anim_frames[0][k] = altanims[k];
-					tx2->anim_frames[1][k] = anims[k];
-				}
-			}
+			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;
+	rhc.trace = trace;
+	rhc.trace->hitsupercontentsmask = hitsupercontentsmask;
+	rhc.trace->fraction = 1;
+	rhc.trace->realfraction = 1;
+	rhc.trace->allsolid = true;
+	VectorCopy(start, rhc.start);
+	VectorCopy(end, rhc.end);
+	VectorSubtract(rhc.end, rhc.start, rhc.dist);
+	Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
+	//VectorMA(rhc.start, rhc.trace->fraction, rhc.dist, rhc.trace->endpos);
+	if (rhc.trace->startsupercontents)
+		rhc.trace->startsupercontents = boxsupercontents;
+#endif
 }
 
-/*
-=================
-Mod_LoadLighting
-=================
-*/
-static void Mod_LoadLighting (lump_t *l)
+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 i;
-	qbyte *in, *out, *data, d;
-	char litfilename[1024];
-	loadmodel->lightdata = NULL;
-	if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight
+	int side, distz = endz - startz;
+	float front, back;
+	float mid;
+
+loc0:
+	if (!node->plane)
+		return false;		// didn't hit anything
+
+	switch (node->plane->type)
 	{
-		loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen);
-		memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
+	case PLANE_X:
+		node = node->children[x < node->plane->dist];
+		goto loc0;
+	case PLANE_Y:
+		node = node->children[y < node->plane->dist];
+		goto loc0;
+	case PLANE_Z:
+		side = startz < node->plane->dist;
+		if ((endz < node->plane->dist) == side)
+		{
+			node = node->children[side];
+			goto loc0;
+		}
+		// found an intersection
+		mid = node->plane->dist;
+		break;
+	default:
+		back = front = x * node->plane->normal[0] + y * node->plane->normal[1];
+		front += startz * node->plane->normal[2];
+		back += endz * node->plane->normal[2];
+		side = front < node->plane->dist;
+		if ((back < node->plane->dist) == side)
+		{
+			node = node->children[side];
+			goto loc0;
+		}
+		// found an intersection
+		mid = startz + distz * (front - node->plane->dist) / (front - back);
+		break;
 	}
-	else // LordHavoc: bsp version 29 (normal white lighting)
+
+	// go down front side
+	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
 	{
-		// LordHavoc: hope is not lost yet, check for a .lit file to load
-		strcpy(litfilename, loadmodel->name);
-		COM_StripExtension(litfilename, litfilename);
-		strcat(litfilename, ".lit");
-		data = (qbyte*) COM_LoadFile (litfilename, false);
-		if (data)
+		// check for impact on this node
+		if (node->numsurfaces)
 		{
-			if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+			int i, ds, dt;
+			msurface_t *surface;
+
+			surface = model->data_surfaces + node->firstsurface;
+			for (i = 0;i < node->numsurfaces;i++, surface++)
 			{
-				i = LittleLong(((int *)data)[1]);
-				if (i == 1)
-				{
-					Con_DPrintf("%s loaded", litfilename);
-					loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, loadsize - 8);
-					memcpy(loadmodel->lightdata, data + 8, loadsize - 8);
-					Mem_Free(data);
-					return;
-				}
-				else
+				if (!(surface->texture->basematerialflags & MATERIALFLAG_WALL) || !surface->lightmapinfo->samples)
+					continue;	// no lightmaps
+
+				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 < surface->lightmapinfo->extents[0] && dt >= 0 && dt < surface->lightmapinfo->extents[1])
 				{
-					Con_Printf("Unknown .lit file version (%d)\n", i);
-					Mem_Free(data);
+					qbyte *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 = ((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 = surface->lightmapinfo->samples + ((dt>>4) * lmwidth + (ds>>4))*3; // LordHavoc: *3 for colored lighting
+
+					for (maps = 0;maps < MAXLIGHTMAPS && surface->lightmapinfo->styles[maps] != 255;maps++)
+					{
+						scale = d_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;
+						r11 += lightmap[line3+3] * scale;g11 += lightmap[line3+4] * scale;b11 += lightmap[line3+5] * scale;
+						lightmap += size3;
+					}
+
+/*
+LordHavoc: here's the readable version of the interpolation
+code, not quite as easy for the compiler to optimize...
+
+dsfrac is the X position in the lightmap pixel, * 16
+dtfrac is the Y position in the lightmap pixel, * 16
+r00 is top left corner, r01 is top right corner
+r10 is bottom left corner, r11 is bottom right corner
+g and b are the same layout.
+r0 and r1 are the top and bottom intermediate results
+
+first we interpolate the top two points, to get the top
+edge sample
+
+	r0 = (((r01-r00) * dsfrac) >> 4) + r00;
+	g0 = (((g01-g00) * dsfrac) >> 4) + g00;
+	b0 = (((b01-b00) * dsfrac) >> 4) + b00;
+
+then we interpolate the bottom two points, to get the
+bottom edge sample
+
+	r1 = (((r11-r10) * dsfrac) >> 4) + r10;
+	g1 = (((g11-g10) * dsfrac) >> 4) + g10;
+	b1 = (((b11-b10) * dsfrac) >> 4) + b10;
+
+then we interpolate the top and bottom samples to get the
+middle sample (the one which was requested)
+
+	r = (((r1-r0) * dtfrac) >> 4) + r0;
+	g = (((g1-g0) * dtfrac) >> 4) + g0;
+	b = (((b1-b0) * dtfrac) >> 4) + b0;
+*/
+
+					ambientcolor[0] += (float) ((((((((r11-r10) * dsfrac) >> 4) + r10)-((((r01-r00) * dsfrac) >> 4) + r00)) * dtfrac) >> 4) + ((((r01-r00) * dsfrac) >> 4) + r00)) * (1.0f / 32768.0f);
+					ambientcolor[1] += (float) ((((((((g11-g10) * dsfrac) >> 4) + g10)-((((g01-g00) * dsfrac) >> 4) + g00)) * dtfrac) >> 4) + ((((g01-g00) * dsfrac) >> 4) + g00)) * (1.0f / 32768.0f);
+					ambientcolor[2] += (float) ((((((((b11-b10) * dsfrac) >> 4) + b10)-((((b01-b00) * dsfrac) >> 4) + b00)) * dtfrac) >> 4) + ((((b01-b00) * dsfrac) >> 4) + b00)) * (1.0f / 32768.0f);
+					return true; // success
 				}
 			}
-			else
-			{
-				if (loadsize == 8)
-					Con_Printf("Empty .lit file, ignoring\n");
-				else
-					Con_Printf("Corrupt .lit file (old version?), ignoring\n");
-				Mem_Free(data);
-			}
-		}
-		// LordHavoc: oh well, expand the white lighting data
-		if (!l->filelen)
-			return;
-		loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen*3);
-		in = loadmodel->lightdata + l->filelen*2; // place the file at the end, so it will not be overwritten until the very last write
-		out = loadmodel->lightdata;
-		memcpy (in, mod_base + l->fileofs, l->filelen);
-		for (i = 0;i < l->filelen;i++)
-		{
-			d = *in++;
-			*out++ = d;
-			*out++ = d;
-			*out++ = d;
 		}
+
+		// go down back side
+		node = node->children[side ^ 1];
+		startz = mid;
+		distz = endz - startz;
+		goto loc0;
 	}
 }
 
-void Mod_LoadLightList(void)
+void Mod_Q1BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
 {
-	int a, n, numlights;
-	char lightsfilename[1024], *s, *t, *lightsstring;
-	mlight_t *e;
+	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);
+}
 
-	strcpy(lightsfilename, loadmodel->name);
-	COM_StripExtension(lightsfilename, lightsfilename);
-	strcat(lightsfilename, ".lights");
-	s = lightsstring = (char *) COM_LoadFile (lightsfilename, false);
-	if (s)
+static void Mod_Q1BSP_DecompressVis(const qbyte *in, const qbyte *inend, qbyte *out, qbyte *outend)
+{
+	int c;
+	qbyte *outstart = out;
+	while (out < outend)
 	{
-		numlights = 0;
-		while (*s)
+		if (in == inend)
 		{
-			while (*s && *s != '\n')
-				s++;
-			if (!*s)
-			{
-				Mem_Free(lightsstring);
-				Host_Error("lights file must end with a newline\n");
-			}
-			s++;
-			numlights++;
+			Con_Printf("Mod_Q1BSP_DecompressVis: input underrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, out - outstart, outend - outstart);
+			return;
 		}
-		loadmodel->lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
-		s = lightsstring;
-		n = 0;
-		while (*s && n < numlights)
+		c = *in++;
+		if (c)
+			*out++ = c;
+		else
 		{
-			t = s;
-			while (*s && *s != '\n')
-				s++;
-			if (!*s)
+			if (in == inend)
 			{
-				Mem_Free(lightsstring);
-				Host_Error("misparsed lights file!\n");
+				Con_Printf("Mod_Q1BSP_DecompressVis: input underrun (during zero-run) on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, out - outstart, outend - outstart);
+				return;
 			}
-			e = loadmodel->lights + n;
-			*s = 0;
-			a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style);
-			*s = '\n';
-			if (a != 14)
+			for (c = *in++;c > 0;c--)
 			{
-				Mem_Free(lightsstring);
-				Host_Error("invalid lights file, found %d parameters on line %i, should be 13 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone style)\n", a, n + 1);
+				if (out == outend)
+				{
+					Con_Printf("Mod_Q1BSP_DecompressVis: output overrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, out - outstart, outend - outstart);
+					return;
+				}
+				*out++ = 0;
 			}
-			s++;
-			n++;
-		}
-		if (*s)
-		{
-			Mem_Free(lightsstring);
-			Host_Error("misparsed lights file!\n");
 		}
-		loadmodel->numlights = numlights;
-		Mem_Free(lightsstring);
 	}
 }
 
-
 /*
-=================
-Mod_LoadVisibility
-=================
+=============
+R_Q1BSP_LoadSplitSky
+
+A sky texture is 256*128, with the right side being a masked overlay
+==============
 */
-static void Mod_LoadVisibility (lump_t *l)
+void R_Q1BSP_LoadSplitSky (qbyte *src, int width, int height, int bytesperpixel)
 {
-	loadmodel->visdata = NULL;
-	if (!l->filelen)
-		return;
-	loadmodel->visdata = Mem_Alloc(loadmodel->mempool, l->filelen);
-	memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen);
-}
+	int i, j;
+	unsigned solidpixels[128*128], alphapixels[128*128];
 
-// used only for HalfLife maps
-void Mod_ParseWadsFromEntityLump(char *data)
-{
-	char key[128], value[4096];
-	char wadname[128];
-	int i, j, k;
-	if (!data)
+	// if sky isn't the right size, just use it as a solid layer
+	if (width != 256 || height != 128)
+	{
+		loadmodel->brush.solidskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_solidtexture", width, height, src, bytesperpixel == 4 ? TEXTYPE_RGBA : TEXTYPE_PALETTE, TEXF_PRECACHE, bytesperpixel == 1 ? palette_complete : NULL);
+		loadmodel->brush.alphaskytexture = NULL;;
 		return;
-	data = COM_Parse(data);
-	if (!data)
-		return; // error
-	if (com_token[0] != '{')
-		return; // error
-	while (1)
+	}
+
+	if (bytesperpixel == 4)
 	{
-		data = COM_Parse(data);
-		if (!data)
-			return; // error
-		if (com_token[0] == '}')
-			break; // end of worldspawn
-		if (com_token[0] == '_')
-			strcpy(key, com_token + 1);
-		else
-			strcpy(key, com_token);
-		while (key[strlen(key)-1] == ' ') // remove trailing spaces
-			key[strlen(key)-1] = 0;
-		data = COM_Parse(data);
-		if (!data)
-			return; // error
-		strcpy(value, com_token);
-		if (!strcmp("wad", key)) // for HalfLife maps
+		for (i = 0;i < 128;i++)
 		{
-			if (loadmodel->ishlbsp)
+			for (j = 0;j < 128;j++)
 			{
-				j = 0;
-				for (i = 0;i < 4096;i++)
-					if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
-						break;
-				if (value[i])
-				{
-					for (;i < 4096;i++)
-					{
-						// ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
-						if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
-							j = i+1;
-						else if (value[i] == ';' || value[i] == 0)
-						{
-							k = value[i];
-							value[i] = 0;
-							strcpy(wadname, "textures/");
-							strcat(wadname, &value[j]);
-							W_LoadTextureWadFile (wadname, false);
-							j = i+1;
-							if (!k)
-								break;
+				solidpixels[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
+				alphapixels[(i*128) + j] = ((unsigned *)src)[i*256+j];
+			}
+		}
+	}
+	else
+	{
+		// make an average value for the back to avoid
+		// a fringe on the top level
+		int p, r, g, b;
+		union
+		{
+			unsigned int i;
+			unsigned char b[4];
+		}
+		rgba;
+		r = g = b = 0;
+		for (i = 0;i < 128;i++)
+		{
+			for (j = 0;j < 128;j++)
+			{
+				rgba.i = palette_complete[src[i*256 + j + 128]];
+				r += rgba.b[0];
+				g += rgba.b[1];
+				b += rgba.b[2];
+			}
+		}
+		rgba.b[0] = r/(128*128);
+		rgba.b[1] = g/(128*128);
+		rgba.b[2] = b/(128*128);
+		rgba.b[3] = 0;
+		for (i = 0;i < 128;i++)
+		{
+			for (j = 0;j < 128;j++)
+			{
+				solidpixels[(i*128) + j] = palette_complete[src[i*256 + j + 128]];
+				alphapixels[(i*128) + j] = (p = src[i*256 + j]) ? palette_complete[p] : rgba.i;
+			}
+		}
+	}
+
+	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);
+}
+
+static void Mod_Q1BSP_LoadTextures(lump_t *l)
+{
+	int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
+	miptex_t *dmiptex;
+	texture_t *tx, *tx2, *anims[10], *altanims[10];
+	dmiptexlump_t *m;
+	qbyte *data, *mtdata;
+	char name[256];
+
+	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->num_textures = m->nummiptex + 2;
+	}
+	else
+	{
+		m = NULL;
+		loadmodel->num_textures = 2;
+	}
+
+	loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_textures * sizeof(texture_t));
+
+	// fill out all slots with notexture
+	for (i = 0, tx = loadmodel->data_textures;i < loadmodel->num_textures;i++, tx++)
+	{
+		strcpy(tx->name, "NO TEXTURE FOUND");
+		tx->width = 16;
+		tx->height = 16;
+		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->basematerialflags |= MATERIALFLAG_WALL;
+			tx->supercontents = SUPERCONTENTS_SOLID;
+		}
+		tx->currentframe = tx;
+	}
+
+	if (!m)
+		return;
+
+	// just to work around bounds checking when debugging with it (array index out of bounds error thing)
+	dofs = m->dataofs;
+	// LordHavoc: mostly rewritten map texture loader
+	for (i = 0;i < m->nummiptex;i++)
+	{
+		dofs[i] = LittleLong(dofs[i]);
+		if (dofs[i] == -1 || r_nosurftextures.integer)
+			continue;
+		dmiptex = (miptex_t *)((qbyte *)m + dofs[i]);
+
+		// make sure name is no more than 15 characters
+		for (j = 0;dmiptex->name[j] && j < 15;j++)
+			name[j] = dmiptex->name[j];
+		name[j] = 0;
+
+		mtwidth = LittleLong(dmiptex->width);
+		mtheight = LittleLong(dmiptex->height);
+		mtdata = NULL;
+		j = LittleLong(dmiptex->offsets[0]);
+		if (j)
+		{
+			// texture included
+			if (j < 40 || j + mtwidth * mtheight > l->filelen)
+			{
+				Con_Printf("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
+				continue;
+			}
+			mtdata = (qbyte *)dmiptex + j;
+		}
+
+		if ((mtwidth & 15) || (mtheight & 15))
+			Con_Printf("warning: texture \"%s\" in \"%s\" is not 16 aligned\n", dmiptex->name, loadmodel->name);
+
+		// LordHavoc: force all names to lowercase
+		for (j = 0;name[j];j++)
+			if (name[j] >= 'A' && name[j] <= 'Z')
+				name[j] += 'a' - 'A';
+
+		tx = loadmodel->data_textures + i;
+		strcpy(tx->name, name);
+		tx->width = mtwidth;
+		tx->height = mtheight;
+
+		if (!tx->name[0])
+		{
+			sprintf(tx->name, "unnamed%i", i);
+			Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
+		}
+
+		// LordHavoc: HL sky textures are entirely different than quake
+		if (!loadmodel->brush.ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
+		{
+			if (loadmodel->isworldmodel)
+			{
+				data = loadimagepixels(tx->name, false, 0, 0);
+				if (data)
+				{
+					R_Q1BSP_LoadSplitSky(data, image_width, image_height, 4);
+					Mem_Free(data);
+				}
+				else if (mtdata != NULL)
+					R_Q1BSP_LoadSplitSky(mtdata, mtwidth, mtheight, 1);
+			}
+		}
+		else
+		{
+			if (!Mod_LoadSkinFrame(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, tx->name[0] != '*', 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;
+					pixels = freepixels = NULL;
+					if (mtdata)
+						pixels = W_ConvertWAD3Texture(dmiptex);
+					if (pixels == NULL)
+						pixels = freepixels = W_GetTexture(tx->name);
+					if (pixels != NULL)
+					{
+						tx->width = image_width;
+						tx->height = image_height;
+						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);
+							for (j = 0;j < image_width * image_height * 4;j += 4)
+							{
+								fogpixels[j + 0] = 255;
+								fogpixels[j + 1] = 255;
+								fogpixels[j + 2] = 255;
+								fogpixels[j + 3] = pixels[j + 3];
+							}
+							tx->skin.fog = R_LoadTexture2D(loadmodel->texturepool, tx->name, image_width, image_height, pixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, NULL);
+							Mem_Free(fogpixels);
 						}
 					}
+					if (freepixels)
+						Mem_Free(freepixels);
+				}
+				else if (mtdata) // texture included
+					Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_PRECACHE | TEXF_PICMIP, false, tx->name[0] != '*', tx->name[0] != '*' && r_fullbrights.integer, mtdata, tx->width, tx->height);
+			}
+		}
+		if (tx->skin.base == NULL)
+		{
+			// no texture found
+			tx->width = 16;
+			tx->height = 16;
+			tx->skin.base = r_texture_notexture;
+		}
+
+		tx->basematerialflags = 0;
+		if (tx->name[0] == '*')
+		{
+			// turb does not block movement
+			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->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->supercontents = SUPERCONTENTS_WATER;
+		}
+		else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
+		{
+			tx->supercontents = SUPERCONTENTS_SKY;
+			tx->basematerialflags |= MATERIALFLAG_SKY;
+		}
+		else
+		{
+			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;
+	}
+
+	// sequence the animations
+	for (i = 0;i < m->nummiptex;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])
+			continue;	// already sequenced
+
+		// find the number of frames in the animation
+		memset(anims, 0, sizeof(anims));
+		memset(altanims, 0, sizeof(altanims));
+
+		for (j = i;j < m->nummiptex;j++)
+		{
+			tx2 = loadmodel->data_textures + j;
+			if (!tx2 || tx2->name[0] != '+' || strcmp(tx2->name+2, tx->name+2))
+				continue;
+
+			num = tx2->name[1];
+			if (num >= '0' && num <= '9')
+				anims[num - '0'] = tx2;
+			else if (num >= 'a' && num <= 'j')
+				altanims[num - 'a'] = tx2;
+			else
+				Con_Printf("Bad animating texture %s\n", tx->name);
+		}
+
+		max = altmax = 0;
+		for (j = 0;j < 10;j++)
+		{
+			if (anims[j])
+				max = j + 1;
+			if (altanims[j])
+				altmax = j + 1;
+		}
+		//Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
+
+		incomplete = false;
+		for (j = 0;j < max;j++)
+		{
+			if (!anims[j])
+			{
+				Con_Printf("Missing frame %i of %s\n", j, tx->name);
+				incomplete = true;
+			}
+		}
+		for (j = 0;j < altmax;j++)
+		{
+			if (!altanims[j])
+			{
+				Con_Printf("Missing altframe %i of %s\n", j, tx->name);
+				incomplete = true;
+			}
+		}
+		if (incomplete)
+			continue;
+
+		if (altmax < 1)
+		{
+			// if there is no alternate animation, duplicate the primary
+			// animation into the alternate
+			altmax = max;
+			for (k = 0;k < 10;k++)
+				altanims[k] = anims[k];
+		}
+
+		// link together the primary animation
+		for (j = 0;j < max;j++)
+		{
+			tx2 = anims[j];
+			tx2->animated = true;
+			tx2->anim_total[0] = max;
+			tx2->anim_total[1] = altmax;
+			for (k = 0;k < 10;k++)
+			{
+				tx2->anim_frames[0][k] = anims[k];
+				tx2->anim_frames[1][k] = altanims[k];
+			}
+		}
+
+		// if there really is an alternate anim...
+		if (anims[0] != altanims[0])
+		{
+			// link together the alternate animation
+			for (j = 0;j < altmax;j++)
+			{
+				tx2 = altanims[j];
+				tx2->animated = true;
+				// the primary/alternate are reversed here
+				tx2->anim_total[0] = altmax;
+				tx2->anim_total[1] = max;
+				for (k = 0;k < 10;k++)
+				{
+					tx2->anim_frames[0][k] = altanims[k];
+					tx2->anim_frames[1][k] = anims[k];
+				}
+			}
+		}
+	}
+}
+
+static void Mod_Q1BSP_LoadLighting(lump_t *l)
+{
+	int i;
+	qbyte *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);
+		for (i=0; i<l->filelen; i++)
+			loadmodel->brushq1.lightdata[i] = mod_base[l->fileofs+i] >>= 1;
+	}
+	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);
+		if (data)
+		{
+			if (fs_filesize == 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);
+					memcpy(loadmodel->brushq1.lightdata, data + 8, fs_filesize - 8);
+					Mem_Free(data);
+					return;
+				}
+				else
+				{
+					Con_Printf("Unknown .lit file version (%d)\n", i);
+					Mem_Free(data);
 				}
 			}
+			else
+			{
+				if (fs_filesize == 8)
+					Con_Print("Empty .lit file, ignoring\n");
+				else
+					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);
+		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);
+		for (i = 0;i < l->filelen;i++)
+		{
+			d = *in++;
+			*out++ = d;
+			*out++ = d;
+			*out++ = d;
+		}
+	}
+}
+
+static void Mod_Q1BSP_LoadLightList(void)
+{
+	int a, n, numlights;
+	char tempchar, *s, *t, *lightsstring, lightsfilename[1024];
+	mlight_t *e;
+
+	strlcpy (lightsfilename, loadmodel->name, sizeof (lightsfilename));
+	FS_StripExtension (lightsfilename, lightsfilename, sizeof(lightsfilename));
+	strlcat (lightsfilename, ".lights", sizeof (lightsfilename));
+	s = lightsstring = (char *) FS_LoadFile(lightsfilename, tempmempool, false);
+	if (s)
+	{
+		numlights = 0;
+		while (*s)
+		{
+			while (*s && *s != '\n' && *s != '\r')
+				s++;
+			if (!*s)
+			{
+				Mem_Free(lightsstring);
+				Con_Printf("lights file must end with a newline\n");
+				return;
+			}
+			s++;
+			numlights++;
+		}
+		loadmodel->brushq1.lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
+		s = lightsstring;
+		n = 0;
+		while (*s && n < numlights)
+		{
+			t = s;
+			while (*s && *s != '\n' && *s != '\r')
+				s++;
+			if (!*s)
+			{
+				Con_Printf("misparsed lights file!\n");
+				break;
+			}
+			e = loadmodel->brushq1.lights + n;
+			tempchar = *s;
+			*s = 0;
+			a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style);
+			*s = tempchar;
+			if (a != 14)
+			{
+				Con_Printf("invalid lights file, found %d parameters on line %i, should be 14 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone distancebias style)\n", a, n + 1);
+				break;
+			}
+			if (*s == '\r')
+				s++;
+			if (*s == '\n')
+				s++;
+			n++;
+		}
+		if (*s)
+			Con_Printf("misparsed lights file!\n");
+		loadmodel->brushq1.numlights = numlights;
+		Mem_Free(lightsstring);
+	}
+}
+
+static void Mod_Q1BSP_LoadVisibility(lump_t *l)
+{
+	loadmodel->brushq1.num_compressedpvs = 0;
+	loadmodel->brushq1.data_compressedpvs = NULL;
+	if (!l->filelen)
+		return;
+	loadmodel->brushq1.num_compressedpvs = l->filelen;
+	loadmodel->brushq1.data_compressedpvs = Mem_Alloc(loadmodel->mempool, l->filelen);
+	memcpy(loadmodel->brushq1.data_compressedpvs, mod_base + l->fileofs, l->filelen);
+}
+
+// used only for HalfLife maps
+static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data)
+{
+	char key[128], value[4096];
+	char wadname[128];
+	int i, j, k;
+	if (!data)
+		return;
+	if (!COM_ParseToken(&data, false))
+		return; // error
+	if (com_token[0] != '{')
+		return; // error
+	while (1)
+	{
+		if (!COM_ParseToken(&data, false))
+			return; // error
+		if (com_token[0] == '}')
+			break; // end of worldspawn
+		if (com_token[0] == '_')
+			strcpy(key, com_token + 1);
+		else
+			strcpy(key, com_token);
+		while (key[strlen(key)-1] == ' ') // remove trailing spaces
+			key[strlen(key)-1] = 0;
+		if (!COM_ParseToken(&data, false))
+			return; // error
+		strcpy(value, com_token);
+		if (!strcmp("wad", key)) // for HalfLife maps
+		{
+			if (loadmodel->brush.ishlbsp)
+			{
+				j = 0;
+				for (i = 0;i < 4096;i++)
+					if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
+						break;
+				if (value[i])
+				{
+					for (;i < 4096;i++)
+					{
+						// ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
+						if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
+							j = i+1;
+						else if (value[i] == ';' || value[i] == 0)
+						{
+							k = value[i];
+							value[i] = 0;
+							strcpy(wadname, "textures/");
+							strcat(wadname, &value[j]);
+							W_LoadTextureWadFile(wadname, false);
+							j = i+1;
+							if (!k)
+								break;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+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);
+	memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen);
+	if (loadmodel->brush.ishlbsp)
+		Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->brush.entities);
+}
+
+
+static void Mod_Q1BSP_LoadVertexes(lump_t *l)
+{
+	dvertex_t	*in;
+	mvertex_t	*out;
+	int			i, count;
+
+	in = (void *)(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));
+
+	loadmodel->brushq1.vertexes = out;
+	loadmodel->brushq1.numvertexes = count;
+
+	for ( i=0 ; i<count ; i++, in++, out++)
+	{
+		out->position[0] = LittleFloat(in->point[0]);
+		out->position[1] = LittleFloat(in->point[1]);
+		out->position[2] = LittleFloat(in->point[2]);
+	}
+}
+
+static void Mod_Q1BSP_LoadSubmodels(lump_t *l)
+{
+	dmodel_t	*in;
+	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));
+
+	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);
+	}
+}
+
+static void Mod_Q1BSP_LoadEdges(lump_t *l)
+{
+	dedge_t *in;
+	medge_t *out;
+	int 	i, count;
+
+	in = (void *)(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));
+
+	loadmodel->brushq1.edges = out;
+	loadmodel->brushq1.numedges = count;
+
+	for ( i=0 ; i<count ; i++, in++, out++)
+	{
+		out->v[0] = (unsigned short)LittleShort(in->v[0]);
+		out->v[1] = (unsigned short)LittleShort(in->v[1]);
+	}
+}
+
+static void Mod_Q1BSP_LoadTexinfo(lump_t *l)
+{
+	texinfo_t *in;
+	mtexinfo_t *out;
+	int i, j, k, count, miptex;
+
+	in = (void *)(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));
+
+	loadmodel->brushq1.texinfo = out;
+	loadmodel->brushq1.numtexinfo = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+		for (k = 0;k < 2;k++)
+			for (j = 0;j < 4;j++)
+				out->vecs[k][j] = LittleFloat(in->vecs[k][j]);
+
+		miptex = LittleLong(in->miptex);
+		out->flags = LittleLong(in->flags);
+
+		out->texture = NULL;
+		if (loadmodel->data_textures)
+		{
+			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->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->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->data_textures + (loadmodel->num_textures - 2);
+		}
+	}
+}
+
+#if 0
+void BoundPoly(int numverts, float *verts, vec3_t mins, vec3_t maxs)
+{
+	int		i, j;
+	float	*v;
+
+	mins[0] = mins[1] = mins[2] = 9999;
+	maxs[0] = maxs[1] = maxs[2] = -9999;
+	v = verts;
+	for (i = 0;i < numverts;i++)
+	{
+		for (j = 0;j < 3;j++, v++)
+		{
+			if (*v < mins[j])
+				mins[j] = *v;
+			if (*v > maxs[j])
+				maxs[j] = *v;
+		}
+	}
+}
+
+#define MAX_SUBDIVPOLYTRIANGLES 4096
+#define MAX_SUBDIVPOLYVERTS(MAX_SUBDIVPOLYTRIANGLES * 3)
+
+static int subdivpolyverts, subdivpolytriangles;
+static int subdivpolyindex[MAX_SUBDIVPOLYTRIANGLES][3];
+static float subdivpolyvert[MAX_SUBDIVPOLYVERTS][3];
+
+static int subdivpolylookupvert(vec3_t v)
+{
+	int i;
+	for (i = 0;i < subdivpolyverts;i++)
+		if (subdivpolyvert[i][0] == v[0]
+		 && subdivpolyvert[i][1] == v[1]
+		 && subdivpolyvert[i][2] == v[2])
+			return i;
+	if (subdivpolyverts >= MAX_SUBDIVPOLYVERTS)
+		Host_Error("SubDividePolygon: ran out of vertices in buffer, please increase your r_subdivide_size");
+	VectorCopy(v, subdivpolyvert[subdivpolyverts]);
+	return subdivpolyverts++;
+}
+
+static void SubdividePolygon(int numverts, float *verts)
+{
+	int		i, i1, i2, i3, f, b, c, p;
+	vec3_t	mins, maxs, front[256], back[256];
+	float	m, *pv, *cv, dist[256], frac;
+
+	if (numverts > 250)
+		Host_Error("SubdividePolygon: ran out of verts in buffer");
+
+	BoundPoly(numverts, verts, mins, maxs);
+
+	for (i = 0;i < 3;i++)
+	{
+		m = (mins[i] + maxs[i]) * 0.5;
+		m = r_subdivide_size.value * floor(m/r_subdivide_size.value + 0.5);
+		if (maxs[i] - m < 8)
+			continue;
+		if (m - mins[i] < 8)
+			continue;
+
+		// cut it
+		for (cv = verts, c = 0;c < numverts;c++, cv += 3)
+			dist[c] = cv[i] - m;
+
+		f = b = 0;
+		for (p = numverts - 1, c = 0, pv = verts + p * 3, cv = verts;c < numverts;p = c, c++, pv = cv, cv += 3)
+		{
+			if (dist[p] >= 0)
+			{
+				VectorCopy(pv, front[f]);
+				f++;
+			}
+			if (dist[p] <= 0)
+			{
+				VectorCopy(pv, back[b]);
+				b++;
+			}
+			if (dist[p] == 0 || dist[c] == 0)
+				continue;
+			if ((dist[p] > 0) != (dist[c] > 0) )
+			{
+				// clip point
+				frac = dist[p] / (dist[p] - dist[c]);
+				front[f][0] = back[b][0] = pv[0] + frac * (cv[0] - pv[0]);
+				front[f][1] = back[b][1] = pv[1] + frac * (cv[1] - pv[1]);
+				front[f][2] = back[b][2] = pv[2] + frac * (cv[2] - pv[2]);
+				f++;
+				b++;
+			}
+		}
+
+		SubdividePolygon(f, front[0]);
+		SubdividePolygon(b, back[0]);
+		return;
+	}
+
+	i1 = subdivpolylookupvert(verts);
+	i2 = subdivpolylookupvert(verts + 3);
+	for (i = 2;i < numverts;i++)
+	{
+		if (subdivpolytriangles >= MAX_SUBDIVPOLYTRIANGLES)
+		{
+			Con_Print("SubdividePolygon: ran out of triangles in buffer, please increase your r_subdivide_size\n");
+			return;
+		}
+
+		i3 = subdivpolylookupvert(verts + i * 3);
+		subdivpolyindex[subdivpolytriangles][0] = i1;
+		subdivpolyindex[subdivpolytriangles][1] = i2;
+		subdivpolyindex[subdivpolytriangles][2] = i3;
+		i2 = i3;
+		subdivpolytriangles++;
+	}
+}
+
+//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 *surface)
+{
+	int i, j;
+	surfvertex_t *v;
+	surfmesh_t *mesh;
+
+	subdivpolytriangles = 0;
+	subdivpolyverts = 0;
+	SubdividePolygon(surface->num_vertices, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex));
+	if (subdivpolytriangles < 1)
+		Host_Error("Mod_Q1BSP_GenerateWarpMesh: no triangles?\n");
+
+	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);
+	mesh->index = (int *)(mesh->vertex + mesh->num_vertices);
+	memset(mesh->vertex, 0, mesh->num_vertices * sizeof(surfvertex_t));
+
+	for (i = 0;i < mesh->num_triangles;i++)
+		for (j = 0;j < 3;j++)
+			mesh->index[i*3+j] = subdivpolyindex[i][j];
+
+	for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
+	{
+		VectorCopy(subdivpolyvert[i], v->v);
+		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_LoadFaces(lump_t *l)
+{
+	dface_t *in;
+	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);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q1BSP_LoadFaces: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	loadmodel->data_surfaces = Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_t));
+	loadmodel->data_surfaces_lightmapinfo = Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_lightmapinfo_t));
+
+	loadmodel->num_surfaces = count;
+
+	totalverts = 0;
+	totaltris = 0;
+	for (surfacenum = 0, in = (void *)(mod_base + l->fileofs);surfacenum < count;surfacenum++, in++)
+	{
+		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 = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *));
+	loadmodel->meshlist[0] = Mod_AllocSurfMesh(loadmodel->mempool, totalverts, totaltris, true, true, false, false);
+
+	totalverts = 0;
+	totaltris = 0;
+	for (surfacenum = 0, in = (void *)(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);
+		if ((unsigned int) firstedge > (unsigned int) loadmodel->brushq1.numsurfedges || (unsigned int) numedges > (unsigned int) loadmodel->brushq1.numsurfedges || (unsigned int) firstedge + (unsigned int) numedges > (unsigned int) loadmodel->brushq1.numsurfedges)
+			Host_Error("Mod_Q1BSP_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", firstedge, numedges, loadmodel->brushq1.numsurfedges);
+		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);
+		surface->lightmapinfo->texinfo = loadmodel->brushq1.texinfo + i;
+		surface->texture = surface->lightmapinfo->texinfo->texture;
+
+		planenum = LittleShort(in->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_texcoorddetail2f + 2 * surface->num_firstvertex)[i * 2 + 0] = s * (1.0f / 16.0f);
+			(surface->groupmesh->data_texcoorddetail2f + 2 * surface->num_firstvertex)[i * 2 + 1] = t * (1.0f / 16.0f);
+			(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;
+		}
+
+		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;
+		}
+
+		// 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);
+		BoxFromPoints(surface->mins, surface->maxs, surface->num_vertices, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex));
+
+		// 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];
+		}
+
+		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++)
+			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)
+		{
+			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 = 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)
+			surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + i;
+		else // LordHavoc: white lighting (bsp version 29)
+			surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + (i * 3);
+
+		if (!(surface->lightmapinfo->texinfo->flags & TEX_SPECIAL) || surface->lightmapinfo->samples)
+		{
+			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
+			surface->lightmapinfo->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
+			// clear to white
+			memset(surface->lightmapinfo->stainsamples, 255, ssize * tsize * 3);
+
+			if (r_miplightmaps.integer)
+			{
+				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
+			{
+				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(surface->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
+			uscale = (uscale - ubase) / ssize;
+			vscale = (vscale - vbase) / tsize;
+
+			for (i = 0;i < surface->num_vertices;i++)
+			{
+				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;
+				(surface->groupmesh->data_lightmapoffsets + surface->num_firstvertex)[i] = (bound(0, iv, tmax) * ssize + bound(0, iu, smax)) * 3;
+			}
+		}
+	}
+}
+
+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->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)
+{
+	int			i, j, count, p;
+	dnode_t		*in;
+	mnode_t 	*out;
+
+	in = (void *)(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));
+
+	loadmodel->brush.data_nodes = out;
+	loadmodel->brush.num_nodes = count;
+
+	for ( i=0 ; i<count ; i++, in++, out++)
+	{
+		for (j=0 ; j<3 ; j++)
+		{
+			out->mins[j] = LittleShort(in->mins[j]);
+			out->maxs[j] = LittleShort(in->maxs[j]);
+		}
+
+		p = LittleLong(in->planenum);
+		out->plane = loadmodel->brush.data_planes + p;
+
+		out->firstsurface = LittleShort(in->firstface);
+		out->numsurfaces = LittleShort(in->numfaces);
+
+		for (j=0 ; j<2 ; j++)
+		{
+			p = LittleShort(in->children[j]);
+			if (p >= 0)
+				out->children[j] = loadmodel->brush.data_nodes + p;
+			else
+				out->children[j] = (mnode_t *)(loadmodel->brush.data_leafs + (-1 - p));
+		}
+	}
+
+	Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL);	// sets nodes and leafs
+}
+
+static void Mod_Q1BSP_LoadLeafs(lump_t *l)
+{
+	dleaf_t *in;
+	mleaf_t *out;
+	int i, j, count, p;
+
+	in = (void *)(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));
+
+	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);
+	memset(loadmodel->brush.data_pvsclusters, 0xFF, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes);
+
+	for ( i=0 ; i<count ; i++, in++, out++)
+	{
+		for (j=0 ; j<3 ; j++)
+		{
+			out->mins[j] = LittleShort(in->mins[j]);
+			out->maxs[j] = LittleShort(in->maxs[j]);
+		}
+
+		// FIXME: this function could really benefit from some error checking
+
+		out->contents = LittleLong(in->contents);
+
+		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 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;
+		if (out->clusterindex >= loadmodel->brush.num_pvsclusters)
+			out->clusterindex = -1;
+
+		p = LittleLong(in->visofs);
+		// ignore visofs errors on leaf 0 (solid)
+		if (p >= 0 && out->clusterindex >= 0)
+		{
+			if (p >= loadmodel->brushq1.num_compressedpvs)
+				Con_Print("Mod_Q1BSP_LoadLeafs: invalid visofs\n");
+			else
+				Mod_Q1BSP_DecompressVis(loadmodel->brushq1.data_compressedpvs + p, loadmodel->brushq1.data_compressedpvs + loadmodel->brushq1.num_compressedpvs, loadmodel->brush.data_pvsclusters + out->clusterindex * loadmodel->brush.num_pvsclusterbytes, loadmodel->brush.data_pvsclusters + (out->clusterindex + 1) * loadmodel->brush.num_pvsclusterbytes);
+		}
+
+		for (j = 0;j < 4;j++)
+			out->ambient_sound_level[j] = in->ambient_level[j];
+
+		// FIXME: Insert caustics here
+	}
+}
+
+static void Mod_Q1BSP_LoadClipnodes(lump_t *l)
+{
+	dclipnode_t *in, *out;
+	int			i, count;
+	hull_t		*hull;
+
+	in = (void *)(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));
+
+	loadmodel->brushq1.clipnodes = out;
+	loadmodel->brushq1.numclipnodes = count;
+
+	if (loadmodel->brush.ishlbsp)
+	{
+		hull = &loadmodel->brushq1.hulls[1];
+		hull->clipnodes = out;
+		hull->firstclipnode = 0;
+		hull->lastclipnode = count-1;
+		hull->planes = loadmodel->brush.data_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->brush.data_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->brush.data_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->brush.data_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->brush.data_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;
+		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
+	}
+
+	for (i=0 ; i<count ; i++, out++, in++)
+	{
+		out->planenum = LittleLong(in->planenum);
+		out->children[0] = LittleShort(in->children[0]);
+		out->children[1] = LittleShort(in->children[1]);
+		if (out->children[0] >= count || out->children[1] >= count)
+			Host_Error("Corrupt clipping hull(out of range child)\n");
+	}
+}
+
+//Duplicate the drawing hull structure as a clipping hull
+static void Mod_Q1BSP_MakeHull0(void)
+{
+	mnode_t		*in;
+	dclipnode_t *out;
+	int			i;
+	hull_t		*hull;
+
+	hull = &loadmodel->brushq1.hulls[0];
+
+	in = loadmodel->brush.data_nodes;
+	out = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_nodes * sizeof(dclipnode_t));
+
+	hull->clipnodes = out;
+	hull->firstclipnode = 0;
+	hull->lastclipnode = loadmodel->brush.num_nodes - 1;
+	hull->planes = loadmodel->brush.data_planes;
+
+	for (i = 0;i < loadmodel->brush.num_nodes;i++, out++, in++)
+	{
+		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_LoadLeaffaces(lump_t *l)
+{
+	int i, j;
+	short *in;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q1BSP_LoadLeaffaces: funny lump size in %s",loadmodel->name);
+	loadmodel->brush.num_leafsurfaces = l->filelen / sizeof(*in);
+	loadmodel->brush.data_leafsurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_leafsurfaces * sizeof(int));
+
+	for (i = 0;i < loadmodel->brush.num_leafsurfaces;i++)
+	{
+		j = (unsigned) LittleShort(in[i]);
+		if (j >= loadmodel->num_surfaces)
+			Host_Error("Mod_Q1BSP_LoadLeaffaces: bad surface number");
+		loadmodel->brush.data_leafsurfaces[i] = j;
+	}
+}
+
+static void Mod_Q1BSP_LoadSurfedges(lump_t *l)
+{
+	int		i;
+	int		*in;
+
+	in = (void *)(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));
+
+	for (i = 0;i < loadmodel->brushq1.numsurfedges;i++)
+		loadmodel->brushq1.surfedges[i] = LittleLong(in[i]);
+}
+
+
+static void Mod_Q1BSP_LoadPlanes(lump_t *l)
+{
+	int			i;
+	mplane_t	*out;
+	dplane_t 	*in;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q1BSP_LoadPlanes: funny lump size in %s", loadmodel->name);
+
+	loadmodel->brush.num_planes = l->filelen / sizeof(*in);
+	loadmodel->brush.data_planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_planes * sizeof(*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]);
+		out->normal[2] = LittleFloat(in->normal[2]);
+		out->dist = LittleFloat(in->dist);
+
+		PlaneClassify(out);
+	}
+}
+
+static void Mod_Q1BSP_LoadMapBrushes(void)
+{
+#if 0
+// unfinished
+	int submodel, numbrushes;
+	qboolean firstbrush;
+	char *text, *maptext;
+	char mapfilename[MAX_QPATH];
+	FS_StripExtension (loadmodel->name, mapfilename, sizeof (mapfilename));
+	strlcat (mapfilename, ".map", sizeof (mapfilename));
+	maptext = (qbyte*) FS_LoadFile(mapfilename, tempmempool, false);
+	if (!maptext)
+		return;
+	text = maptext;
+	if (!COM_ParseToken(&data, false))
+		return; // error
+	submodel = 0;
+	for (;;)
+	{
+		if (!COM_ParseToken(&data, false))
+			break;
+		if (com_token[0] != '{')
+			return; // error
+		// entity
+		firstbrush = true;
+		numbrushes = 0;
+		maxbrushes = 256;
+		brushes = Mem_Alloc(loadmodel->mempool, maxbrushes * sizeof(mbrush_t));
+		for (;;)
+		{
+			if (!COM_ParseToken(&data, false))
+				return; // error
+			if (com_token[0] == '}')
+				break; // end of entity
+			if (com_token[0] == '{')
+			{
+				// brush
+				if (firstbrush)
+				{
+					if (submodel)
+					{
+						if (submodel > loadmodel->brush.numsubmodels)
+						{
+							Con_Printf("Mod_Q1BSP_LoadMapBrushes: .map has more submodels than .bsp!\n");
+							model = NULL;
+						}
+						else
+							model = loadmodel->brush.submodels[submodel];
+					}
+					else
+						model = loadmodel;
+				}
+				for (;;)
+				{
+					if (!COM_ParseToken(&data, false))
+						return; // error
+					if (com_token[0] == '}')
+						break; // end of brush
+					// each brush face should be this format:
+					// ( x y z ) ( x y z ) ( x y z ) texture scroll_s scroll_t rotateangle scale_s scale_t
+					// FIXME: support hl .map format
+					for (pointnum = 0;pointnum < 3;pointnum++)
+					{
+						COM_ParseToken(&data, false);
+						for (componentnum = 0;componentnum < 3;componentnum++)
+						{
+							COM_ParseToken(&data, false);
+							point[pointnum][componentnum] = atof(com_token);
+						}
+						COM_ParseToken(&data, false);
+					}
+					COM_ParseToken(&data, false);
+					strlcpy(facetexture, com_token, sizeof(facetexture));
+					COM_ParseToken(&data, false);
+					//scroll_s = atof(com_token);
+					COM_ParseToken(&data, false);
+					//scroll_t = atof(com_token);
+					COM_ParseToken(&data, false);
+					//rotate = atof(com_token);
+					COM_ParseToken(&data, false);
+					//scale_s = atof(com_token);
+					COM_ParseToken(&data, false);
+					//scale_t = atof(com_token);
+					TriangleNormal(point[0], point[1], point[2], planenormal);
+					VectorNormalizeDouble(planenormal);
+					planedist = DotProduct(point[0], planenormal);
+					//ChooseTexturePlane(planenormal, texturevector[0], texturevector[1]);
+				}
+				continue;
+			}
+		}
+	}
+#endif
+}
+
+
+#define MAX_PORTALPOINTS 64
+
+typedef struct portal_s
+{
+	mplane_t plane;
+	mnode_t *nodes[2];		// [0] = front side of plane
+	struct portal_s *next[2];
+	int numpoints;
+	double points[3*MAX_PORTALPOINTS];
+	struct portal_s *chain; // all portals are linked into a list
+}
+portal_t;
+
+static portal_t *portalchain;
+
+/*
+===========
+AllocPortal
+===========
+*/
+static portal_t *AllocPortal(void)
+{
+	portal_t *p;
+	p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
+	p->chain = portalchain;
+	portalchain = p;
+	return p;
+}
+
+static void FreePortal(portal_t *p)
+{
+	Mem_Free(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
+	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]);
+	node->mins[1] = min(node->children[0]->mins[1], node->children[1]->mins[1]);
+	node->mins[2] = min(node->children[0]->mins[2], node->children[1]->mins[2]);
+	node->maxs[0] = max(node->children[0]->maxs[0], node->children[1]->maxs[0]);
+	node->maxs[1] = max(node->children[0]->maxs[1], node->children[1]->maxs[1]);
+	node->maxs[2] = max(node->children[0]->maxs[2], node->children[1]->maxs[2]);
+}
+
+static void Mod_Q1BSP_FinalizePortals(void)
+{
+	int i, j, numportals, numpoints;
+	portal_t *p, *pnext;
+	mportal_t *portal;
+	mvertex_t *point;
+	mleaf_t *leaf, *endleaf;
+
+	// 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->brush.data_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] && ((mleaf_t *)p->nodes[0])->clusterindex >= 0 && ((mleaf_t *)p->nodes[1])->clusterindex >= 0)
+		{
+			numportals += 2;
+			numpoints += p->numpoints * 2;
+		}
+		p = p->chain;
+	}
+	loadmodel->brush.data_portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
+	loadmodel->brush.num_portals = numportals;
+	loadmodel->brush.data_portalpoints = (void *)((qbyte *) loadmodel->brush.data_portals + numportals * sizeof(mportal_t));
+	loadmodel->brush.num_portalpoints = numpoints;
+	// clear all leaf portal chains
+	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->brush.data_portals;
+	point = loadmodel->brush.data_portalpoints;
+	p = portalchain;
+	portalchain = NULL;
+	while (p)
+	{
+		pnext = p->chain;
+
+		// 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->numpoints >= 3 && p->nodes[0] != p->nodes[1] && ((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;
+			portal->numpoints = p->numpoints;
+			portal->plane.dist = p->plane.dist;
+			VectorCopy(p->plane.normal, portal->plane.normal);
+			portal->here = (mleaf_t *)p->nodes[1];
+			portal->past = (mleaf_t *)p->nodes[0];
+			// copy points
+			for (j = 0;j < portal->numpoints;j++)
+			{
+				VectorCopy(p->points + j*3, point->position);
+				point++;
+			}
+			BoxFromPoints(portal->mins, portal->maxs, portal->numpoints, portal->points->position);
+			PlaneClassify(&portal->plane);
+
+			// link into leaf's portal chain
+			portal->next = portal->here->portals;
+			portal->here->portals = portal;
+
+			// advance to next portal
+			portal++;
+
+			// then make the front to back portal(backward portal)
+			portal->points = point;
+			portal->numpoints = p->numpoints;
+			portal->plane.dist = -p->plane.dist;
+			VectorNegate(p->plane.normal, portal->plane.normal);
+			portal->here = (mleaf_t *)p->nodes[0];
+			portal->past = (mleaf_t *)p->nodes[1];
+			// copy points
+			for (j = portal->numpoints - 1;j >= 0;j--)
+			{
+				VectorCopy(p->points + j*3, point->position);
+				point++;
+			}
+			BoxFromPoints(portal->mins, portal->maxs, portal->numpoints, portal->points->position);
+			PlaneClassify(&portal->plane);
+
+			// link into leaf's portal chain
+			portal->next = portal->here->portals;
+			portal->here->portals = portal;
+
+			// advance to next portal
+			portal++;
+		}
+		FreePortal(p);
+		p = pnext;
+	}
+}
+
+/*
+=============
+AddPortalToNodes
+=============
+*/
+static void AddPortalToNodes(portal_t *p, mnode_t *front, mnode_t *back)
+{
+	if (!front)
+		Host_Error("AddPortalToNodes: NULL front node");
+	if (!back)
+		Host_Error("AddPortalToNodes: NULL back node");
+	if (p->nodes[0] || p->nodes[1])
+		Host_Error("AddPortalToNodes: already included");
+	// note: front == back is handled gracefully, because leaf 0 is the shared solid leaf, it can often have portals with the same leaf on both sides
+
+	p->nodes[0] = front;
+	p->next[0] = (portal_t *)front->portals;
+	front->portals = (mportal_t *)p;
+
+	p->nodes[1] = back;
+	p->next[1] = (portal_t *)back->portals;
+	back->portals = (mportal_t *)p;
+}
+
+/*
+=============
+RemovePortalFromNode
+=============
+*/
+static void RemovePortalFromNodes(portal_t *portal)
+{
+	int i;
+	mnode_t *node;
+	void **portalpointer;
+	portal_t *t;
+	for (i = 0;i < 2;i++)
+	{
+		node = portal->nodes[i];
+
+		portalpointer = (void **) &node->portals;
+		while (1)
+		{
+			t = *portalpointer;
+			if (!t)
+				Host_Error("RemovePortalFromNodes: portal not in leaf");
+
+			if (t == portal)
+			{
+				if (portal->nodes[0] == node)
+				{
+					*portalpointer = portal->next[0];
+					portal->nodes[0] = NULL;
+				}
+				else if (portal->nodes[1] == node)
+				{
+					*portalpointer = portal->next[1];
+					portal->nodes[1] = NULL;
+				}
+				else
+					Host_Error("RemovePortalFromNodes: portal not bounding leaf");
+				break;
+			}
+
+			if (t->nodes[0] == node)
+				portalpointer = (void **) &t->next[0];
+			else if (t->nodes[1] == node)
+				portalpointer = (void **) &t->next[1];
+			else
+				Host_Error("RemovePortalFromNodes: portal not bounding leaf");
+		}
+	}
+}
+
+static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node)
+{
+	int i, side;
+	mnode_t *front, *back, *other_node;
+	mplane_t clipplane, *plane;
+	portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
+	int numfrontpoints, numbackpoints;
+	double frontpoints[3*MAX_PORTALPOINTS], backpoints[3*MAX_PORTALPOINTS];
+
+	// if a leaf, we're done
+	if (!node->plane)
+		return;
+
+	plane = node->plane;
+
+	front = node->children[0];
+	back = node->children[1];
+	if (front == back)
+		Host_Error("Mod_Q1BSP_RecursiveNodePortals: corrupt node hierarchy");
+
+	// create the new portal by generating a polygon for the node plane,
+	// and clipping it by all of the other portals(which came from nodes above this one)
+	nodeportal = AllocPortal();
+	nodeportal->plane = *plane;
+
+	PolygonD_QuadForPlane(nodeportal->points, nodeportal->plane.normal[0], nodeportal->plane.normal[1], nodeportal->plane.normal[2], nodeportal->plane.dist, 1024.0*1024.0*1024.0);
+	nodeportal->numpoints = 4;
+	side = 0;	// shut up compiler warning
+	for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
+	{
+		clipplane = portal->plane;
+		if (portal->nodes[0] == portal->nodes[1])
+			Host_Error("Mod_Q1BSP_RecursiveNodePortals: portal has same node on both sides(1)");
+		if (portal->nodes[0] == node)
+			side = 0;
+		else if (portal->nodes[1] == node)
+		{
+			clipplane.dist = -clipplane.dist;
+			VectorNegate(clipplane.normal, clipplane.normal);
+			side = 1;
+		}
+		else
+			Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
+
+		for (i = 0;i < nodeportal->numpoints*3;i++)
+			frontpoints[i] = nodeportal->points[i];
+		PolygonD_Divide(nodeportal->numpoints, frontpoints, clipplane.normal[0], clipplane.normal[1], clipplane.normal[2], clipplane.dist, 1.0/32.0, MAX_PORTALPOINTS, nodeportal->points, &nodeportal->numpoints, 0, NULL, NULL);
+		if (nodeportal->numpoints <= 0 || nodeportal->numpoints >= MAX_PORTALPOINTS)
+			break;
+	}
+
+	if (nodeportal->numpoints < 3)
+	{
+		Con_Print("Mod_Q1BSP_RecursiveNodePortals: WARNING: new portal was clipped away\n");
+		nodeportal->numpoints = 0;
+	}
+	else if (nodeportal->numpoints >= MAX_PORTALPOINTS)
+	{
+		Con_Print("Mod_Q1BSP_RecursiveNodePortals: WARNING: new portal has too many points\n");
+		nodeportal->numpoints = 0;
+	}
+
+	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];
+		if (!portal->numpoints)
+			continue;
+
+		other_node = portal->nodes[!side];
+		RemovePortalFromNodes(portal);
+
+		// 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);
+			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;
+
+		if (side == 0)
+		{
+			AddPortalToNodes(portal, front, other_node);
+			AddPortalToNodes(splitportal, back, other_node);
+		}
+		else
+		{
+			AddPortalToNodes(portal, other_node, front);
+			AddPortalToNodes(splitportal, other_node, back);
+		}
+	}
+
+	Mod_Q1BSP_RecursiveNodePortals(front);
+	Mod_Q1BSP_RecursiveNodePortals(back);
+}
+
+static void Mod_Q1BSP_MakePortals(void)
+{
+	portalchain = NULL;
+	Mod_Q1BSP_RecursiveNodePortals(loadmodel->brush.data_nodes);
+	Mod_Q1BSP_FinalizePortals();
+}
+
+static void Mod_Q1BSP_BuildLightmapUpdateChains(mempool_t *mempool, model_t *model)
+{
+	int i, j, stylecounts[256], totalcount, remapstyles[256];
+	msurface_t *surface;
+	memset(stylecounts, 0, sizeof(stylecounts));
+	for (i = 0;i < model->nummodelsurfaces;i++)
+	{
+		surface = model->data_surfaces + model->firstmodelsurface + i;
+		for (j = 0;j < MAXLIGHTMAPS;j++)
+			stylecounts[surface->lightmapinfo->styles[j]]++;
+	}
+	totalcount = 0;
+	model->brushq1.light_styles = 0;
+	for (i = 0;i < 255;i++)
+	{
+		if (stylecounts[i])
+		{
+			remapstyles[i] = model->brushq1.light_styles++;
+			totalcount += stylecounts[i] + 1;
 		}
 	}
+	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_styles = 0;
+	for (i = 0;i < 255;i++)
+		if (stylecounts[i])
+			model->brushq1.light_style[model->brushq1.light_styles++] = i;
+	j = 0;
+	for (i = 0;i < model->brushq1.light_styles;i++)
+	{
+		model->brushq1.light_styleupdatechains[i] = model->brushq1.light_styleupdatechainsbuffer + j;
+		j += stylecounts[model->brushq1.light_style[i]] + 1;
+	}
+	for (i = 0;i < model->nummodelsurfaces;i++)
+	{
+		surface = model->data_surfaces + model->firstmodelsurface + i;
+		for (j = 0;j < MAXLIGHTMAPS;j++)
+			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++)
+	{
+		*model->brushq1.light_styleupdatechains[i] = NULL;
+		model->brushq1.light_styleupdatechains[i] = model->brushq1.light_styleupdatechainsbuffer + j;
+		j += stylecounts[model->brushq1.light_style[i]] + 1;
+	}
 }
 
-/*
-=================
-Mod_LoadEntities
-=================
-*/
-static void Mod_LoadEntities (lump_t *l)
+//Returns PVS data for a given point
+//(note: can return NULL)
+static qbyte *Mod_Q1BSP_GetPVS(model_t *model, const vec3_t p)
 {
-	loadmodel->entities = NULL;
-	if (!l->filelen)
-		return;
-	loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen);
-	memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
-	if (loadmodel->ishlbsp)
-		Mod_ParseWadsFromEntityLump(loadmodel->entities);
+	mnode_t *node;
+	Mod_CheckLoaded(model);
+	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)
+		return model->brush.data_pvsclusters + ((mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
+	else
+		return NULL;
 }
 
-
-/*
-=================
-Mod_LoadVertexes
-=================
-*/
-static void Mod_LoadVertexes (lump_t *l)
+static void Mod_Q1BSP_FatPVS_RecursiveBSPNode(model_t *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbytes, mnode_t *node)
 {
-	dvertex_t	*in;
-	mvertex_t	*out;
-	int			i, count;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
-
-	loadmodel->vertexes = out;
-	loadmodel->numvertexes = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
+	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_Q1BSP_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 (((mleaf_t *)node)->clusterindex >= 0)
 	{
-		out->position[0] = LittleFloat (in->point[0]);
-		out->position[1] = LittleFloat (in->point[1]);
-		out->position[2] = LittleFloat (in->point[2]);
+		int i;
+		qbyte *pvs = model->brush.data_pvsclusters + ((mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
+		for (i = 0;i < pvsbytes;i++)
+			pvsbuffer[i] |= pvs[i];
 	}
 }
 
-/*
-=================
-Mod_LoadSubmodels
-=================
-*/
-static void Mod_LoadSubmodels (lump_t *l)
+//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)
 {
-	dmodel_t	*in;
-	dmodel_t	*out;
-	int			i, j, count;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	int bytes = model->brush.num_pvsclusterbytes;
+	bytes = min(bytes, pvsbufferlength);
+	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->brush.data_nodes);
+	return bytes;
+}
 
-	loadmodel->submodels = out;
-	loadmodel->numsubmodels = count;
+static void Mod_Q1BSP_RoundUpToHullSize(model_t *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs)
+{
+	vec3_t size;
+	const hull_t *hull;
 
-	for ( i=0 ; i<count ; i++, in++, out++)
+	VectorSubtract(inmaxs, inmins, size);
+	if (cmodel->brush.ishlbsp)
 	{
-		for (j=0 ; j<3 ; j++)
+		if (size[0] < 3)
+			hull = &cmodel->brushq1.hulls[0]; // 0x0x0
+		else if (size[0] <= 32)
 		{
-			// 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]);
+			if (size[2] < 54) // pick the nearest of 36 or 72
+				hull = &cmodel->brushq1.hulls[3]; // 32x32x36
+			else
+				hull = &cmodel->brushq1.hulls[1]; // 32x32x72
 		}
-		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);
+		else
+			hull = &cmodel->brushq1.hulls[2]; // 64x64x64
+	}
+	else
+	{
+		if (size[0] < 3)
+			hull = &cmodel->brushq1.hulls[0]; // 0x0x0
+		else if (size[0] <= 32)
+			hull = &cmodel->brushq1.hulls[1]; // 32x32x56
+		else
+			hull = &cmodel->brushq1.hulls[2]; // 64x64x88
 	}
+	VectorCopy(inmins, outmins);
+	VectorAdd(inmins, hull->clip_size, outmaxs);
 }
 
-/*
-=================
-Mod_LoadEdges
-=================
-*/
-static void Mod_LoadEdges (lump_t *l)
+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 *outleaflist, qbyte *outleafpvs, int *outnumleafspointer, 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, const vec3_t lightmins, const vec3_t lightmaxs);
+extern void R_Q1BSP_DrawLight(entity_render_t *ent, float *lightcolor, int numsurfaces, const int *surfacelist);
+void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 {
-	dedge_t *in;
-	medge_t *out;
-	int 	i, count;
+	int i, j, k;
+	dheader_t *header;
+	dmodel_t *bm;
+	mempool_t *mainmempool;
+	float dist, modelyawradius, modelradius, *vec;
+	msurface_t *surface;
+	int numshadowmeshtriangles;
 
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	mod->type = mod_brushq1;
 
-	loadmodel->edges = out;
-	loadmodel->numedges = count;
+	header = (dheader_t *)buffer;
 
-	for ( i=0 ; i<count ; i++, in++, out++)
+	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->soundfromcenter = true;
+	mod->TraceBox = Mod_Q1BSP_TraceBox;
+	mod->brush.SuperContentsFromNativeContents = Mod_Q1BSP_SuperContentsFromNativeContents;
+	mod->brush.NativeContentsFromSuperContents = Mod_Q1BSP_NativeContentsFromSuperContents;
+	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.LightPoint = Mod_Q1BSP_LightPoint;
+	mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
+	mod->brush.AmbientSoundLevelsForPoint = Mod_Q1BSP_AmbientSoundLevelsForPoint;
+	mod->brush.RoundUpToHullSize = Mod_Q1BSP_RoundUpToHullSize;
+	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++)
 	{
-		out->v[0] = (unsigned short)LittleShort(in->v[0]);
-		out->v[1] = (unsigned short)LittleShort(in->v[1]);
+		header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs);
+		header->lumps[i].filelen = LittleLong(header->lumps[i].filelen);
 	}
-}
 
-/*
-=================
-Mod_LoadTexinfo
-=================
-*/
-static void Mod_LoadTexinfo (lump_t *l)
-{
-	texinfo_t *in;
-	mtexinfo_t *out;
-	int i, j, k, count, miptex;
+// load into heap
 
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	// store which lightmap format to use
+	mod->brushq1.lightmaprgba = r_lightmaprgba.integer;
+
+	Mod_Q1BSP_LoadEntities(&header->lumps[LUMP_ENTITIES]);
+	Mod_Q1BSP_LoadVertexes(&header->lumps[LUMP_VERTEXES]);
+	Mod_Q1BSP_LoadEdges(&header->lumps[LUMP_EDGES]);
+	Mod_Q1BSP_LoadSurfedges(&header->lumps[LUMP_SURFEDGES]);
+	Mod_Q1BSP_LoadTextures(&header->lumps[LUMP_TEXTURES]);
+	Mod_Q1BSP_LoadLighting(&header->lumps[LUMP_LIGHTING]);
+	Mod_Q1BSP_LoadPlanes(&header->lumps[LUMP_PLANES]);
+	Mod_Q1BSP_LoadTexinfo(&header->lumps[LUMP_TEXINFO]);
+	Mod_Q1BSP_LoadFaces(&header->lumps[LUMP_FACES]);
+	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_LoadLeafs(&header->lumps[LUMP_LEAFS]);
+	Mod_Q1BSP_LoadNodes(&header->lumps[LUMP_NODES]);
+	Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES]);
+
+	if (!mod->brushq1.lightdata)
+		mod->brush.LightPoint = NULL;
+
+	if (mod->brushq1.data_compressedpvs)
+		Mem_Free(mod->brushq1.data_compressedpvs);
+	mod->brushq1.data_compressedpvs = NULL;
+	mod->brushq1.num_compressedpvs = 0;
+
+	Mod_Q1BSP_MakeHull0();
+	Mod_Q1BSP_MakePortals();
 
-	loadmodel->texinfo = out;
-	loadmodel->numtexinfo = count;
+	mod->numframes = 2;		// regular and alternate animation
+	mod->numskins = 1;
 
-	for (i = 0;i < count;i++, in++, out++)
+	mainmempool = mod->mempool;
+
+	Mod_Q1BSP_LoadLightList();
+
+	// make a single combined shadow mesh to allow optimized shadow volume creation
+	numshadowmeshtriangles = 0;
+	for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
 	{
-		for (k = 0;k < 2;k++)
-			for (j = 0;j < 4;j++)
-				out->vecs[k][j] = LittleFloat (in->vecs[k][j]);
+		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, 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);
 
-		miptex = LittleLong (in->miptex);
-		out->flags = LittleLong (in->flags);
+	if (loadmodel->brush.numsubmodels)
+		loadmodel->brush.submodels = Mem_Alloc(loadmodel->mempool, loadmodel->brush.numsubmodels * sizeof(model_t *));
 
-		out->texture = NULL;
-		if (loadmodel->textures)
-		{
-			if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures)
-				Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
-			else
-				out->texture = loadmodel->textures[miptex];
-		}
-		if (out->texture == NULL)
+	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:
+	// first of all, some background info on the submodels:
+	// model 0 is the map model (the world, named maps/e1m1.bsp for example)
+	// model 1 and higher are submodels (doors and the like, named *1, *2, etc)
+	// now the weird for loop itself:
+	// the loop functions in an odd way, on each iteration it sets up the
+	// current 'mod' model (which despite the confusing code IS the model of
+	// the number i), at the end of the loop it duplicates the model to become
+	// the next submodel, and loops back to set up the new submodel.
+
+	// LordHavoc: now the explanation of my sane way (which works identically):
+	// set up the world model, then on each submodel copy from the world model
+	// and set up the submodel with the respective model info.
+	for (i = 0;i < mod->brush.numsubmodels;i++)
+	{
+		// LordHavoc: this code was originally at the end of this loop, but
+		// has been transformed to something more readable at the start here.
+
+		if (i > 0)
 		{
-			// choose either the liquid notexture, or the normal notexture
-			if (out->flags & TEX_SPECIAL)
-				out->texture = loadmodel->textures[loadmodel->numtextures - 1];
-			else
-				out->texture = loadmodel->textures[loadmodel->numtextures - 2];
+			char name[10];
+			// LordHavoc: only register submodels if it is the world
+			// (prevents external bsp models from replacing world submodels with
+			//  their own)
+			if (!loadmodel->isworldmodel)
+				continue;
+			// duplicate the basic information
+			sprintf(name, "*%i", i);
+			mod = Mod_FindName(name);
+			// copy the base model to this one
+			*mod = *loadmodel;
+			// rename the clone back to its proper name
+			strcpy(mod->name, name);
+			// textures and memory belong to the main model
+			mod->texturepool = NULL;
+			mod->mempool = NULL;
 		}
-	}
-}
 
-/*
-================
-CalcSurfaceExtents
+		mod->brush.submodel = i;
 
-Fills in s->texturemins[] and s->extents[]
-================
-*/
-static void CalcSurfaceExtents (msurface_t *s)
-{
-	float	mins[2], maxs[2], val;
-	int		i,j, e;
-	mvertex_t	*v;
-	mtexinfo_t	*tex;
-	int		bmins[2], bmaxs[2];
+		if (loadmodel->brush.submodels)
+			loadmodel->brush.submodels[i] = mod;
+
+		bm = &mod->brushq1.submodels[i];
 
-	mins[0] = mins[1] = 999999999;
-	maxs[0] = maxs[1] = -999999999;
+		mod->brushq1.hulls[0].firstclipnode = bm->headnode[0];
+		for (j=1 ; j<MAX_MAP_HULLS ; j++)
+		{
+			mod->brushq1.hulls[j].firstclipnode = bm->headnode[j];
+			mod->brushq1.hulls[j].lastclipnode = mod->brushq1.numclipnodes - 1;
+		}
 
-	tex = s->texinfo;
+		mod->firstmodelsurface = bm->firstface;
+		mod->nummodelsurfaces = bm->numfaces;
 
-	for (i=0 ; i<s->numedges ; i++)
-	{
-		e = loadmodel->surfedges[s->firstedge+i];
-		if (e >= 0)
-			v = &loadmodel->vertexes[loadmodel->edges[e].v[0]];
-		else
-			v = &loadmodel->vertexes[loadmodel->edges[-e].v[1]];
+		// make the model surface list (used by shadowing/lighting)
+		mod->surfacelist = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+			mod->surfacelist[j] = mod->firstmodelsurface + j;
 
-		for (j=0 ; j<2 ; j++)
+		// this gets altered below if sky is used
+		mod->DrawSky = NULL;
+		mod->Draw = R_Q1BSP_Draw;
+		mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+		mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+		mod->DrawLight = R_Q1BSP_DrawLight;
+		if (i != 0)
+		{
+			mod->brush.GetPVS = NULL;
+			mod->brush.FatPVS = NULL;
+			mod->brush.BoxTouchingPVS = NULL;
+			mod->brush.BoxTouchingLeafPVS = NULL;
+			mod->brush.BoxTouchingVisibleLeafs = NULL;
+			mod->brush.LightPoint = NULL;
+			mod->brush.AmbientSoundLevelsForPoint = NULL;
+		}
+		Mod_Q1BSP_BuildLightmapUpdateChains(loadmodel->mempool, mod);
+		if (mod->nummodelsurfaces)
+		{
+			// LordHavoc: calculate bmodel bounding box rather than trusting what it says
+			mod->normalmins[0] = mod->normalmins[1] = mod->normalmins[2] = 1000000000.0f;
+			mod->normalmaxs[0] = mod->normalmaxs[1] = mod->normalmaxs[2] = -1000000000.0f;
+			modelyawradius = 0;
+			modelradius = 0;
+			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 (surface->texture->basematerialflags & MATERIALFLAG_SKY)
+					mod->DrawSky = R_Q1BSP_DrawSky;
+				// calculate bounding shapes
+				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];
+					if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2];
+					if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0];
+					if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1];
+					if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2];
+					dist = vec[0]*vec[0]+vec[1]*vec[1];
+					if (modelyawradius < dist)
+						modelyawradius = dist;
+					dist += vec[2]*vec[2];
+					if (modelradius < dist)
+						modelradius = dist;
+				}
+			}
+			modelyawradius = sqrt(modelyawradius);
+			modelradius = sqrt(modelradius);
+			mod->yawmins[0] = mod->yawmins[1] = - (mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius);
+			mod->yawmins[2] = mod->normalmins[2];
+			mod->yawmaxs[2] = mod->normalmaxs[2];
+			mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
+			mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
+			mod->radius = modelradius;
+			mod->radius2 = modelradius * modelradius;
+		}
+		else
 		{
-			val = v->position[0] * tex->vecs[j][0] +
-				v->position[1] * tex->vecs[j][1] +
-				v->position[2] * tex->vecs[j][2] +
-				tex->vecs[j][3];
-			if (val < mins[j])
-				mins[j] = val;
-			if (val > maxs[j])
-				maxs[j] = val;
+			// LordHavoc: empty submodel(lacrima.bsp has such a glitch)
+			Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadmodel->name);
 		}
+		//mod->brushq1.num_visleafs = bm->visleafs;
 	}
 
-	for (i=0 ; i<2 ; i++)
-	{
-		bmins[i] = floor(mins[i]/16);
-		bmaxs[i] = ceil(maxs[i]/16);
+	Mod_Q1BSP_LoadMapBrushes();
 
-		s->texturemins[i] = bmins[i] * 16;
-		s->extents[i] = (bmaxs[i] - bmins[i]) * 16;
-	}
+	//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->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brushq1.submodels[i].visleafs, loadmodel->brush.num_portals);
 }
 
+static void Mod_Q2BSP_LoadEntities(lump_t *l)
+{
+}
 
-void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
+static void Mod_Q2BSP_LoadPlanes(lump_t *l)
 {
-	int		i, j;
-	float	*v;
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-	mins[0] = mins[1] = mins[2] = 9999;
-	maxs[0] = maxs[1] = maxs[2] = -9999;
-	v = verts;
-	for (i = 0;i < numverts;i++)
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadPlanes: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		for (j = 0;j < 3;j++, v++)
-		{
-			if (*v < mins[j])
-				mins[j] = *v;
-			if (*v > maxs[j])
-				maxs[j] = *v;
-		}
 	}
+*/
 }
 
-#if 0
-#define MAX_SUBDIVPOLYTRIANGLES 4096
-#define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3)
+static void Mod_Q2BSP_LoadVertices(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-static int subdivpolyverts, subdivpolytriangles;
-static int subdivpolyindex[MAX_SUBDIVPOLYTRIANGLES][3];
-static float subdivpolyvert[MAX_SUBDIVPOLYVERTS][3];
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadVertices: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-static int subdivpolylookupvert(vec3_t v)
-{
-	int i;
-	for (i = 0;i < subdivpolyverts;i++)
-		if (subdivpolyvert[i][0] == v[0]
-		 && subdivpolyvert[i][1] == v[1]
-		 && subdivpolyvert[i][2] == v[2])
-			return i;
-	if (subdivpolyverts >= MAX_SUBDIVPOLYVERTS)
-		Host_Error("SubDividePolygon: ran out of vertices in buffer, please increase your r_subdivide_size");
-	VectorCopy(v, subdivpolyvert[subdivpolyverts]);
-	return subdivpolyverts++;
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
 }
 
-static void SubdividePolygon (int numverts, float *verts)
+static void Mod_Q2BSP_LoadVisibility(lump_t *l)
 {
-	int		i, i1, i2, i3, f, b, c, p;
-	vec3_t	mins, maxs, front[256], back[256];
-	float	m, *pv, *cv, dist[256], frac;
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-	if (numverts > 250)
-		Host_Error ("SubdividePolygon: ran out of verts in buffer");
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadVisibility: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	BoundPoly (numverts, verts, mins, maxs);
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	for (i = 0;i < 3;i++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		m = (mins[i] + maxs[i]) * 0.5;
-		m = r_subdivide_size.value * floor (m/r_subdivide_size.value + 0.5);
-		if (maxs[i] - m < 8)
-			continue;
-		if (m - mins[i] < 8)
-			continue;
-
-		// cut it
-		for (cv = verts, c = 0;c < numverts;c++, cv += 3)
-			dist[c] = cv[i] - m;
-
-		f = b = 0;
-		for (p = numverts - 1, c = 0, pv = verts + p * 3, cv = verts;c < numverts;p = c, c++, pv = cv, cv += 3)
-		{
-			if (dist[p] >= 0)
-			{
-				VectorCopy (pv, front[f]);
-				f++;
-			}
-			if (dist[p] <= 0)
-			{
-				VectorCopy (pv, back[b]);
-				b++;
-			}
-			if (dist[p] == 0 || dist[c] == 0)
-				continue;
-			if ( (dist[p] > 0) != (dist[c] > 0) )
-			{
-				// clip point
-				frac = dist[p] / (dist[p] - dist[c]);
-				front[f][0] = back[b][0] = pv[0] + frac * (cv[0] - pv[0]);
-				front[f][1] = back[b][1] = pv[1] + frac * (cv[1] - pv[1]);
-				front[f][2] = back[b][2] = pv[2] + frac * (cv[2] - pv[2]);
-				f++;
-				b++;
-			}
-		}
-
-		SubdividePolygon (f, front[0]);
-		SubdividePolygon (b, back[0]);
-		return;
 	}
+*/
+}
 
-	i1 = subdivpolylookupvert(verts);
-	i2 = subdivpolylookupvert(verts + 3);
-	for (i = 2;i < numverts;i++)
-	{
-		if (subdivpolytriangles >= MAX_SUBDIVPOLYTRIANGLES)
-		{
-			Con_Printf("SubdividePolygon: ran out of triangles in buffer, please increase your r_subdivide_size\n");
-			return;
-		}
+static void Mod_Q2BSP_LoadNodes(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadNodes: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-		i3 = subdivpolylookupvert(verts + i * 3);
-		subdivpolyindex[subdivpolytriangles][0] = i1;
-		subdivpolyindex[subdivpolytriangles][1] = i2;
-		subdivpolyindex[subdivpolytriangles][2] = i3;
-		i2 = i3;
-		subdivpolytriangles++;
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
 	}
+*/
 }
 
+static void Mod_Q2BSP_LoadTexInfo(lump_t *l)
+{
 /*
-================
-Mod_GenerateWarpMesh
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadTexInfo: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-Breaks a polygon up along axial 64 unit
-boundaries so that turbulent and sky warps
-can be done reasonably.
-================
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
 */
-void Mod_GenerateWarpMesh (msurface_t *surf)
-{
-	int i, j;
-	surfvertex_t *v;
-	surfmesh_t *mesh;
+}
 
-	subdivpolytriangles = 0;
-	subdivpolyverts = 0;
-	SubdividePolygon (surf->poly_numverts, surf->poly_verts);
-	if (subdivpolytriangles < 1)
-		Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
+static void Mod_Q2BSP_LoadFaces(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-	surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
-	mesh->numverts = subdivpolyverts;
-	mesh->numtriangles = subdivpolytriangles;
-	mesh->vertex = (surfvertex_t *)(mesh + 1);
-	mesh->index = (int *)(mesh->vertex + mesh->numverts);
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadFaces: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	for (i = 0;i < mesh->numtriangles;i++)
-		for (j = 0;j < 3;j++)
-			mesh->index[i*3+j] = subdivpolyindex[i][j];
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		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]);
 	}
+*/
 }
-#endif
 
-void Mod_GenerateVertexLitMesh (msurface_t *surf)
+static void Mod_Q2BSP_LoadLighting(lump_t *l)
 {
-	int				i, is, it, *index, smax, tmax;
-	float			*in, s, t;
-	surfvertex_t	*out;
-	surfmesh_t		*mesh;
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-	smax = surf->extents[0] >> 4;
-	tmax = surf->extents[1] >> 4;
-	surf->lightmaptexturestride = 0;
-	surf->lightmaptexture = NULL;
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadLighting: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * sizeof(surfvertex_t));
-	mesh->numverts = surf->poly_numverts;
-	mesh->numtriangles = surf->poly_numverts - 2;
-	mesh->vertex = (surfvertex_t *)(mesh + 1);
-	mesh->index = (int *)(mesh->vertex + mesh->numverts);
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	index = mesh->index;
-	for (i = 0;i < mesh->numtriangles;i++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		*index++ = 0;
-		*index++ = i + 1;
-		*index++ = i + 2;
 	}
+*/
+}
 
-	for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
-	{
-		VectorCopy (in, out->v);
+static void Mod_Q2BSP_LoadLeafs(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadLeafs: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-		s = DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
-		t = DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-		out->ab[0] = s * (1.0f / 16.0f);
-		out->ab[1] = t * (1.0f / 16.0f);
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
 
-		out->st[0] = s / surf->texinfo->texture->width;
-		out->st[1] = t / surf->texinfo->texture->height;
+static void Mod_Q2BSP_LoadLeafFaces(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-		s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-		t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadLeafFaces: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-		// lightmap coordinates
-		out->uv[0] = 0;
-		out->uv[1] = 0;
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-		// LordHavoc: calc lightmap data offset for vertex lighting to use
-		is = (int) s;
-		it = (int) t;
-		is = bound(0, is, smax);
-		it = bound(0, it, tmax);
-		out->lightmapoffset = ((it * (smax+1) + is) * 3);
+	for (i = 0;i < count;i++, in++, out++)
+	{
 	}
+*/
 }
 
-void Mod_GenerateLightmappedMesh (msurface_t *surf)
+static void Mod_Q2BSP_LoadLeafBrushes(lump_t *l)
 {
-	int				i, is, it, *index, smax, tmax;
-	float			*in, s, t, xbase, ybase, xscale, yscale;
-	surfvertex_t	*out;
-	surfmesh_t		*mesh;
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-	surf->flags |= SURF_LIGHTMAP;
-	smax = surf->extents[0] >> 4;
-	tmax = surf->extents[1] >> 4;
-	if (r_miplightmaps.integer)
-	{
-		surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
-		surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE);
-	}
-	else
-	{
-		surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
-		surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE);
-	}
-	R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &xbase, &ybase, &xscale, &yscale);
-	xscale = (xscale - xbase) * 16.0 / ((surf->extents[0] & ~15) + 16);
-	yscale = (yscale - ybase) * 16.0 / ((surf->extents[1] & ~15) + 16);
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadLeafBrushes: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * sizeof(surfvertex_t));
-	mesh->numverts = surf->poly_numverts;
-	mesh->numtriangles = surf->poly_numverts - 2;
-	mesh->vertex = (surfvertex_t *)(mesh + 1);
-	mesh->index = (int *)(mesh->vertex + mesh->numverts);
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	index = mesh->index;
-	for (i = 0;i < mesh->numtriangles;i++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		*index++ = 0;
-		*index++ = i + 1;
-		*index++ = i + 2;
 	}
+*/
+}
 
-	for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
-	{
-		VectorCopy (in, out->v);
+static void Mod_Q2BSP_LoadEdges(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadEdges: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-		s = DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
-		t = DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-		out->ab[0] = s * (1.0f / 16.0f);
-		out->ab[1] = t * (1.0f / 16.0f);
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
 
-		out->st[0] = s / surf->texinfo->texture->width;
-		out->st[1] = t / surf->texinfo->texture->height;
+static void Mod_Q2BSP_LoadSurfEdges(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-		s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-		t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadSurfEdges: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-		// lightmap coordinates
-		out->uv[0] = s * xscale + xbase;
-		out->uv[1] = t * yscale + ybase;
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-		// LordHavoc: calc lightmap data offset for vertex lighting to use
-		is = (int) s;
-		it = (int) t;
-		is = bound(0, is, smax);
-		it = bound(0, it, tmax);
-		out->lightmapoffset = ((it * (smax+1) + is) * 3);
+	for (i = 0;i < count;i++, in++, out++)
+	{
 	}
+*/
 }
 
-void Mod_GenerateVertexMesh (msurface_t *surf)
+static void Mod_Q2BSP_LoadBrushes(lump_t *l)
 {
-	int				i, *index;
-	float			*in, s, t;
-	surfvertex_t	*out;
-	surfmesh_t		*mesh;
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
-	surf->lightmaptexturestride = 0;
-	surf->lightmaptexture = NULL;
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadBrushes: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * sizeof(surfvertex_t));
-	mesh->numverts = surf->poly_numverts;
-	mesh->numtriangles = surf->poly_numverts - 2;
-	mesh->vertex = (surfvertex_t *)(mesh + 1);
-	mesh->index = (int *)(mesh->vertex + mesh->numverts);
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	index = mesh->index;
-	for (i = 0;i < mesh->numtriangles;i++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		*index++ = 0;
-		*index++ = i + 1;
-		*index++ = i + 2;
 	}
+*/
+}
+
+static void Mod_Q2BSP_LoadBrushSides(lump_t *l)
+{
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadBrushSides: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		VectorCopy (in, out->v);
-		s = (DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);
-		t = (DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);
-		out->st[0] = s / surf->texinfo->texture->width;
-		out->st[1] = t / surf->texinfo->texture->height;
-		out->ab[0] = s * (1.0f / 16.0f);
-		out->ab[1] = t * (1.0f / 16.0f);
 	}
+*/
 }
 
-void Mod_GenerateSurfacePolygon (msurface_t *surf)
+static void Mod_Q2BSP_LoadAreas(lump_t *l)
 {
-	int i, lindex;
-	float *vec, *vert, mins[3], maxs[3];
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadAreas: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	// convert edges back to a normal polygon
-	surf->poly_numverts = surf->numedges;
-	vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * surf->numedges);
-	for (i = 0;i < surf->numedges;i++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		lindex = loadmodel->surfedges[surf->firstedge + i];
-		if (lindex > 0)
-			vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position;
-		else
-			vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
-		VectorCopy (vec, vert);
-		vert += 3;
-	}
-	vert = surf->poly_verts;
-	VectorCopy(vert, mins);
-	VectorCopy(vert, maxs);
-	vert += 3;
-	for (i = 1;i < surf->poly_numverts;i++)
-	{
-		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];
-		vert += 3;
-	}
-	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;
-}
-
-static void Mod_SplitSurfMeshIfTooBig(msurface_t *s)
-{
-	int j, base, tricount, newvertexcount, *index, *vertexremap;
-	surfmesh_t *newmesh, *oldmesh, *firstmesh;
-	if (s->mesh->numtriangles > 1000)
-	{
-		vertexremap = Mem_Alloc(tempmempool, s->mesh->numverts * sizeof(int));
-		base = 0;
-		oldmesh = NULL;
-		firstmesh = NULL;
-		newmesh = NULL;
-		while (base < s->mesh->numtriangles)
-		{
-			tricount = s->mesh->numtriangles - base;
-			if (tricount > 1000)
-				tricount = 1000;
-			index = s->mesh->index + base * 3;
-			base += tricount;
-
-			newvertexcount = 0;
-			memset(vertexremap, -1, s->mesh->numverts * sizeof(int));
-			for (j = 0;j < tricount * 3;j++)
-				if (vertexremap[index[j]] < 0)
-					vertexremap[index[j]] = newvertexcount++;
-
-			newmesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + newvertexcount * sizeof(surfvertex_t) + tricount * sizeof(int[3]));
-			newmesh->chain = NULL;
-			newmesh->numverts = newvertexcount;
-			newmesh->numtriangles = tricount;
-			newmesh->vertex = (surfvertex_t *)(newmesh + 1);
-			newmesh->index = (int *)(newmesh->vertex + newvertexcount);
-			for (j = 0;j < tricount * 3;j++)
-			{
-				newmesh->index[j] = vertexremap[index[j]];
-				// yes this copies the same vertex multiple times in many cases...  but that's ok...
-				memcpy(&newmesh->vertex[newmesh->index[j]], &s->mesh->vertex[index[j]], sizeof(surfvertex_t));
-			}
-			if (oldmesh)
-				oldmesh->chain = newmesh;
-			else
-				firstmesh = newmesh;
-			oldmesh = newmesh;
-		}
-		Mem_Free(vertexremap);
-		Mem_Free(s->mesh);
-		s->mesh = firstmesh;
 	}
+*/
 }
 
+static void Mod_Q2BSP_LoadAreaPortals(lump_t *l)
+{
 /*
-=================
-Mod_LoadFaces
-=================
+	d_t *in;
+	m_t *out;
+	int i, count;
+
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen % sizeof(*in))
+		Host_Error("Mod_Q2BSP_LoadAreaPortals: funny lump size in %s",loadmodel->name);
+	count = l->filelen / sizeof(*in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
 */
-static void Mod_LoadFaces (lump_t *l)
+}
+
+static void Mod_Q2BSP_LoadModels(lump_t *l)
 {
-	dface_t *in;
-	msurface_t 	*out;
-	int i, count, surfnum, planenum, ssize, tsize;
+/*
+	d_t *in;
+	m_t *out;
+	int i, count;
 
 	in = (void *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
+		Host_Error("Mod_Q2BSP_LoadModels: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->surfaces = out;
-	loadmodel->numsurfaces = count;
+	loadmodel-> = out;
+	loadmodel->num = count;
 
-	for (surfnum = 0;surfnum < count;surfnum++, in++, out++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		// FIXME: validate edges, texinfo, etc?
-		out->firstedge = LittleLong(in->firstedge);
-		out->numedges = LittleShort(in->numedges);
-		if ((unsigned int) out->firstedge + (unsigned int) out->numedges > (unsigned int) loadmodel->numsurfedges)
-			Host_Error("Mod_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", out->firstedge, out->numedges, loadmodel->numsurfedges);
-
-		i = LittleShort (in->texinfo);
-		if ((unsigned int) i >= (unsigned int) loadmodel->numtexinfo)
-			Host_Error("Mod_LoadFaces: invalid texinfo index %i (model has %i texinfos)\n", i, loadmodel->numtexinfo);
-		out->texinfo = loadmodel->texinfo + i;
-		out->flags = out->texinfo->texture->flags;
+	}
+*/
+}
 
-		planenum = LittleShort(in->planenum);
-		if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes)
-			Host_Error("Mod_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
+void static Mod_Q2BSP_Load(model_t *mod, void *buffer)
+{
+	int i;
+	q2dheader_t *header;
 
-		if (LittleShort(in->side))
-			out->flags |= SURF_PLANEBACK;
+	Host_Error("Mod_Q2BSP_Load: not yet implemented\n");
 
-		out->plane = loadmodel->planes + planenum;
+	mod->type = mod_brushq2;
 
-		// clear lightmap (filled in later)
-		out->lightmaptexture = NULL;
+	header = (q2dheader_t *)buffer;
 
-		// force lightmap upload on first time seeing the surface
-		out->cached_dlight = true;
-		out->cached_ambient = -1000;
-		out->cached_lightscalebit = -1000;
+	i = LittleLong(header->version);
+	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;
+	if (loadmodel->isworldmodel)
+		Cvar_SetValue("halflifebsp", mod->brush.ishlbsp);
 
-		CalcSurfaceExtents (out);
+	mod_base = (qbyte *)header;
 
-		ssize = (out->extents[0] >> 4) + 1;
-		tsize = (out->extents[1] >> 4) + 1;
+	// swap all the lumps
+	for (i = 0;i < (int) sizeof(*header) / 4;i++)
+		((int *)header)[i] = LittleLong(((int *)header)[i]);
 
-		// lighting info
-		for (i = 0;i < MAXLIGHTMAPS;i++)
-			out->styles[i] = in->styles[i];
-		i = LittleLong(in->lightofs);
-		if (i == -1)
-			out->samples = NULL;
-		else if (loadmodel->ishlbsp) // LordHavoc: HalfLife map (bsp version 30)
-			out->samples = loadmodel->lightdata + i;
-		else // LordHavoc: white lighting (bsp version 29)
-			out->samples = loadmodel->lightdata + (i * 3);
+	// store which lightmap format to use
+	mod->brushq1.lightmaprgba = r_lightmaprgba.integer;
+
+	Mod_Q2BSP_LoadEntities(&header->lumps[Q2LUMP_ENTITIES]);
+	Mod_Q2BSP_LoadPlanes(&header->lumps[Q2LUMP_PLANES]);
+	Mod_Q2BSP_LoadVertices(&header->lumps[Q2LUMP_VERTEXES]);
+	Mod_Q2BSP_LoadVisibility(&header->lumps[Q2LUMP_VISIBILITY]);
+	Mod_Q2BSP_LoadNodes(&header->lumps[Q2LUMP_NODES]);
+	Mod_Q2BSP_LoadTexInfo(&header->lumps[Q2LUMP_TEXINFO]);
+	Mod_Q2BSP_LoadFaces(&header->lumps[Q2LUMP_FACES]);
+	Mod_Q2BSP_LoadLighting(&header->lumps[Q2LUMP_LIGHTING]);
+	Mod_Q2BSP_LoadLeafs(&header->lumps[Q2LUMP_LEAFS]);
+	Mod_Q2BSP_LoadLeafFaces(&header->lumps[Q2LUMP_LEAFFACES]);
+	Mod_Q2BSP_LoadLeafBrushes(&header->lumps[Q2LUMP_LEAFBRUSHES]);
+	Mod_Q2BSP_LoadEdges(&header->lumps[Q2LUMP_EDGES]);
+	Mod_Q2BSP_LoadSurfEdges(&header->lumps[Q2LUMP_SURFEDGES]);
+	Mod_Q2BSP_LoadBrushes(&header->lumps[Q2LUMP_BRUSHES]);
+	Mod_Q2BSP_LoadBrushSides(&header->lumps[Q2LUMP_BRUSHSIDES]);
+	Mod_Q2BSP_LoadAreas(&header->lumps[Q2LUMP_AREAS]);
+	Mod_Q2BSP_LoadAreaPortals(&header->lumps[Q2LUMP_AREAPORTALS]);
+	// LordHavoc: must go last because this makes the submodels
+	Mod_Q2BSP_LoadModels(&header->lumps[Q2LUMP_MODELS]);
+}
 
-		Mod_GenerateSurfacePolygon(out);
+static int Mod_Q3BSP_SuperContentsFromNativeContents(model_t *model, int nativecontents);
+static int Mod_Q3BSP_NativeContentsFromSuperContents(model_t *model, int supercontents);
 
-		if (out->texinfo->texture->flags & SURF_DRAWSKY)
-		{
-			out->shader = &Cshader_sky;
-			out->samples = NULL;
-			Mod_GenerateVertexMesh (out);
-		}
-		else if (out->texinfo->texture->flags & SURF_DRAWTURB)
-		{
-			out->shader = &Cshader_water;
-			out->samples = NULL;
-			Mod_GenerateVertexMesh (out);
-		}
-		else
+static void Mod_Q3BSP_LoadEntities(lump_t *l)
+{
+	const char *data;
+	char key[128], value[4096];
+	float v[3];
+	loadmodel->brushq3.num_lightgrid_cellsize[0] = 64;
+	loadmodel->brushq3.num_lightgrid_cellsize[1] = 64;
+	loadmodel->brushq3.num_lightgrid_cellsize[2] = 128;
+	if (!l->filelen)
+		return;
+	loadmodel->brush.entities = 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
+	if (data && COM_ParseToken(&data, false) && com_token[0] == '{')
+	{
+		while (1)
 		{
-			if (!R_TextureHasAlpha(out->texinfo->texture->texture))
-				out->flags |= SURF_CLIPSOLID;
-			if (out->texinfo->flags & TEX_SPECIAL)
-			{
-				// qbsp couldn't find the texture for this surface, but it was either turb or sky...  assume turb
-				out->shader = &Cshader_water;
-				out->shader = &Cshader_water;
-				out->samples = NULL;
-				Mod_GenerateVertexMesh (out);
-			}
-			else if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256))
-			{
-				Con_Printf ("Bad surface extents, converting to fullbright polygon");
-				out->shader = &Cshader_wall_fullbright;
-				out->samples = NULL;
-				Mod_GenerateVertexMesh(out);
-			}
+			if (!COM_ParseToken(&data, false))
+				break; // error
+			if (com_token[0] == '}')
+				break; // end of worldspawn
+			if (com_token[0] == '_')
+				strcpy(key, com_token + 1);
 			else
+				strcpy(key, com_token);
+			while (key[strlen(key)-1] == ' ') // remove trailing spaces
+				key[strlen(key)-1] = 0;
+			if (!COM_ParseToken(&data, false))
+				break; // error
+			strcpy(value, com_token);
+			if (!strcmp("gridsize", key))
 			{
-				// stainmap for permanent marks on walls
-				out->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
-				// clear to white
-				memset(out->stainsamples, 255, ssize * tsize * 3);
-				if (out->extents[0] < r_vertexsurfacesthreshold.integer && out->extents[1] < r_vertexsurfacesthreshold.integer)
-				{
-					out->shader = &Cshader_wall_vertex;
-					Mod_GenerateVertexLitMesh(out);
-				}
-				else
-				{
-					out->shader = &Cshader_wall_lightmap;
-					Mod_GenerateLightmappedMesh(out);
-				}
+				if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3 && v[0] != 0 && v[1] != 0 && v[2] != 0)
+					VectorCopy(v, loadmodel->brushq3.num_lightgrid_cellsize);
 			}
 		}
-		Mod_SplitSurfMeshIfTooBig(out);
 	}
 }
 
-static model_t *sortmodel;
-
-static int Mod_SurfaceQSortCompare(const void *voida, const void *voidb)
-{
-	const msurface_t *a, *b;
-	a = *((const msurface_t **)voida);
-	b = *((const msurface_t **)voidb);
-	if (a->shader != b->shader)
-		return (qbyte *) a->shader - (qbyte *) b->shader;
-	if (a->texinfo->texture != b->texinfo->texture);
-		return a->texinfo->texture - b->texinfo->texture;
-	return 0;
-}
-
-static void Mod_BrushSortedSurfaces(model_t *model, mempool_t *pool)
-{
-	int surfnum;
-	sortmodel = model;
-	sortmodel->modelsortedsurfaces = Mem_Alloc(pool, sortmodel->nummodelsurfaces * sizeof(msurface_t *));
-	for (surfnum = 0;surfnum < sortmodel->nummodelsurfaces;surfnum++)
-		sortmodel->modelsortedsurfaces[surfnum] = &sortmodel->surfaces[surfnum + sortmodel->firstmodelsurface];
-
-	if (r_sortsurfaces.integer)
-		qsort(sortmodel->modelsortedsurfaces, sortmodel->nummodelsurfaces, sizeof(msurface_t *), Mod_SurfaceQSortCompare);
-}
-
-
-/*
-=================
-Mod_SetParent
-=================
-*/
-static void Mod_SetParent (mnode_t *node, mnode_t *parent)
-{
-	node->parent = parent;
-	if (node->contents < 0)
-		return;
-	Mod_SetParent (node->children[0], node);
-	Mod_SetParent (node->children[1], node);
-}
-
-/*
-=================
-Mod_LoadNodes
-=================
-*/
-static void Mod_LoadNodes (lump_t *l)
+static void Mod_Q3BSP_LoadTextures(lump_t *l)
 {
-	int			i, j, count, p;
-	dnode_t		*in;
-	mnode_t 	*out;
+	q3dtexture_t *in;
+	texture_t *out;
+	int i, count;
+	int j, c;
+	fssearch_t *search;
+	char *f;
+	const char *text;
+	int flags, flags2, numparameters, passnumber;
+	char shadername[Q3PATHLENGTH];
+	char sky[Q3PATHLENGTH];
+	char firstpasstexturename[Q3PATHLENGTH];
+	char parameter[4][Q3PATHLENGTH];
 
 	in = (void *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
+		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 = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->nodes = out;
-	loadmodel->numnodes = count;
+	loadmodel->data_textures = out;
+	loadmodel->num_textures = count;
 
-	for ( i=0 ; i<count ; i++, in++, out++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		for (j=0 ; j<3 ; j++)
+		strlcpy (out->name, in->name, sizeof (out->name));
+		out->surfaceflags = LittleLong(in->surfaceflags);
+		out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in->contents));
+		out->surfaceparms = -1;
+	}
+
+	// do a quick parse of shader files to get surfaceparms
+	if ((search = FS_Search("scripts/*.shader", true, false)))
+	{
+		for (i = 0;i < search->numfilenames;i++)
 		{
-			out->mins[j] = LittleShort (in->mins[j]);
-			out->maxs[j] = LittleShort (in->maxs[j]);
+			if ((f = FS_LoadFile(search->filenames[i], tempmempool, false)))
+			{
+				text = f;
+				while (COM_ParseToken(&text, false))
+				{
+					strlcpy (shadername, com_token, sizeof (shadername));
+					flags = 0;
+					flags2 = 0;
+					sky[0] = 0;
+					passnumber = 0;
+					firstpasstexturename[0] = 0;
+					if (COM_ParseToken(&text, false) && !strcasecmp(com_token, "{"))
+					{
+						while (COM_ParseToken(&text, false))
+						{
+							if (!strcasecmp(com_token, "}"))
+								break;
+							else if (!strcasecmp(com_token, "{"))
+							{
+								while (COM_ParseToken(&text, false))
+								{
+									if (!strcasecmp(com_token, "}"))
+										break;
+									if (!strcasecmp(com_token, "\n"))
+										continue;
+									numparameters = 0;
+									for (j = 0;strcasecmp(com_token, "\n") && strcasecmp(com_token, "}");j++)
+									{
+										if (j < 4)
+										{
+											strlcpy(parameter[j], com_token, sizeof(parameter[j]));
+											numparameters = j + 1;
+										}
+										if (!COM_ParseToken(&text, true))
+											break;
+									}
+									if (developer.integer >= 2)
+									{
+										Con_Printf("%s %i: ", shadername, passnumber);
+										for (j = 0;j < numparameters;j++)
+											Con_Printf(" %s", parameter[j]);
+										Con_Print("\n");
+									}
+									if (passnumber == 0 && numparameters >= 1 && (flags & Q3SURFACEPARM_TRANS))
+									{
+										if (!strcasecmp(parameter[0], "blendfunc"))
+										{
+											if (numparameters == 2 && !strcasecmp(parameter[1], "add"))
+												flags2 |= Q3TEXTUREFLAG_ADDITIVE;
+											else if (numparameters == 3 && !strcasecmp(parameter[1], "gl_one") && !strcasecmp(parameter[2], "gl_one"))
+												flags2 |= Q3TEXTUREFLAG_ADDITIVE;
+											else if (numparameters == 3 && !strcasecmp(parameter[1], "gl_src_alpha") && !strcasecmp(parameter[2], "gl_one"))
+												flags2 |= Q3TEXTUREFLAG_ADDITIVE;
+										}
+										else if (numparameters >= 2 && (!strcasecmp(parameter[0], "map") || !strcasecmp(parameter[0], "clampmap")))
+											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;
+									}
+									// break out a level if it was }
+									if (!strcasecmp(com_token, "}"))
+										break;
+								}
+								passnumber++;
+								continue;
+							}
+							numparameters = 0;
+							for (j = 0;strcasecmp(com_token, "\n") && strcasecmp(com_token, "}");j++)
+							{
+								if (j < 4)
+								{
+									strlcpy(parameter[j], com_token, sizeof(parameter[j]));
+									numparameters = j + 1;
+								}
+								if (!COM_ParseToken(&text, true))
+									break;
+							}
+							if (i == 0 && !strcasecmp(com_token, "}"))
+								break;
+							if (developer.integer >= 2)
+							{
+								Con_Printf("%s: ", shadername);
+								for (j = 0;j < numparameters;j++)
+									Con_Printf(" %s", parameter[j]);
+								Con_Print("\n");
+							}
+							if (numparameters < 1)
+								continue;
+							if (!strcasecmp(parameter[0], "surfaceparm") && numparameters >= 2)
+							{
+								if (!strcasecmp(parameter[1], "alphashadow"))
+									flags |= Q3SURFACEPARM_ALPHASHADOW;
+								else if (!strcasecmp(parameter[1], "areaportal"))
+									flags |= Q3SURFACEPARM_AREAPORTAL;
+								else if (!strcasecmp(parameter[1], "clusterportal"))
+									flags |= Q3SURFACEPARM_CLUSTERPORTAL;
+								else if (!strcasecmp(parameter[1], "detail"))
+									flags |= Q3SURFACEPARM_DETAIL;
+								else if (!strcasecmp(parameter[1], "donotenter"))
+									flags |= Q3SURFACEPARM_DONOTENTER;
+								else if (!strcasecmp(parameter[1], "fog"))
+									flags |= Q3SURFACEPARM_FOG;
+								else if (!strcasecmp(parameter[1], "lava"))
+									flags |= Q3SURFACEPARM_LAVA;
+								else if (!strcasecmp(parameter[1], "lightfilter"))
+									flags |= Q3SURFACEPARM_LIGHTFILTER;
+								else if (!strcasecmp(parameter[1], "metalsteps"))
+									flags |= Q3SURFACEPARM_METALSTEPS;
+								else if (!strcasecmp(parameter[1], "nodamage"))
+									flags |= Q3SURFACEPARM_NODAMAGE;
+								else if (!strcasecmp(parameter[1], "nodlight"))
+									flags |= Q3SURFACEPARM_NODLIGHT;
+								else if (!strcasecmp(parameter[1], "nodraw"))
+									flags |= Q3SURFACEPARM_NODRAW;
+								else if (!strcasecmp(parameter[1], "nodrop"))
+									flags |= Q3SURFACEPARM_NODROP;
+								else if (!strcasecmp(parameter[1], "noimpact"))
+									flags |= Q3SURFACEPARM_NOIMPACT;
+								else if (!strcasecmp(parameter[1], "nolightmap"))
+									flags |= Q3SURFACEPARM_NOLIGHTMAP;
+								else if (!strcasecmp(parameter[1], "nomarks"))
+									flags |= Q3SURFACEPARM_NOMARKS;
+								else if (!strcasecmp(parameter[1], "nomipmaps"))
+									flags |= Q3SURFACEPARM_NOMIPMAPS;
+								else if (!strcasecmp(parameter[1], "nonsolid"))
+									flags |= Q3SURFACEPARM_NONSOLID;
+								else if (!strcasecmp(parameter[1], "origin"))
+									flags |= Q3SURFACEPARM_ORIGIN;
+								else if (!strcasecmp(parameter[1], "playerclip"))
+									flags |= Q3SURFACEPARM_PLAYERCLIP;
+								else if (!strcasecmp(parameter[1], "sky"))
+									flags |= Q3SURFACEPARM_SKY;
+								else if (!strcasecmp(parameter[1], "slick"))
+									flags |= Q3SURFACEPARM_SLICK;
+								else if (!strcasecmp(parameter[1], "slime"))
+									flags |= Q3SURFACEPARM_SLIME;
+								else if (!strcasecmp(parameter[1], "structural"))
+									flags |= Q3SURFACEPARM_STRUCTURAL;
+								else if (!strcasecmp(parameter[1], "trans"))
+									flags |= Q3SURFACEPARM_TRANS;
+								else if (!strcasecmp(parameter[1], "water"))
+									flags |= Q3SURFACEPARM_WATER;
+								else if (!strcasecmp(parameter[1], "pointlight"))
+									flags |= Q3SURFACEPARM_POINTLIGHT;
+								else
+									Con_Printf("%s parsing warning: unknown surfaceparm \"%s\"\n", search->filenames[i], parameter[1]);
+							}
+							else if (!strcasecmp(parameter[0], "sky") && numparameters >= 2)
+								strlcpy(sky, parameter[1], sizeof(sky));
+							else if (!strcasecmp(parameter[0], "skyparms") && numparameters >= 2)
+							{
+								if (!atoi(parameter[1]) && strcasecmp(parameter[1], "-"))
+									strlcpy(sky, parameter[1], sizeof(sky));
+							}
+							else if (!strcasecmp(parameter[0], "cull") && numparameters >= 2)
+							{
+								if (!strcasecmp(parameter[1], "disable") || !strcasecmp(parameter[1], "none") || !strcasecmp(parameter[1], "twosided"))
+									flags2 |= Q3TEXTUREFLAG_TWOSIDED;
+							}
+							else if (!strcasecmp(parameter[0], "nomipmaps"))
+								flags2 |= Q3TEXTUREFLAG_NOMIPMAPS;
+							else if (!strcasecmp(parameter[0], "nopicmip"))
+								flags2 |= Q3TEXTUREFLAG_NOPICMIP;
+							else if (!strcasecmp(parameter[0], "deformvertexes") && numparameters >= 2)
+							{
+								if (!strcasecmp(parameter[1], "autosprite") && numparameters == 2)
+									flags2 |= Q3TEXTUREFLAG_AUTOSPRITE;
+								if (!strcasecmp(parameter[1], "autosprite2") && numparameters == 2)
+									flags2 |= Q3TEXTUREFLAG_AUTOSPRITE2;
+							}
+						}
+						// add shader to list (shadername and flags)
+						// actually here we just poke into the texture settings
+						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])
+								{
+									// quake3 seems to append a _ to the skybox name, so this must do so as well
+									dpsnprintf(loadmodel->brush.skybox, sizeof(loadmodel->brush.skybox), "%s_", sky);
+								}
+							}
+						}
+					}
+					else
+					{
+						Con_Printf("%s parsing error - expected \"{\", found \"%s\"\n", search->filenames[i], com_token);
+						goto parseerror;
+					}
+				}
+parseerror:
+				Mem_Free(f);
+			}
 		}
+	}
 
-		p = LittleLong(in->planenum);
-		out->plane = loadmodel->planes + p;
-
-		out->firstsurface = LittleShort (in->firstface);
-		out->numsurfaces = LittleShort (in->numfaces);
-
-		for (j=0 ; j<2 ; j++)
+	c = 0;
+	for (j = 0, out = loadmodel->data_textures;j < loadmodel->num_textures;j++, out++)
+	{
+		if (out->surfaceparms == -1)
 		{
-			p = LittleShort (in->children[j]);
-			if (p >= 0)
-				out->children[j] = loadmodel->nodes + p;
+			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->children[j] = (mnode_t *)(loadmodel->leafs + (-1 - p));
+				out->basematerialflags |= MATERIALFLAG_WALL;
+			// these are defaults
+			//if (!strncmp(out->name, "textures/skies/", 15))
+			//	out->surfaceparms |= Q3SURFACEPARM_SKY;
+			//if (!strcmp(out->name, "caulk") || !strcmp(out->name, "common/caulk") || !strcmp(out->name, "textures/common/caulk")
+			// || !strcmp(out->name, "nodraw") || !strcmp(out->name, "common/nodraw") || !strcmp(out->name, "textures/common/nodraw"))
+			//	out->surfaceparms |= Q3SURFACEPARM_NODRAW;
+			//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, 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, 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;
 	}
-
-	Mod_SetParent (loadmodel->nodes, NULL);	// sets nodes and leafs
+	if (c)
+		Con_DPrintf("%s: %i textures missing shaders\n", loadmodel->name, c);
 }
 
-/*
-=================
-Mod_LoadLeafs
-=================
-*/
-static void Mod_LoadLeafs (lump_t *l)
+static void Mod_Q3BSP_LoadPlanes(lump_t *l)
 {
-	dleaf_t 	*in;
-	mleaf_t 	*out;
-	int			i, j, count, p;
+	q3dplane_t *in;
+	mplane_t *out;
+	int i, count;
 
 	in = (void *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
+		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 = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->leafs = out;
-	loadmodel->numleafs = count;
+	loadmodel->brush.data_planes = out;
+	loadmodel->brush.num_planes = count;
 
-	for ( i=0 ; i<count ; i++, in++, out++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->mins[j] = LittleShort (in->mins[j]);
-			out->maxs[j] = LittleShort (in->maxs[j]);
-		}
-
-		p = LittleLong(in->contents);
-		out->contents = p;
+		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);
+	}
+}
 
-		out->firstmarksurface = loadmodel->marksurfaces +
-			LittleShort(in->firstmarksurface);
-		out->nummarksurfaces = LittleShort(in->nummarksurfaces);
+static void Mod_Q3BSP_LoadBrushSides(lump_t *l)
+{
+	q3dbrushside_t *in;
+	q3mbrushside_t *out;
+	int i, n, count;
 
-		p = LittleLong(in->visofs);
-		if (p == -1)
-			out->compressed_vis = NULL;
-		else
-			out->compressed_vis = loadmodel->visdata + p;
+	in = (void *)(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));
 
-		for (j=0 ; j<4 ; j++)
-			out->ambient_sound_level[j] = in->ambient_level[j];
+	loadmodel->brush.data_brushsides = out;
+	loadmodel->brush.num_brushsides = count;
 
-		// FIXME: Insert caustics here
+	for (i = 0;i < count;i++, in++, out++)
+	{
+		n = LittleLong(in->planeindex);
+		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->num_textures)
+			Host_Error("Mod_Q3BSP_LoadBrushSides: invalid textureindex %i (%i textures)\n", n, loadmodel->num_textures);
+		out->texture = loadmodel->data_textures + n;
 	}
 }
 
-/*
-=================
-Mod_LoadClipnodes
-=================
-*/
-static void Mod_LoadClipnodes (lump_t *l)
+static void Mod_Q3BSP_LoadBrushes(lump_t *l)
 {
-	dclipnode_t *in, *out;
-	int			i, count;
-	hull_t		*hull;
+	q3dbrush_t *in;
+	q3mbrush_t *out;
+	int i, j, n, c, count, maxplanes;
+	mplane_t *planes;
 
 	in = (void *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
+		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 = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-	loadmodel->clipnodes = out;
-	loadmodel->numclipnodes = count;
+	loadmodel->brush.data_brushes = out;
+	loadmodel->brush.num_brushes = count;
 
-	if (loadmodel->ishlbsp)
+	maxplanes = 0;
+	planes = NULL;
+
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		hull = &loadmodel->hulls[1];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->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);
+		n = LittleLong(in->firstbrushside);
+		c = LittleLong(in->numbrushsides);
+		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->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)
+		{
+			maxplanes = out->numbrushsides;
+			if (planes)
+				Mem_Free(planes);
+			planes = Mem_Alloc(tempmempool, sizeof(mplane_t) * maxplanes);
+		}
+		for (j = 0;j < out->numbrushsides;j++)
+		{
+			VectorCopy(out->firstbrushside[j].plane->normal, planes[j].normal);
+			planes[j].dist = out->firstbrushside[j].plane->dist;
+		}
+		// make the colbrush from the planes
+		out->colbrushf = Collision_NewBrushFromPlanes(loadmodel->mempool, out->numbrushsides, planes, out->texture->supercontents);
+	}
+	if (planes)
+		Mem_Free(planes);
+}
 
-		hull = &loadmodel->hulls[2];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->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);
+static void Mod_Q3BSP_LoadEffects(lump_t *l)
+{
+	q3deffect_t *in;
+	q3deffect_t *out;
+	int i, n, count;
 
-		hull = &loadmodel->hulls[3];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->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->hulls[1];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->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);
+	in = (void *)(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));
 
-		hull = &loadmodel->hulls[2];
-		hull->clipnodes = out;
-		hull->firstclipnode = 0;
-		hull->lastclipnode = count-1;
-		hull->planes = loadmodel->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;
-		VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-	}
+	loadmodel->brushq3.data_effects = out;
+	loadmodel->brushq3.num_effects = count;
 
-	for (i=0 ; i<count ; i++, out++, in++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		out->planenum = LittleLong(in->planenum);
-		out->children[0] = LittleShort(in->children[0]);
-		out->children[1] = LittleShort(in->children[1]);
-		if (out->children[0] >= count || out->children[1] >= count)
-			Host_Error("Corrupt clipping hull (out of range child)\n");
+		strlcpy (out->shadername, in->shadername, sizeof (out->shadername));
+		n = LittleLong(in->brushindex);
+		if (n < 0 || n >= loadmodel->brush.num_brushes)
+			Host_Error("Mod_Q3BSP_LoadEffects: invalid brushindex %i (%i brushes)\n", n, loadmodel->brush.num_brushes);
+		out->brushindex = n;
+		out->unknown = LittleLong(in->unknown);
 	}
 }
 
-/*
-=================
-Mod_MakeHull0
-
-Duplicate the drawing hull structure as a clipping hull
-=================
-*/
-static void Mod_MakeHull0 (void)
+static void Mod_Q3BSP_LoadVertices(lump_t *l)
 {
-	mnode_t		*in;
-	dclipnode_t *out;
-	int			i;
-	hull_t		*hull;
-
-	hull = &loadmodel->hulls[0];
-
-	in = loadmodel->nodes;
-	out = Mem_Alloc(loadmodel->mempool, loadmodel->numnodes * sizeof(dclipnode_t));
+	q3dvertex_t *in;
+	int i, count;
 
-	hull->clipnodes = out;
-	hull->firstclipnode = 0;
-	hull->lastclipnode = loadmodel->numnodes - 1;
-	hull->planes = loadmodel->planes;
-
-	for (i = 0;i < loadmodel->numnodes;i++, out++, in++)
+	in = (void *)(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 + 4)));
+	loadmodel->brushq3.data_texcoordtexture2f = loadmodel->brushq3.data_vertex3f + count * 3;
+	loadmodel->brushq3.data_texcoordlightmap2f = loadmodel->brushq3.data_texcoordtexture2f + count * 2;
+	loadmodel->brushq3.data_color4f = loadmodel->brushq3.data_texcoordlightmap2f + count * 2;
+
+	for (i = 0;i < count;i++, in++)
 	{
-		out->planenum = in->plane - loadmodel->planes;
-		out->children[0] = in->children[0]->contents < 0 ? in->children[0]->contents : in->children[0] - loadmodel->nodes;
-		out->children[1] = in->children[1]->contents < 0 ? in->children[1]->contents : in->children[1] - loadmodel->nodes;
+		loadmodel->brushq3.data_vertex3f[i * 3 + 0] = LittleFloat(in->origin3f[0]);
+		loadmodel->brushq3.data_vertex3f[i * 3 + 1] = LittleFloat(in->origin3f[1]);
+		loadmodel->brushq3.data_vertex3f[i * 3 + 2] = LittleFloat(in->origin3f[2]);
+		loadmodel->brushq3.data_texcoordtexture2f[i * 2 + 0] = LittleFloat(in->texcoord2f[0]);
+		loadmodel->brushq3.data_texcoordtexture2f[i * 2 + 1] = LittleFloat(in->texcoord2f[1]);
+		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_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);
+		loadmodel->brushq3.data_color4f[i * 4 + 3] = in->color4ub[3] * (1.0f / 255.0f);
 	}
 }
 
-/*
-=================
-Mod_LoadMarksurfaces
-=================
-*/
-static void Mod_LoadMarksurfaces (lump_t *l)
+static void Mod_Q3BSP_LoadTriangles(lump_t *l)
 {
-	int		i, j;
-	short	*in;
+	int *in;
+	int *out;
+	int i, count;
 
 	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	loadmodel->nummarksurfaces = l->filelen / sizeof(*in);
-	loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(msurface_t *));
+	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));
+
+	loadmodel->brushq3.num_triangles = count / 3;
+	loadmodel->brushq3.data_element3i = out;
 
-	for (i = 0;i < loadmodel->nummarksurfaces;i++)
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		j = (unsigned) LittleShort(in[i]);
-		if (j >= loadmodel->numsurfaces)
-			Host_Error ("Mod_ParseMarksurfaces: bad surface number");
-		loadmodel->marksurfaces[i] = loadmodel->surfaces + j;
+		*out = LittleLong(*in);
+		if (*out < 0 || *out >= loadmodel->brushq3.num_vertices)
+		{
+			Con_Printf("Mod_Q3BSP_LoadTriangles: invalid vertexindex %i (%i vertices), setting to 0\n", *out, loadmodel->brushq3.num_vertices);
+			*out = 0;
+		}
 	}
 }
 
-/*
-=================
-Mod_LoadSurfedges
-=================
-*/
-static void Mod_LoadSurfedges (lump_t *l)
+static void Mod_Q3BSP_LoadLightmaps(lump_t *l)
 {
-	int		i;
-	int		*in;
+	q3dlightmap_t *in;
+	rtexture_t **out;
+	int i, count;
 
+	if (!l->filelen)
+		return;
 	in = (void *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	loadmodel->numsurfedges = l->filelen / sizeof(*in);
-	loadmodel->surfedges = Mem_Alloc(loadmodel->mempool, loadmodel->numsurfedges * sizeof(int));
+		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));
 
-	for (i = 0;i < loadmodel->numsurfedges;i++)
-		loadmodel->surfedges[i] = LittleLong (in[i]);
-}
+	loadmodel->brushq3.data_lightmaps = out;
+	loadmodel->brushq3.num_lightmaps = count;
 
+	for (i = 0;i < count;i++, in++, out++)
+		*out = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", i), 128, 128, in->rgb, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+}
 
-/*
-=================
-Mod_LoadPlanes
-=================
-*/
-static void Mod_LoadPlanes (lump_t *l)
+static void Mod_Q3BSP_LoadFaces(lump_t *l)
 {
-	int			i;
-	mplane_t	*out;
-	dplane_t 	*in;
+	q3dface_t *in, *oldin;
+	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;
+	float *originalvertex3f;
+	//float *originalsvector3f;
+	//float *originaltvector3f;
+	//float *originalnormal3f;
+	float *originalcolor4f;
+	float *originaltexcoordtexture2f;
+	float *originaltexcoordlightmap2f;
+	float *v;
+	surfmesh_t *mesh, *tempmeshlist[1024];
 
 	in = (void *)(mod_base + l->fileofs);
 	if (l->filelen % sizeof(*in))
-		Host_Error ("MOD_LoadBmodel: funny lump size in %s", loadmodel->name);
+		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));
 
-	loadmodel->numplanes = l->filelen / sizeof(*in);
-	loadmodel->planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->numplanes * sizeof(*out));
+	loadmodel->data_surfaces = out;
+	loadmodel->num_surfaces = count;
 
-	for (i = 0;i < loadmodel->numplanes;i++, in++, out++)
+	i = 0;
+	for (meshnum = 0;i < count;meshnum++)
 	{
-		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);
-	}
-}
+		oldi = i;
+		oldin = in;
+		oldout = out;
+		meshvertices = 0;
+		meshtriangles = 0;
+		for (;i < count;i++, in++, out++)
+		{
+			// check face type first
+			type = LittleLong(in->type);
+			if (type != Q3FACETYPE_POLYGON
+			 && type != Q3FACETYPE_PATCH
+			 && type != Q3FACETYPE_MESH
+			 && type != Q3FACETYPE_FLARE)
+			{
+				Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i: unknown face type %i\n", i, type);
+				continue;
+			}
 
-#define MAX_POINTS_ON_WINDING 64
+			n = LittleLong(in->textureindex);
+			if (n < 0 || n >= loadmodel->num_textures)
+			{
+				Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i: invalid textureindex %i (%i textures)\n", i, n, loadmodel->num_textures);
+				continue;
+			}
+			out->texture = loadmodel->data_textures + n;
+			n = LittleLong(in->effectindex);
+			if (n < -1 || n >= loadmodel->brushq3.num_effects)
+			{
+				if (developer.integer >= 2)
+					Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid effectindex %i (%i effects)\n", i, out->texture->name, n, loadmodel->brushq3.num_effects);
+				n = -1;
+			}
+			if (n == -1)
+				out->effect = NULL;
+			else
+				out->effect = loadmodel->brushq3.data_effects + n;
+			n = LittleLong(in->lightmapindex);
+			if (n >= loadmodel->brushq3.num_lightmaps)
+			{
+				Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid lightmapindex %i (%i lightmaps)\n", i, out->texture->name, n, loadmodel->brushq3.num_lightmaps);
+				n = -1;
+			}
+			else if (n < 0)
+				n = -1;
+			if (n == -1)
+				out->lightmaptexture = NULL;
+			else
+				out->lightmaptexture = loadmodel->brushq3.data_lightmaps[n];
 
-typedef struct
-{
-	int numpoints;
-	int padding;
-	double points[8][3]; // variable sized
-}
-winding_t;
+			firstvertex = LittleLong(in->firstvertex);
+			numvertices = LittleLong(in->numvertices);
+			firstelement = LittleLong(in->firstelement);
+			numtriangles = LittleLong(in->numelements) / 3;
+			if (numtriangles * 3 != LittleLong(in->numelements))
+			{
+				Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): numelements %i is not a multiple of 3\n", i, out->texture->name, LittleLong(in->numelements));
+				continue;
+			}
+			if (firstvertex < 0 || firstvertex + numvertices > loadmodel->brushq3.num_vertices)
+			{
+				Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid vertex range %i : %i (%i vertices)\n", i, out->texture->name, firstvertex, firstvertex + numvertices, loadmodel->brushq3.num_vertices);
+				continue;
+			}
+			if (firstelement < 0 || firstelement + numtriangles * 3 > loadmodel->brushq3.num_triangles * 3)
+			{
+				Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid element range %i : %i (%i elements)\n", i, out->texture->name, firstelement, firstelement + numtriangles * 3, loadmodel->brushq3.num_triangles * 3);
+				continue;
+			}
+			switch(type)
+			{
+			case Q3FACETYPE_POLYGON:
+			case Q3FACETYPE_MESH:
+				// no processing necessary
+				break;
+			case Q3FACETYPE_PATCH:
+				patchsize[0] = LittleLong(in->specific.patch.patchsize[0]);
+				patchsize[1] = LittleLong(in->specific.patch.patchsize[1]);
+				if (numvertices != (patchsize[0] * patchsize[1]) || patchsize[0] < 3 || patchsize[1] < 3 || !(patchsize[0] & 1) || !(patchsize[1] & 1) || patchsize[0] * patchsize[1] >= min(r_subdivisions_maxvertices.integer, r_subdivisions_collision_maxvertices.integer))
+				{
+					Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid patchsize %ix%i\n", i, out->texture->name, patchsize[0], patchsize[1]);
+					continue;
+				}
+				originalvertex3f = loadmodel->brushq3.data_vertex3f + firstvertex * 3;
+				// convert patch to Q3FACETYPE_MESH
+				xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value);
+				ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value);
+				// bound to user settings
+				xtess = bound(r_subdivisions_mintess.integer, xtess, r_subdivisions_maxtess.integer);
+				ytess = bound(r_subdivisions_mintess.integer, ytess, r_subdivisions_maxtess.integer);
+				// bound to sanity settings
+				xtess = bound(1, xtess, 1024);
+				ytess = bound(1, ytess, 1024);
+				// bound to user limit on vertices
+				while ((xtess > 1 || ytess > 1) && (((patchsize[0] - 1) * xtess) + 1) * (((patchsize[1] - 1) * ytess) + 1) > min(r_subdivisions_maxvertices.integer, 262144))
+				{
+					if (xtess > ytess)
+						xtess--;
+					else
+						ytess--;
+				}
+				finalwidth = ((patchsize[0] - 1) * xtess) + 1;
+				finalheight = ((patchsize[1] - 1) * ytess) + 1;
+				numvertices = finalwidth * finalheight;
+				numtriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+				break;
+			case Q3FACETYPE_FLARE:
+				if (developer.integer >= 2)
+					Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): Q3FACETYPE_FLARE not supported (yet)\n", i, out->texture->name);
+				// don't render it
+				continue;
+			}
+			out->num_vertices = numvertices;
+			out->num_triangles = numtriangles;
+			if (meshvertices + out->num_vertices > 65536)
+				break;
+			meshvertices += out->num_vertices;
+			meshtriangles += out->num_triangles;
+		}
 
-/*
-==================
-NewWinding
-==================
-*/
-static winding_t *NewWinding (int points)
-{
-	winding_t *w;
-	int size;
+		i = oldi;
+		in = oldin;
+		out = oldout;
+		mesh = tempmeshlist[meshnum] = Mod_AllocSurfMesh(loadmodel->mempool, meshvertices, meshtriangles, false, false, true, false);
+		meshvertices = 0;
+		meshtriangles = 0;
+		for (;i < count && meshvertices + out->num_vertices <= mesh->num_vertices;i++, in++, out++)
+		{
+			if (out->num_vertices < 3 || out->num_triangles < 1)
+				continue;
 
-	if (points > MAX_POINTS_ON_WINDING)
-		Sys_Error("NewWinding: too many points\n");
+			type = LittleLong(in->type);
+			firstvertex = LittleLong(in->firstvertex);
+			firstelement = LittleLong(in->firstelement);
+			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->num_vertices;j++)
+				{
+					(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->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]);
+				patchsize[1] = LittleLong(in->specific.patch.patchsize[1]);
+				originalvertex3f = loadmodel->brushq3.data_vertex3f + firstvertex * 3;
+				originaltexcoordtexture2f = loadmodel->brushq3.data_texcoordtexture2f + firstvertex * 2;
+				originaltexcoordlightmap2f = loadmodel->brushq3.data_texcoordlightmap2f + firstvertex * 2;
+				originalcolor4f = loadmodel->brushq3.data_color4f + firstvertex * 4;
+				// convert patch to Q3FACETYPE_MESH
+				xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value);
+				ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value);
+				// bound to user settings
+				xtess = bound(r_subdivisions_mintess.integer, xtess, r_subdivisions_maxtess.integer);
+				ytess = bound(r_subdivisions_mintess.integer, ytess, r_subdivisions_maxtess.integer);
+				// bound to sanity settings
+				xtess = bound(1, xtess, 1024);
+				ytess = bound(1, ytess, 1024);
+				// bound to user limit on vertices
+				while ((xtess > 1 || ytess > 1) && (((patchsize[0] - 1) * xtess) + 1) * (((patchsize[1] - 1) * ytess) + 1) > min(r_subdivisions_maxvertices.integer, 262144))
+				{
+					if (xtess > ytess)
+						xtess--;
+					else
+						ytess--;
+				}
+				finalwidth = ((patchsize[0] - 1) * xtess) + 1;
+				finalheight = ((patchsize[1] - 1) * ytess) + 1;
+				finalvertices = finalwidth * finalheight;
+				finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+				type = Q3FACETYPE_MESH;
+				// generate geometry
+				// (note: normals are skipped because they get recalculated)
+				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->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->num_vertices, out->num_triangles);
+				}
+				// q3map does not put in collision brushes for curves... ugh
+				// build the lower quality collision geometry
+				xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value);
+				ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value);
+				// bound to user settings
+				xtess = bound(r_subdivisions_collision_mintess.integer, xtess, r_subdivisions_collision_maxtess.integer);
+				ytess = bound(r_subdivisions_collision_mintess.integer, ytess, r_subdivisions_collision_maxtess.integer);
+				// bound to sanity settings
+				xtess = bound(1, xtess, 1024);
+				ytess = bound(1, ytess, 1024);
+				// bound to user limit on vertices
+				while ((xtess > 1 || ytess > 1) && (((patchsize[0] - 1) * xtess) + 1) * (((patchsize[1] - 1) * ytess) + 1) > min(r_subdivisions_collision_maxvertices.integer, 262144))
+				{
+					if (xtess > ytess)
+						xtess--;
+					else
+						ytess--;
+				}
+				finalwidth = ((patchsize[0] - 1) * xtess) + 1;
+				finalheight = ((patchsize[1] - 1) * ytess) + 1;
+				finalvertices = finalwidth * finalheight;
+				finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+
+				out->data_collisionvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * finalvertices);
+				out->data_collisionelement3i = 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->num_vertices, (out->groupmesh->data_vertex3f + 3 * out->num_firstvertex), 0.25);
+				Mod_SnapVertices(3, out->num_collisionvertices, out->data_collisionvertex3f, 1);
+
+				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->num_vertices, out->num_collisionvertices, oldnumtriangles, oldnumtriangles2, oldnumtriangles - out->num_triangles, oldnumtriangles2 - out->num_collisiontriangles);
+				break;
+			default:
+				break;
+			}
+			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, 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->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 per pixel lighting
+			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);
+			// calculate a bounding box
+			VectorClear(out->mins);
+			VectorClear(out->maxs);
+			if (out->num_vertices)
+			{
+				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]);
+					out->mins[1] = min(out->mins[1], v[1]);
+					out->maxs[1] = max(out->maxs[1], v[1]);
+					out->mins[2] = min(out->mins[2], v[2]);
+					out->maxs[2] = max(out->maxs[2], v[2]);
+				}
+				out->mins[0] -= 1.0f;
+				out->mins[1] -= 1.0f;
+				out->mins[2] -= 1.0f;
+				out->maxs[0] += 1.0f;
+				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;
+		}
+	}
 
-	size = sizeof(winding_t) + sizeof(double[3]) * (points - 8);
-	w = Mem_Alloc(loadmodel->mempool, size);
-	memset (w, 0, size);
+	// now store the completed list of meshes
+	loadmodel->nummeshes = meshnum;
+	if (loadmodel->nummeshes)
+	{
+		loadmodel->meshlist = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *) * loadmodel->nummeshes);
+		memcpy(loadmodel->meshlist, tempmeshlist, sizeof(surfmesh_t *) * loadmodel->nummeshes);
+	}
 
-	return w;
+	// 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 FreeWinding (winding_t *w)
+static void Mod_Q3BSP_LoadModels(lump_t *l)
 {
-	Mem_Free(w);
-}
+	q3dmodel_t *in;
+	q3dmodel_t *out;
+	int i, j, n, c, count;
 
-/*
-=================
-BaseWindingForPlane
-=================
-*/
-static winding_t *BaseWindingForPlane (mplane_t *p)
-{
-	double org[3], vright[3], vup[3], normal[3];
-	winding_t *w;
+	in = (void *)(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));
 
-	VectorCopy(p->normal, normal);
-	VectorVectorsDouble(normal, vright, vup);
+	loadmodel->brushq3.data_models = out;
+	loadmodel->brushq3.num_models = count;
 
-	VectorScale (vup, 1024.0*1024.0*1024.0, vup);
-	VectorScale (vright, 1024.0*1024.0*1024.0, vright);
+	for (i = 0;i < count;i++, in++, out++)
+	{
+		for (j = 0;j < 3;j++)
+		{
+			out->mins[j] = LittleFloat(in->mins[j]);
+			out->maxs[j] = LittleFloat(in->maxs[j]);
+		}
+		n = LittleLong(in->firstface);
+		c = LittleLong(in->numfaces);
+		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->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;
+	}
+}
 
-	// project a really big	axis aligned box onto the plane
-	w = NewWinding (4);
+static void Mod_Q3BSP_LoadLeafBrushes(lump_t *l)
+{
+	int *in;
+	int *out;
+	int i, n, count;
 
-	VectorScale (p->normal, p->dist, org);
+	in = (void *)(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));
 
-	VectorSubtract (org, vright, w->points[0]);
-	VectorAdd (w->points[0], vup, w->points[0]);
+	loadmodel->brush.data_leafbrushes = out;
+	loadmodel->brush.num_leafbrushes = count;
 
-	VectorAdd (org, vright, w->points[1]);
-	VectorAdd (w->points[1], vup, w->points[1]);
+	for (i = 0;i < count;i++, in++, out++)
+	{
+		n = LittleLong(*in);
+		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;
+	}
+}
 
-	VectorAdd (org, vright, w->points[2]);
-	VectorSubtract (w->points[2], vup, w->points[2]);
+static void Mod_Q3BSP_LoadLeafFaces(lump_t *l)
+{
+	int *in;
+	int *out;
+	int i, n, count;
 
-	VectorSubtract (org, vright, w->points[3]);
-	VectorSubtract (w->points[3], vup, w->points[3]);
+	in = (void *)(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));
 
-	w->numpoints = 4;
+	loadmodel->brush.data_leafsurfaces = out;
+	loadmodel->brush.num_leafsurfaces = count;
 
-	return w;
+	for (i = 0;i < count;i++, in++, out++)
+	{
+		n = LittleLong(*in);
+		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;
+	}
 }
 
-/*
-==================
-ClipWinding
-
-Clips the winding to the plane, returning the new winding on the positive side
-Frees the input winding.
-If keepon is true, an exactly on-plane winding will be saved, otherwise
-it will be clipped away.
-==================
-*/
-static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
+static void Mod_Q3BSP_LoadLeafs(lump_t *l)
 {
-	double	dists[MAX_POINTS_ON_WINDING + 1];
-	int		sides[MAX_POINTS_ON_WINDING + 1];
-	int		counts[3];
-	double	dot;
-	int		i, j;
-	double	*p1, *p2;
-	double	mid[3];
-	winding_t	*neww;
-	int		maxpts;
+	q3dleaf_t *in;
+	mleaf_t *out;
+	int i, j, n, c, count;
 
-	counts[SIDE_FRONT] = counts[SIDE_BACK] = counts[SIDE_ON] = 0;
-
-	// determine sides for each point
-	for (i = 0;i < in->numpoints;i++)
-	{
-		dists[i] = dot = DotProduct (in->points[i], split->normal) - split->dist;
-		if (dot > ON_EPSILON)
-			sides[i] = SIDE_FRONT;
-		else if (dot < -ON_EPSILON)
-			sides[i] = SIDE_BACK;
-		else
-			sides[i] = SIDE_ON;
-		counts[sides[i]]++;
-	}
-	sides[i] = sides[0];
-	dists[i] = dists[0];
+	in = (void *)(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));
 
-	if (keepon && !counts[0] && !counts[1])
-		return in;
+	loadmodel->brush.data_leafs = out;
+	loadmodel->brush.num_leafs = count;
 
-	if (!counts[0])
+	for (i = 0;i < count;i++, in++, out++)
 	{
-		FreeWinding (in);
-		return NULL;
+		out->parent = NULL;
+		out->plane = NULL;
+		out->clusterindex = LittleLong(in->clusterindex);
+		out->areaindex = LittleLong(in->areaindex);
+		for (j = 0;j < 3;j++)
+		{
+			// yes the mins/maxs are ints
+			out->mins[j] = LittleLong(in->mins[j]) - 1;
+			out->maxs[j] = LittleLong(in->maxs[j]) + 1;
+		}
+		n = LittleLong(in->firstleafface);
+		c = LittleLong(in->numleaffaces);
+		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->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;
 	}
-	if (!counts[1])
-		return in;
-
-	maxpts = in->numpoints+4;	// can't use counts[0]+2 because of fp grouping errors
-	if (maxpts > MAX_POINTS_ON_WINDING)
-		Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+}
 
-	neww = NewWinding (maxpts);
+static void Mod_Q3BSP_LoadNodes(lump_t *l)
+{
+	q3dnode_t *in;
+	mnode_t *out;
+	int i, j, n, count;
 
-	for (i = 0;i < in->numpoints;i++)
-	{
-		if (neww->numpoints >= maxpts)
-			Sys_Error ("ClipWinding: points exceeded estimate");
+	in = (void *)(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));
 
-		p1 = in->points[i];
+	loadmodel->brush.data_nodes = out;
+	loadmodel->brush.num_nodes = count;
 
-		if (sides[i] == SIDE_ON)
+	for (i = 0;i < count;i++, in++, out++)
+	{
+		out->parent = NULL;
+		n = LittleLong(in->planeindex);
+		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++)
 		{
-			VectorCopy (p1, neww->points[neww->numpoints]);
-			neww->numpoints++;
-			continue;
+			n = LittleLong(in->childrenindex[j]);
+			if (n >= 0)
+			{
+				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->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);
+			}
 		}
-
-		if (sides[i] == SIDE_FRONT)
+		for (j = 0;j < 3;j++)
 		{
-			VectorCopy (p1, neww->points[neww->numpoints]);
-			neww->numpoints++;
+			// yes the mins/maxs are ints
+			out->mins[j] = LittleLong(in->mins[j]) - 1;
+			out->maxs[j] = LittleLong(in->maxs[j]) + 1;
 		}
+	}
 
-		if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-			continue;
-
-		// generate a split point
-		p2 = in->points[(i+1)%in->numpoints];
+	// set the parent pointers
+	Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL);
+}
 
-		dot = dists[i] / (dists[i]-dists[i+1]);
-		for (j = 0;j < 3;j++)
-		{	// avoid round off error when possible
-			if (split->normal[j] == 1)
-				mid[j] = split->dist;
-			else if (split->normal[j] == -1)
-				mid[j] = -split->dist;
-			else
-				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
-		}
+static void Mod_Q3BSP_LoadLightGrid(lump_t *l)
+{
+	q3dlightgrid_t *in;
+	q3dlightgrid_t *out;
+	int count;
 
-		VectorCopy (mid, neww->points[neww->numpoints]);
-		neww->numpoints++;
+	in = (void *)(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];
+	loadmodel->brushq3.num_lightgrid_scale[1] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[1];
+	loadmodel->brushq3.num_lightgrid_scale[2] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[2];
+	loadmodel->brushq3.num_lightgrid_imins[0] = ceil(loadmodel->brushq3.data_models->mins[0] * loadmodel->brushq3.num_lightgrid_scale[0]);
+	loadmodel->brushq3.num_lightgrid_imins[1] = ceil(loadmodel->brushq3.data_models->mins[1] * loadmodel->brushq3.num_lightgrid_scale[1]);
+	loadmodel->brushq3.num_lightgrid_imins[2] = ceil(loadmodel->brushq3.data_models->mins[2] * loadmodel->brushq3.num_lightgrid_scale[2]);
+	loadmodel->brushq3.num_lightgrid_imaxs[0] = floor(loadmodel->brushq3.data_models->maxs[0] * loadmodel->brushq3.num_lightgrid_scale[0]);
+	loadmodel->brushq3.num_lightgrid_imaxs[1] = floor(loadmodel->brushq3.data_models->maxs[1] * loadmodel->brushq3.num_lightgrid_scale[1]);
+	loadmodel->brushq3.num_lightgrid_imaxs[2] = floor(loadmodel->brushq3.data_models->maxs[2] * loadmodel->brushq3.num_lightgrid_scale[2]);
+	loadmodel->brushq3.num_lightgrid_isize[0] = loadmodel->brushq3.num_lightgrid_imaxs[0] - loadmodel->brushq3.num_lightgrid_imins[0] + 1;
+	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];
+	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);
 	}
 
-	// free the original winding
-	FreeWinding (in);
+	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+	loadmodel->brushq3.data_lightgrid = out;
+	loadmodel->brushq3.num_lightgrid = count;
 
-	return neww;
-}
+	// no swapping or validation necessary
+	if (l->filelen)
+		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]);
+}
 
-/*
-==================
-DivideWinding
-
-Divides a winding by a plane, producing one or two windings.  The
-original winding is not damaged or freed.  If only on one side, the
-returned winding will be the input winding.  If on both sides, two
-new windings will be created.
-==================
-*/
-static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t **back)
+static void Mod_Q3BSP_LoadPVS(lump_t *l)
 {
-	double	dists[MAX_POINTS_ON_WINDING + 1];
-	int		sides[MAX_POINTS_ON_WINDING + 1];
-	int		counts[3];
-	double	dot;
-	int		i, j;
-	double	*p1, *p2;
-	double	mid[3];
-	winding_t	*f, *b;
-	int		maxpts;
-
-	counts[SIDE_FRONT] = counts[SIDE_BACK] = counts[SIDE_ON] = 0;
+	q3dpvs_t *in;
+	int totalchains;
 
-	// determine sides for each point
-	for (i = 0;i < in->numpoints;i++)
+	if (l->filelen == 0)
 	{
-		dot = DotProduct (in->points[i], split->normal);
-		dot -= split->dist;
-		dists[i] = dot;
-		if (dot > ON_EPSILON) sides[i] = SIDE_FRONT;
-		else if (dot < -ON_EPSILON) sides[i] = SIDE_BACK;
-		else sides[i] = SIDE_ON;
-		counts[sides[i]]++;
+		int i;
+		// 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->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);
+		memset(loadmodel->brush.data_pvsclusters, 0xFF, totalchains);
+		return;
 	}
-	sides[i] = sides[0];
-	dists[i] = dists[0];
 
-	*front = *back = NULL;
+	in = (void *)(mod_base + l->fileofs);
+	if (l->filelen < 9)
+		Host_Error("Mod_Q3BSP_LoadPVS: funny lump size in %s",loadmodel->name);
+
+	loadmodel->brush.num_pvsclusters = LittleLong(in->numclusters);
+	loadmodel->brush.num_pvsclusterbytes = LittleLong(in->chainlength);
+	if (loadmodel->brush.num_pvsclusterbytes < ((loadmodel->brush.num_pvsclusters + 7) / 8))
+		Host_Error("Mod_Q3BSP_LoadPVS: (chainlength = %i) < ((numclusters = %i) + 7) / 8\n", loadmodel->brush.num_pvsclusterbytes, loadmodel->brush.num_pvsclusters);
+	totalchains = loadmodel->brush.num_pvsclusterbytes * loadmodel->brush.num_pvsclusters;
+	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);
+}
 
-	if (!counts[0])
+static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
+{
+	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)
 	{
-		*back = in;
+		ambientcolor[0] = 1;
+		ambientcolor[1] = 1;
+		ambientcolor[2] = 1;
 		return;
 	}
-	if (!counts[1])
+	Matrix4x4_Transform(&model->brushq3.num_lightgrid_indexfromworld, p, transformed);
+	//Matrix4x4_Print(&model->brushq3.num_lightgrid_indexfromworld);
+	//Con_Printf("%f %f %f transformed %f %f %f clamped ", p[0], p[1], p[2], transformed[0], transformed[1], transformed[2]);
+	transformed[0] = bound(0, transformed[0], model->brushq3.num_lightgrid_isize[0] - 1);
+	transformed[1] = bound(0, transformed[1], model->brushq3.num_lightgrid_isize[1] - 1);
+	transformed[2] = bound(0, transformed[2], model->brushq3.num_lightgrid_isize[2] - 1);
+	index[0] = (int)floor(transformed[0]);
+	index[1] = (int)floor(transformed[1]);
+	index[2] = (int)floor(transformed[2]);
+	//Con_Printf("%f %f %f index %i %i %i:\n", transformed[0], transformed[1], transformed[2], index[0], index[1], index[2]);
+	// now lerp the values
+	VectorClear(diffusenormal);
+	a = &model->brushq3.data_lightgrid[(index[2] * model->brushq3.num_lightgrid_isize[1] + index[1]) * model->brushq3.num_lightgrid_isize[0] + index[0]];
+	for (k = 0;k < 2;k++)
 	{
-		*front = in;
-		return;
+		blend1 = (k ? (transformed[2] - index[2]) : (1 - (transformed[2] - index[2])));
+		if (blend1 < 0.001f || index[2] + k >= model->brushq3.num_lightgrid_isize[2])
+			continue;
+		for (j = 0;j < 2;j++)
+		{
+			blend2 = blend1 * (j ? (transformed[1] - index[1]) : (1 - (transformed[1] - index[1])));
+			if (blend2 < 0.001f || index[1] + j >= model->brushq3.num_lightgrid_isize[1])
+				continue;
+			for (i = 0;i < 2;i++)
+			{
+				blend = blend2 * (i ? (transformed[0] - index[0]) : (1 - (transformed[0] - index[0])));
+				if (blend < 0.001f || index[0] + i >= model->brushq3.num_lightgrid_isize[0])
+					continue;
+				s = a + (k * model->brushq3.num_lightgrid_isize[1] + j) * model->brushq3.num_lightgrid_isize[0] + i;
+				VectorMA(ambientcolor, blend * (1.0f / 128.0f), s->ambientrgb, ambientcolor);
+				VectorMA(diffusecolor, blend * (1.0f / 128.0f), s->diffusergb, diffusecolor);
+				pitch = s->diffusepitch * M_PI / 128;
+				yaw = s->diffuseyaw * M_PI / 128;
+				sinpitch = sin(pitch);
+				diffusenormal[0] += blend * (cos(yaw) * sinpitch);
+				diffusenormal[1] += blend * (sin(yaw) * sinpitch);
+				diffusenormal[2] += blend * (cos(pitch));
+				//Con_Printf("blend %f: ambient %i %i %i, diffuse %i %i %i, diffusepitch %i diffuseyaw %i (%f %f, normal %f %f %f)\n", blend, s->ambientrgb[0], s->ambientrgb[1], s->ambientrgb[2], s->diffusergb[0], s->diffusergb[1], s->diffusergb[2], s->diffusepitch, s->diffuseyaw, pitch, yaw, (cos(yaw) * cospitch), (sin(yaw) * cospitch), (-sin(pitch)));
+			}
+		}
 	}
+	VectorNormalize(diffusenormal);
+	//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]);
+}
 
-	maxpts = in->numpoints+4;	// can't use counts[0]+2 because of fp grouping errors
-
-	if (maxpts > MAX_POINTS_ON_WINDING)
-		Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
-
-	*front = f = NewWinding (maxpts);
-	*back = b = NewWinding (maxpts);
-
-	for (i = 0;i < in->numpoints;i++)
+static void Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace_t *trace, model_t *model, mnode_t *node, const vec3_t point, int markframe)
+{
+	int i;
+	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 = (mleaf_t *)node;
+	for (i = 0;i < leaf->numleafbrushes;i++)
 	{
-		if (f->numpoints >= maxpts || b->numpoints >= maxpts)
-			Sys_Error ("DivideWinding: points exceeded estimate");
-
-		p1 = in->points[i];
-
-		if (sides[i] == SIDE_ON)
+		brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
+		if (brush && brush->markframe != markframe && BoxesOverlap(point, point, brush->mins, brush->maxs))
 		{
-			VectorCopy (p1, f->points[f->numpoints]);
-			f->numpoints++;
-			VectorCopy (p1, b->points[b->numpoints]);
-			b->numpoints++;
-			continue;
+			brush->markframe = markframe;
+			Collision_TracePointBrushFloat(trace, point, brush);
 		}
+	}
+	// can't do point traces on curves (they have no thickness)
+}
 
-		if (sides[i] == SIDE_FRONT)
+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];
+	mleaf_t *leaf;
+	msurface_t *surface;
+	colbrushf_t *brush;
+	if (startfrac > trace->realfraction)
+		return;
+	// note: all line fragments past first impact fraction are ignored
+	if (VectorCompare(start, end))
+	{
+		// find which leaf the point is in
+		while (node->plane)
+			node = node->children[DotProduct(start, node->plane->normal) < node->plane->dist];
+	}
+	else
+	{
+		// find which nodes the line is in and recurse for them
+		while (node->plane)
 		{
-			VectorCopy (p1, f->points[f->numpoints]);
-			f->numpoints++;
+			// recurse down node sides
+			dist1 = PlaneDiff(start, node->plane);
+			dist2 = PlaneDiff(end, node->plane);
+			startside = dist1 < 0;
+			endside = dist2 < 0;
+			if (startside == endside)
+			{
+				// most of the time the line fragment is on one side of the plane
+				node = node->children[startside];
+			}
+			else
+			{
+				// line crosses node plane, split the line
+				midfrac = dist1 / (dist1 - dist2);
+				VectorLerp(start, midfrac, end, mid);
+				// take the near side first
+				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, model, node->children[endside], mid, end, midfrac, endfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+				return;
+			}
 		}
-		else if (sides[i] == SIDE_BACK)
+	}
+	// hit a leaf
+	nodesegmentmins[0] = min(start[0], end[0]);
+	nodesegmentmins[1] = min(start[1], end[1]);
+	nodesegmentmins[2] = min(start[2], end[2]);
+	nodesegmentmaxs[0] = max(start[0], end[0]);
+	nodesegmentmaxs[1] = max(start[1], end[1]);
+	nodesegmentmaxs[2] = max(start[2], end[2]);
+	// line trace the brushes
+	leaf = (mleaf_t *)node;
+	for (i = 0;i < leaf->numleafbrushes;i++)
+	{
+		brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
+		if (brush && brush->markframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, brush->mins, brush->maxs))
 		{
-			VectorCopy (p1, b->points[b->numpoints]);
-			b->numpoints++;
+			brush->markframe = markframe;
+			Collision_TraceLineBrushFloat(trace, linestart, lineend, brush, brush);
+			if (startfrac > trace->realfraction)
+				return;
 		}
-
-		if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-			continue;
-
-		// generate a split point
-		p2 = in->points[(i+1)%in->numpoints];
-
-		dot = dists[i] / (dists[i]-dists[i+1]);
-		for (j = 0;j < 3;j++)
-		{	// avoid round off error when possible
-			if (split->normal[j] == 1)
-				mid[j] = split->dist;
-			else if (split->normal[j] == -1)
-				mid[j] = -split->dist;
-			else
-				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+	}
+	// can't do point traces on curves (they have no thickness)
+	if (mod_q3bsp_curves_collisions.integer && !VectorCompare(start, end))
+	{
+		// line trace the curves
+		for (i = 0;i < leaf->numleafsurfaces;i++)
+		{
+			surface = model->data_surfaces + leaf->firstleafsurface[i];
+			if (surface->num_collisiontriangles && surface->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, surface->mins, surface->maxs))
+			{
+				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;
+			}
 		}
-
-		VectorCopy (mid, f->points[f->numpoints]);
-		f->numpoints++;
-		VectorCopy (mid, b->points[b->numpoints]);
-		b->numpoints++;
 	}
 }
 
-typedef struct portal_s
-{
-	mplane_t plane;
-	mnode_t *nodes[2];		// [0] = front side of plane
-	struct portal_s *next[2];
-	winding_t *winding;
-	struct portal_s *chain; // all portals are linked into a list
-}
-portal_t;
-
-static portal_t *portalchain;
-
-/*
-===========
-AllocPortal
-===========
-*/
-static portal_t *AllocPortal (void)
-{
-	portal_t *p;
-	p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
-	p->chain = portalchain;
-	portalchain = p;
-	return p;
-}
-
-static void FreePortal(portal_t *p)
-{
-	Mem_Free(p);
-}
-
-static void Mod_RecursiveRecalcNodeBBox(mnode_t *node)
+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)
 {
-	// calculate children first
-	if (node->children[0]->contents >= 0)
-		Mod_RecursiveRecalcNodeBBox(node->children[0]);
-	if (node->children[1]->contents >= 0)
-		Mod_RecursiveRecalcNodeBBox(node->children[1]);
-
-	// make combined bounding box from children
-	node->mins[0] = min(node->children[0]->mins[0], node->children[1]->mins[0]);
-	node->mins[1] = min(node->children[0]->mins[1], node->children[1]->mins[1]);
-	node->mins[2] = min(node->children[0]->mins[2], node->children[1]->mins[2]);
-	node->maxs[0] = max(node->children[0]->maxs[0], node->children[1]->maxs[0]);
-	node->maxs[1] = max(node->children[0]->maxs[1], node->children[1]->maxs[1]);
-	node->maxs[2] = max(node->children[0]->maxs[2], node->children[1]->maxs[2]);
-}
-
-static void Mod_FinalizePortals(void)
-{
-	int i, j, numportals, numpoints;
-	portal_t *p, *pnext;
-	mportal_t *portal;
-	mvertex_t *point;
-	mleaf_t *leaf, *endleaf;
-	winding_t *w;
+	int i;
+	//int sides;
+	float nodesegmentmins[3], nodesegmentmaxs[3];
+	mleaf_t *leaf;
+	colbrushf_t *brush;
+	msurface_t *surface;
+	/*
+		// find which nodes the line is in and recurse for them
+		while (node->plane)
+		{
+			// recurse down node sides
+			int startside, endside;
+			float dist1near, dist1far, dist2near, dist2far;
+			BoxPlaneCornerDistances(thisbrush_start->mins, thisbrush_start->maxs, node->plane, &dist1near, &dist1far);
+			BoxPlaneCornerDistances(thisbrush_end->mins, thisbrush_end->maxs, node->plane, &dist2near, &dist2far);
+			startside = dist1near < 0;
+			startside = dist1near < 0 ? (dist1far < 0 ? 1 : 2) : (dist1far < 0 ? 2 : 0);
+			endside = dist2near < 0 ? (dist2far < 0 ? 1 : 2) : (dist2far < 0 ? 2 : 0);
+			if (startside == 2 || endside == 2)
+			{
+				// brushes cross plane
+				// do not clip anything, just take both sides
+				Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+				node = node->children[1];
+				continue;
+			}
+			if (startside == 0)
+			{
+				if (endside == 0)
+				{
+					node = node->children[0];
+					continue;
+				}
+				else
+				{
+					//midf0 = dist1near / (dist1near - dist2near);
+					//midf1 = dist1far / (dist1far - dist2far);
+					Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+					node = node->children[1];
+					continue;
+				}
+			}
+			else
+			{
+				if (endside == 0)
+				{
+					//midf0 = dist1near / (dist1near - dist2near);
+					//midf1 = dist1far / (dist1far - dist2far);
+					Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+					node = node->children[1];
+					continue;
+				}
+				else
+				{
+					node = node->children[1];
+					continue;
+				}
+			}
 
-	// recalculate bounding boxes for all leafs (because qbsp is very sloppy)
-	leaf = loadmodel->leafs;
-	endleaf = leaf + loadmodel->numleafs;
-	for (;leaf < endleaf;leaf++)
-	{
-		VectorSet(leaf->mins,  2000000000,  2000000000,  2000000000);
-		VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
+			if (dist1near <  0 && dist2near <  0 && dist1far <  0 && dist2far <  0){node = node->children[1];continue;}
+			if (dist1near <  0 && dist2near <  0 && dist1far <  0 && dist2far >= 0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near <  0 && dist2near <  0 && dist1far >= 0 && dist2far <  0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near <  0 && dist2near <  0 && dist1far >= 0 && dist2far >= 0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near <  0 && dist2near >= 0 && dist1far <  0 && dist2far <  0){node = node->children[1];continue;}
+			if (dist1near <  0 && dist2near >= 0 && dist1far <  0 && dist2far >= 0){}
+			if (dist1near <  0 && dist2near >= 0 && dist1far >= 0 && dist2far <  0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near <  0 && dist2near >= 0 && dist1far >= 0 && dist2far >= 0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near >= 0 && dist2near <  0 && dist1far <  0 && dist2far <  0){node = node->children[1];continue;}
+			if (dist1near >= 0 && dist2near <  0 && dist1far <  0 && dist2far >= 0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near >= 0 && dist2near <  0 && dist1far >= 0 && dist2far <  0){}
+			if (dist1near >= 0 && dist2near <  0 && dist1far >= 0 && dist2far >= 0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near >= 0 && dist2near >= 0 && dist1far <  0 && dist2far <  0){Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);node = node->children[1];continue;}
+			if (dist1near >= 0 && dist2near >= 0 && dist1far <  0 && dist2far >= 0){node = node->children[0];continue;}
+			if (dist1near >= 0 && dist2near >= 0 && dist1far >= 0 && dist2far <  0){node = node->children[0];continue;}
+			if (dist1near >= 0 && dist2near >= 0 && dist1far >= 0 && dist2far >= 0){node = node->children[0];continue;}
+			{
+				if (dist2near < 0) // d1n<0 && d2n<0
+				{
+					if (dist2near < 0) // d1n<0 && d2n<0
+					{
+						if (dist2near < 0) // d1n<0 && d2n<0
+						{
+						}
+						else // d1n<0 && d2n>0
+						{
+						}
+					}
+					else // d1n<0 && d2n>0
+					{
+						if (dist2near < 0) // d1n<0 && d2n<0
+						{
+						}
+						else // d1n<0 && d2n>0
+						{
+						}
+					}
+				}
+				else // d1n<0 && d2n>0
+				{
+				}
+			}
+			else // d1n>0
+			{
+				if (dist2near < 0) // d1n>0 && d2n<0
+				{
+				}
+				else // d1n>0 && d2n>0
+				{
+				}
+			}
+			if (dist1near < 0 == dist1far < 0 == dist2near < 0 == dist2far < 0)
+			{
+				node = node->children[startside];
+				continue;
+			}
+			if (dist1near < dist2near)
+			{
+				// out
+				if (dist1near >= 0)
+				{
+					node = node->children[0];
+					continue;
+				}
+				if (dist2far < 0)
+				{
+					node = node->children[1];
+					continue;
+				}
+				// dist1near < 0 && dist2far >= 0
+			}
+			else
+			{
+				// in
+			}
+			startside = dist1near < 0 ? (dist1far < 0 ? 1 : 2) : (dist1far < 0 ? 2 : 0);
+			endside = dist2near < 0 ? (dist2far < 0 ? 1 : 2) : (dist2far < 0 ? 2 : 0);
+			if (startside == 2 || endside == 2)
+			{
+				// brushes cross plane
+				// do not clip anything, just take both sides
+				Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+				node = node->children[1];
+			}
+			else if (startside == endside)
+				node = node->children[startside];
+			else if (startside == 0) // endside = 1 (start infront, end behind)
+			{
+			}
+			else // startside == 1 endside = 0 (start behind, end infront)
+			{
+			}
+			== endside)
+			{
+				if (startside < 2)
+					node = node->children[startside];
+				else
+				{
+					// start and end brush cross plane
+				}
+			}
+			else
+			{
+			}
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+				node = node->children[1];
+			else if (dist1near < 0 && dist1far < 0 && dist2near >= 0 && dist2far >= 0)
+			else if (dist1near >= 0 && dist1far >= 0 && dist2near < 0 && dist2far < 0)
+			else if (dist1near >= 0 && dist1far >= 0 && dist2near >= 0 && dist2far >= 0)
+				node = node->children[0];
+			else
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+			{
+			}
+			else if (dist1near >= 0 && dist1far >= 0)
+			{
+			}
+			else // mixed (lying on plane)
+			{
+			}
+			{
+				if (dist2near < 0 && dist2far < 0)
+				{
+				}
+				else
+					node = node->children[1];
+			}
+			if (dist1near < 0 && dist1far < 0 && dist2near < 0 && dist2far < 0)
+				node = node->children[0];
+			else if (dist1near >= 0 && dist1far >= 0 && dist2near >= 0 && dist2far >= 0)
+				node = node->children[1];
+			else
+			{
+				// both sides
+				Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, node->children[startside], start, mid, startfrac, midfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+				node = node->children[1];
+			}
+			sides = dist1near || dist1near < 0 | dist1far < 0 | dist2near < 0 | dist
+			startside = dist1 < 0;
+			endside = dist2 < 0;
+			if (startside == endside)
+			{
+				// most of the time the line fragment is on one side of the plane
+				node = node->children[startside];
+			}
+			else
+			{
+				// line crosses node plane, split the line
+				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);
+				if (midfrac <= trace->fraction)
+					Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, node->children[endside], mid, end, midfrac, endfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+				return;
+			}
+		}
+	*/
+#if 1
+	for (;;)
+	{
+		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]);
+		if (nodesegmentmins[0] > nodesegmentmaxs[0] || nodesegmentmins[1] > nodesegmentmaxs[1] || nodesegmentmins[2] > nodesegmentmaxs[2])
+			return;
+		if (!node->plane)
+			break;
+		Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+		node = node->children[1];
 	}
-	p = portalchain;
-	while(p)
+#elif 0
+	// FIXME: could be made faster by copying TraceLine code and making it use
+	// box plane distances...  (variant on the BoxOnPlaneSide code)
+	for (;;)
 	{
-		if (p->winding)
+		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]);
+		if (nodesegmentmins[0] > nodesegmentmaxs[0] || nodesegmentmins[1] > nodesegmentmaxs[1] || nodesegmentmins[2] > nodesegmentmaxs[2])
+			return;
+		if (!node->plane)
+			break;
+		if (mod_q3bsp_debugtracebrush.integer == 2)
 		{
-			for (i = 0;i < 2;i++)
+			Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+			node = node->children[1];
+			continue;
+		}
+		else if (mod_q3bsp_debugtracebrush.integer == 1)
+		{
+			// recurse down node sides
+			sides = BoxOnPlaneSide(nodesegmentmins, nodesegmentmaxs, node->plane);
+			if (sides == 3)
 			{
-				leaf = (mleaf_t *)p->nodes[i];
-				w = p->winding;
-				for (j = 0;j < w->numpoints;j++)
+				// segment box crosses plane
+				Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+				node = node->children[1];
+				continue;
+			}
+			// take whichever side the segment box is on
+			node = node->children[sides - 1];
+			continue;
+		}
+		else
+		{
+			// recurse down node sides
+			sides = BoxOnPlaneSide(nodesegmentmins, nodesegmentmaxs, node->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, node->plane) | BoxOnPlaneSide(thisbrush_end->mins, thisbrush_end->maxs, node->plane);
+				if (sides == 3)
 				{
-					if (leaf->mins[0] > w->points[j][0]) leaf->mins[0] = w->points[j][0];
-					if (leaf->mins[1] > w->points[j][1]) leaf->mins[1] = w->points[j][1];
-					if (leaf->mins[2] > w->points[j][2]) leaf->mins[2] = w->points[j][2];
-					if (leaf->maxs[0] < w->points[j][0]) leaf->maxs[0] = w->points[j][0];
-					if (leaf->maxs[1] < w->points[j][1]) leaf->maxs[1] = w->points[j][1];
-					if (leaf->maxs[2] < w->points[j][2]) leaf->maxs[2] = w->points[j][2];
+					Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+					node = node->children[1];
+					continue;
 				}
 			}
+			// take whichever side the segment box is on
+			node = node->children[sides - 1];
+			continue;
 		}
-		p = p->chain;
+		return;
 	}
-
-	Mod_RecursiveRecalcNodeBBox(loadmodel->nodes);
-
-	// tally up portal and point counts
-	p = portalchain;
-	numportals = 0;
-	numpoints = 0;
-	while(p)
+#else
+	// FIXME: could be made faster by copying TraceLine code and making it use
+	// box plane distances...  (variant on the BoxOnPlaneSide code)
+	for (;;)
 	{
-		// 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->winding && 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)
+		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]);
+		if (nodesegmentmins[0] > nodesegmentmaxs[0] || nodesegmentmins[1] > nodesegmentmaxs[1] || nodesegmentmins[2] > nodesegmentmaxs[2])
+			return;
+		if (!node->plane)
+			break;
+		if (mod_q3bsp_debugtracebrush.integer == 2)
 		{
-			numportals += 2;
-			numpoints += p->winding->numpoints * 2;
+			Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+			node = node->children[1];
 		}
-		p = p->chain;
-	}
-	loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
-	loadmodel->numportals = numportals;
-	loadmodel->portalpoints = (void *) ((qbyte *) loadmodel->portals + numportals * sizeof(mportal_t));
-	loadmodel->numportalpoints = numpoints;
-	// clear all leaf portal chains
-	for (i = 0;i < loadmodel->numleafs;i++)
-		loadmodel->leafs[i].portals = NULL;
-	// process all portals in the global portal chain, while freeing them
-	portal = loadmodel->portals;
-	point = loadmodel->portalpoints;
-	p = portalchain;
-	portalchain = NULL;
-	while (p)
-	{
-		pnext = p->chain;
-
-		if (p->winding)
-		{
-			// 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)
-			{
-				// first make the back to front portal (forward portal)
-				portal->points = point;
-				portal->numpoints = p->winding->numpoints;
-				portal->plane.dist = p->plane.dist;
-				VectorCopy(p->plane.normal, portal->plane.normal);
-				portal->here = (mleaf_t *)p->nodes[1];
-				portal->past = (mleaf_t *)p->nodes[0];
-				// copy points
-				for (j = 0;j < portal->numpoints;j++)
-				{
-					VectorCopy(p->winding->points[j], point->position);
-					point++;
-				}
-				PlaneClassify(&portal->plane);
-
-				// link into leaf's portal chain
-				portal->next = portal->here->portals;
-				portal->here->portals = portal;
-
-				// advance to next portal
-				portal++;
-
-				// then make the front to back portal (backward portal)
-				portal->points = point;
-				portal->numpoints = p->winding->numpoints;
-				portal->plane.dist = -p->plane.dist;
-				VectorNegate(p->plane.normal, portal->plane.normal);
-				portal->here = (mleaf_t *)p->nodes[0];
-				portal->past = (mleaf_t *)p->nodes[1];
-				// copy points
-				for (j = portal->numpoints - 1;j >= 0;j--)
-				{
-					VectorCopy(p->winding->points[j], point->position);
-					point++;
-				}
-				PlaneClassify(&portal->plane);
-
-				// link into leaf's portal chain
-				portal->next = portal->here->portals;
-				portal->here->portals = portal;
-
-				// advance to next portal
-				portal++;
+		else if (mod_q3bsp_debugtracebrush.integer == 1)
+		{
+			// recurse down node sides
+			sides = BoxOnPlaneSide(nodesegmentmins, nodesegmentmaxs, node->plane);
+			if (sides == 3)
+			{
+				// segment box crosses plane
+				Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+				node = node->children[1];
+			}
+			else
+			{
+				// take whichever side the segment box is on
+				node = node->children[sides - 1];
 			}
-			FreeWinding(p->winding);
 		}
-		FreePortal(p);
-		p = pnext;
-	}
-}
-
-/*
-=============
-AddPortalToNodes
-=============
-*/
-static void AddPortalToNodes (portal_t *p, mnode_t *front, mnode_t *back)
-{
-	if (!front)
-		Host_Error ("AddPortalToNodes: NULL front node");
-	if (!back)
-		Host_Error ("AddPortalToNodes: NULL back node");
-	if (p->nodes[0] || p->nodes[1])
-		Host_Error ("AddPortalToNodes: already included");
-	// note: front == back is handled gracefully, because leaf 0 is the shared solid leaf, it can often have portals with the same leaf on both sides
-
-	p->nodes[0] = front;
-	p->next[0] = (portal_t *)front->portals;
-	front->portals = (mportal_t *)p;
-
-	p->nodes[1] = back;
-	p->next[1] = (portal_t *)back->portals;
-	back->portals = (mportal_t *)p;
-}
-
-/*
-=============
-RemovePortalFromNode
-=============
-*/
-static void RemovePortalFromNodes(portal_t *portal)
-{
-	int i;
-	mnode_t *node;
-	void **portalpointer;
-	portal_t *t;
-	for (i = 0;i < 2;i++)
-	{
-		node = portal->nodes[i];
-
-		portalpointer = (void **) &node->portals;
-		while (1)
+		else
 		{
-			t = *portalpointer;
-			if (!t)
-				Host_Error ("RemovePortalFromNodes: portal not in leaf");
-
-			if (t == portal)
+			// recurse down node sides
+			sides = BoxOnPlaneSide(nodesegmentmins, nodesegmentmaxs, node->plane);
+			if (sides == 3)
 			{
-				if (portal->nodes[0] == node)
-				{
-					*portalpointer = portal->next[0];
-					portal->nodes[0] = NULL;
-				}
-				else if (portal->nodes[1] == node)
+				// 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, node->plane) | BoxOnPlaneSide(thisbrush_end->mins, thisbrush_end->maxs, node->plane);
+				if (sides == 3)
 				{
-					*portalpointer = portal->next[1];
-					portal->nodes[1] = NULL;
+					Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+					sides = 2;
 				}
-				else
-					Host_Error ("RemovePortalFromNodes: portal not bounding leaf");
-				break;
 			}
-
-			if (t->nodes[0] == node)
-				portalpointer = (void **) &t->next[0];
-			else if (t->nodes[1] == node)
-				portalpointer = (void **) &t->next[1];
-			else
-				Host_Error ("RemovePortalFromNodes: portal not bounding leaf");
+			// take whichever side the segment box is on
+			node = node->children[sides - 1];
 		}
 	}
-}
-
-static void Mod_RecursiveNodePortals (mnode_t *node)
-{
-	int side;
-	mnode_t *front, *back, *other_node;
-	mplane_t clipplane, *plane;
-	portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
-	winding_t *nodeportalwinding, *frontwinding, *backwinding;
-
-	// if a leaf, we're done
-	if (node->contents)
-		return;
-
-	plane = node->plane;
-
-	front = node->children[0];
-	back = node->children[1];
-	if (front == back)
-		Host_Error("Mod_RecursiveNodePortals: corrupt node hierarchy");
-
-	// create the new portal by generating a polygon for the node plane,
-	// and clipping it by all of the other portals (which came from nodes above this one)
-	nodeportal = AllocPortal ();
-	nodeportal->plane = *node->plane;
-
-	nodeportalwinding = BaseWindingForPlane (node->plane);
-	side = 0;	// shut up compiler warning
-	for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
+#endif
+	// hit a leaf
+	leaf = (mleaf_t *)node;
+	for (i = 0;i < leaf->numleafbrushes;i++)
 	{
-		clipplane = portal->plane;
-		if (portal->nodes[0] == portal->nodes[1])
-			Host_Error("Mod_RecursiveNodePortals: portal has same node on both sides (1)");
-		if (portal->nodes[0] == node)
-			side = 0;
-		else if (portal->nodes[1] == node)
-		{
-			clipplane.dist = -clipplane.dist;
-			VectorNegate (clipplane.normal, clipplane.normal);
-			side = 1;
-		}
-		else
-			Host_Error ("Mod_RecursiveNodePortals: mislinked portal");
-
-		nodeportalwinding = ClipWinding (nodeportalwinding, &clipplane, true);
-		if (!nodeportalwinding)
+		brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
+		if (brush && brush->markframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, brush->mins, brush->maxs))
 		{
-			printf ("Mod_RecursiveNodePortals: WARNING: new portal was clipped away\n");
-			break;
+			brush->markframe = markframe;
+			Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, brush, brush);
 		}
 	}
-
-	if (nodeportalwinding)
+	if (mod_q3bsp_curves_collisions.integer)
 	{
-		// if the plane was not clipped on all sides, there was an error
-		nodeportal->winding = nodeportalwinding;
-		AddPortalToNodes (nodeportal, front, back);
+		for (i = 0;i < leaf->numleafsurfaces;i++)
+		{
+			surface = model->data_surfaces + leaf->firstleafsurface[i];
+			if (surface->num_collisiontriangles && surface->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, surface->mins, surface->maxs))
+			{
+				surface->collisionmarkframe = markframe;
+				Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->texture->supercontents, segmentmins, segmentmaxs);
+			}
+		}
 	}
+}
 
-	// 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)
+static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask)
+{
+	int i;
+	float segmentmins[3], segmentmaxs[3];
+	colbrushf_t *thisbrush_start, *thisbrush_end;
+	matrix4x4_t startmatrix, endmatrix;
+	static int markframe = 0;
+	msurface_t *surface;
+	q3mbrush_t *brush;
+	memset(trace, 0, sizeof(*trace));
+	trace->fraction = 1;
+	trace->realfraction = 1;
+	trace->hitsupercontentsmask = hitsupercontentsmask;
+	Matrix4x4_CreateIdentity(&startmatrix);
+	Matrix4x4_CreateIdentity(&endmatrix);
+	segmentmins[0] = min(boxstartmins[0], boxendmins[0]);
+	segmentmins[1] = min(boxstartmins[1], boxendmins[1]);
+	segmentmins[2] = min(boxstartmins[2], boxendmins[2]);
+	segmentmaxs[0] = max(boxstartmaxs[0], boxendmaxs[0]);
+	segmentmaxs[1] = max(boxstartmaxs[1], boxendmaxs[1]);
+	segmentmaxs[2] = max(boxstartmaxs[2], boxendmaxs[2]);
+	if (mod_q3bsp_optimizedtraceline.integer && VectorCompare(boxstartmins, boxstartmaxs) && VectorCompare(boxendmins, boxendmaxs))
 	{
-		if (portal->nodes[0] == portal->nodes[1])
-			Host_Error("Mod_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_RecursiveNodePortals: mislinked portal");
-		nextportal = portal->next[side];
-
-		other_node = portal->nodes[!side];
-		RemovePortalFromNodes (portal);
-
-		// cut the portal into two portals, one on each side of the node plane
-		DivideWinding (portal->winding, plane, &frontwinding, &backwinding);
-
-		if (!frontwinding)
+		if (VectorCompare(boxstartmins, boxendmins))
 		{
-			if (side == 0)
-				AddPortalToNodes (portal, back, other_node);
+			// point trace
+			if (model->brush.submodel)
+			{
+				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
-				AddPortalToNodes (portal, other_node, back);
-			continue;
+				Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace, model, model->brush.data_nodes, boxstartmins, ++markframe);
 		}
-		if (!backwinding)
+		else
 		{
-			if (side == 0)
-				AddPortalToNodes (portal, front, other_node);
+			// line trace
+			if (model->brush.submodel)
+			{
+				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, 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
-				AddPortalToNodes (portal, other_node, front);
-			continue;
+				Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, model->brush.data_nodes, boxstartmins, boxendmins, 0, 1, boxstartmins, boxendmins, ++markframe, segmentmins, segmentmaxs);
 		}
-
-		// the winding is split
-		splitportal = AllocPortal ();
-		temp = splitportal->chain;
-		*splitportal = *portal;
-		splitportal->chain = temp;
-		splitportal->winding = backwinding;
-		FreeWinding (portal->winding);
-		portal->winding = frontwinding;
-
-		if (side == 0)
+	}
+	else
+	{
+		// box trace, performed as brush trace
+		thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs);
+		thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs);
+		if (model->brush.submodel)
 		{
-			AddPortalToNodes (portal, front, other_node);
-			AddPortalToNodes (splitportal, back, other_node);
+			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, 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);
 		}
 		else
-		{
-			AddPortalToNodes (portal, other_node, front);
-			AddPortalToNodes (splitportal, other_node, back);
-		}
+			Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, model->brush.data_nodes, thisbrush_start, thisbrush_end, ++markframe, segmentmins, segmentmaxs);
 	}
-
-	Mod_RecursiveNodePortals(front);
-	Mod_RecursiveNodePortals(back);
 }
 
-
-static void Mod_MakePortals(void)
+static int Mod_Q3BSP_SuperContentsFromNativeContents(model_t *model, int nativecontents)
 {
-	portalchain = NULL;
-	Mod_RecursiveNodePortals (loadmodel->nodes);
-	Mod_FinalizePortals();
+	int supercontents = 0;
+	if (nativecontents & CONTENTSQ3_SOLID)
+		supercontents |= SUPERCONTENTS_SOLID;
+	if (nativecontents & CONTENTSQ3_WATER)
+		supercontents |= SUPERCONTENTS_WATER;
+	if (nativecontents & CONTENTSQ3_SLIME)
+		supercontents |= SUPERCONTENTS_SLIME;
+	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;
 }
 
-/*
-=================
-Mod_LoadBrushModel
-=================
-*/
-void Mod_LoadBrushModel (model_t *mod, void *buffer)
+static int Mod_Q3BSP_NativeContentsFromSuperContents(model_t *model, int supercontents)
 {
-	int			i, j;
-	dheader_t	*header;
-	dmodel_t 	*bm;
-	mempool_t	*mainmempool;
-	char		*loadname;
-
-	mod->type = mod_brush;
+	int nativecontents = 0;
+	if (supercontents & SUPERCONTENTS_SOLID)
+		nativecontents |= CONTENTSQ3_SOLID;
+	if (supercontents & SUPERCONTENTS_WATER)
+		nativecontents |= CONTENTSQ3_WATER;
+	if (supercontents & SUPERCONTENTS_SLIME)
+		nativecontents |= CONTENTSQ3_SLIME;
+	if (supercontents & SUPERCONTENTS_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;
+}
 
-	header = (dheader_t *)buffer;
+void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node)
+{
+	int numleafs;
+	while (node->plane)
+	{
+		Mod_Q3BSP_RecursiveFindNumLeafs(node->children[0]);
+		node = node->children[1];
+	}
+	numleafs = ((mleaf_t *)node - loadmodel->brush.data_leafs) + 1;
+	if (loadmodel->brush.num_leafs < numleafs)
+		loadmodel->brush.num_leafs = numleafs;
+}
 
-	i = LittleLong (header->version);
-	if (i != BSPVERSION && i != 30)
-		Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i (Quake) or 30 (HalfLife))", mod->name, i, BSPVERSION);
-	mod->ishlbsp = i == 30;
-	if (loadmodel->isworldmodel)
-		Cvar_SetValue("halflifebsp", mod->ishlbsp);
+void Mod_Q3BSP_Load(model_t *mod, void *buffer)
+{
+	int i, j, numshadowmeshtriangles;
+	q3dheader_t *header;
+	float corner[3], yawradius, modelradius;
+	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
+	mod->numskins = 1;
+
+	header = (q3dheader_t *)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->soundfromcenter = true;
+	mod->TraceBox = Mod_Q3BSP_TraceBox;
+	mod->brush.SuperContentsFromNativeContents = Mod_Q3BSP_SuperContentsFromNativeContents;
+	mod->brush.NativeContentsFromSuperContents = Mod_Q3BSP_NativeContentsFromSuperContents;
+	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.LightPoint = Mod_Q3BSP_LightPoint;
+	mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
+	mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf;
+	mod->Draw = R_Q1BSP_Draw;
+	mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+	mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+	mod->DrawLight = R_Q1BSP_DrawLight;
 
-// swap all the lumps
 	mod_base = (qbyte *)header;
 
-	for (i=0 ; i<sizeof(dheader_t)/4 ; i++)
-		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
-
-// load into heap
-
-	// store which lightmap format to use
-	mod->lightmaprgba = r_lightmaprgba.integer;
-
-	Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-	Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-	Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-	Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-	Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-	Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-	Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-	Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-	Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-	Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-	Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-	Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-	Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-	Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-	Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-
-	Mod_MakeHull0 ();
-	Mod_MakePortals();
-
-	mod->numframes = 2;		// regular and alternate animation
-
-	mainmempool = mod->mempool;
-	loadname = mod->name;
-
-	Mod_LoadLightList ();
+	// swap all the lumps
+	header->ident = LittleLong(header->ident);
+	header->version = LittleLong(header->version);
+	for (i = 0;i < Q3HEADER_LUMPS;i++)
+	{
+		header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs);
+		header->lumps[i].filelen = LittleLong(header->lumps[i].filelen);
+	}
 
-//
-// set up the submodels (FIXME: this is confusing)
-//
-	for (i = 0;i < mod->numsubmodels;i++)
+	Mod_Q3BSP_LoadEntities(&header->lumps[Q3LUMP_ENTITIES]);
+	Mod_Q3BSP_LoadTextures(&header->lumps[Q3LUMP_TEXTURES]);
+	Mod_Q3BSP_LoadPlanes(&header->lumps[Q3LUMP_PLANES]);
+	Mod_Q3BSP_LoadBrushSides(&header->lumps[Q3LUMP_BRUSHSIDES]);
+	Mod_Q3BSP_LoadBrushes(&header->lumps[Q3LUMP_BRUSHES]);
+	Mod_Q3BSP_LoadEffects(&header->lumps[Q3LUMP_EFFECTS]);
+	Mod_Q3BSP_LoadVertices(&header->lumps[Q3LUMP_VERTICES]);
+	Mod_Q3BSP_LoadTriangles(&header->lumps[Q3LUMP_TRIANGLES]);
+	Mod_Q3BSP_LoadLightmaps(&header->lumps[Q3LUMP_LIGHTMAPS]);
+	Mod_Q3BSP_LoadFaces(&header->lumps[Q3LUMP_FACES]);
+	Mod_Q3BSP_LoadModels(&header->lumps[Q3LUMP_MODELS]);
+	Mod_Q3BSP_LoadLeafBrushes(&header->lumps[Q3LUMP_LEAFBRUSHES]);
+	Mod_Q3BSP_LoadLeafFaces(&header->lumps[Q3LUMP_LEAFFACES]);
+	Mod_Q3BSP_LoadLeafs(&header->lumps[Q3LUMP_LEAFS]);
+	Mod_Q3BSP_LoadNodes(&header->lumps[Q3LUMP_NODES]);
+	Mod_Q3BSP_LoadLightGrid(&header->lumps[Q3LUMP_LIGHTGRID]);
+	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, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
 	{
-		int k, l;
-		float dist, modelyawradius, modelradius, *vec;
-		msurface_t *surf;
+		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, 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);
 
-		mod->normalmins[0] = mod->normalmins[1] = mod->normalmins[2] = 1000000000.0f;
-		mod->normalmaxs[0] = mod->normalmaxs[1] = mod->normalmaxs[2] = -1000000000.0f;
-		modelyawradius = 0;
-		modelradius = 0;
+	loadmodel->brush.num_leafs = 0;
+	Mod_Q3BSP_RecursiveFindNumLeafs(loadmodel->brush.data_nodes);
 
-		bm = &mod->submodels[i];
+	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->hulls[0].firstclipnode = bm->headnode[0];
-		for (j=1 ; j<MAX_MAP_HULLS ; j++)
+	mod = loadmodel;
+	for (i = 0;i < loadmodel->brush.numsubmodels;i++)
+	{
+		if (i > 0)
 		{
-			mod->hulls[j].firstclipnode = bm->headnode[j];
-			mod->hulls[j].lastclipnode = mod->numclipnodes - 1;
+			char name[10];
+			// LordHavoc: only register submodels if it is the world
+			// (prevents external bsp models from replacing world submodels with
+			//  their own)
+			if (!loadmodel->isworldmodel)
+				continue;
+			// duplicate the basic information
+			sprintf(name, "*%i", i);
+			mod = Mod_FindName(name);
+			*mod = *loadmodel;
+			strcpy(mod->name, name);
+			// textures and memory belong to the main model
+			mod->texturepool = NULL;
+			mod->mempool = NULL;
+			mod->brush.GetPVS = NULL;
+			mod->brush.FatPVS = NULL;
+			mod->brush.BoxTouchingPVS = NULL;
+			mod->brush.BoxTouchingLeafPVS = NULL;
+			mod->brush.BoxTouchingVisibleLeafs = NULL;
+			mod->brush.LightPoint = NULL;
+			mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
 		}
-
-		mod->firstmodelsurface = bm->firstface;
-		mod->nummodelsurfaces = bm->numfaces;
-
-		mod->DrawSky = NULL;
-		// LordHavoc: calculate bmodel bounding box rather than trusting what it says
-		for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
-		{
-			// we only need to have a drawsky function if it is used (usually only on world model)
-			if (surf->shader == &Cshader_sky)
-				mod->DrawSky = R_DrawBrushModelSky;
-			for (k = 0;k < surf->numedges;k++)
-			{
-				l = mod->surfedges[k + surf->firstedge];
-				if (l > 0)
-					vec = mod->vertexes[mod->edges[l].v[0]].position;
-				else
-					vec = mod->vertexes[mod->edges[-l].v[1]].position;
-				if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0];
-				if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1];
-				if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2];
-				if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0];
-				if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1];
-				if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2];
-				dist = vec[0]*vec[0]+vec[1]*vec[1];
-				if (modelyawradius < dist)
-					modelyawradius = dist;
-				dist += vec[2]*vec[2];
-				if (modelradius < dist)
-					modelradius = dist;
-			}
-		}
-		modelyawradius = sqrt(modelyawradius);
-		modelradius = sqrt(modelradius);
-		mod->yawmins[0] = mod->yawmins[1] = -(mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius);
-		mod->yawmins[2] = mod->normalmins[2];
-		mod->yawmaxs[2] = mod->normalmaxs[2];
+		mod->brush.submodel = i;
+
+		// make the model surface list (used by shadowing/lighting)
+		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 = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist));
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+			mod->surfacelist[j] = mod->firstmodelsurface + j;
+
+		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]));
+		modelradius = sqrt(corner[0]*corner[0]+corner[1]*corner[1]+corner[2]*corner[2]);
+		yawradius = sqrt(corner[0]*corner[0]+corner[1]*corner[1]);
 		mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
 		mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
-		// LordHavoc: check for empty submodels (lacrima.bsp has such a glitch)
-		if (mod->normalmins[0] > mod->normalmaxs[0] || mod->normalmins[1] > mod->normalmaxs[1] || mod->normalmins[2] > mod->normalmaxs[2])
-		{
-			Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname);
-			VectorClear(mod->normalmins);
-			VectorClear(mod->normalmaxs);
-			VectorClear(mod->yawmins);
-			VectorClear(mod->yawmaxs);
-			VectorClear(mod->rotatedmins);
-			VectorClear(mod->rotatedmaxs);
-		}
-
-		mod->numleafs = bm->visleafs;
+		mod->yawmaxs[0] = mod->yawmaxs[1] = yawradius;
+		mod->yawmins[0] = mod->yawmins[1] = -yawradius;
+		mod->yawmins[2] = mod->normalmins[2];
+		mod->yawmaxs[2] = mod->normalmaxs[2];
+		mod->radius = modelradius;
+		mod->radius2 = modelradius * modelradius;
 
-		mod->Draw = R_DrawBrushModelNormal;
-		mod->DrawShadow = NULL;
+		for (j = 0;j < mod->nummodelsurfaces;j++)
+			if (mod->data_surfaces[j + mod->firstmodelsurface].texture->surfaceflags & Q3SURFACEFLAG_SKY)
+				break;
+		if (j < mod->nummodelsurfaces)
+			mod->DrawSky = R_Q1BSP_DrawSky;
+	}
+}
 
-		Mod_BrushSortedSurfaces(mod, mainmempool);
+void Mod_IBSP_Load(model_t *mod, void *buffer)
+{
+	int i = LittleLong(((int *)buffer)[1]);
+	if (i == Q3BSPVERSION)
+		Mod_Q3BSP_Load(mod,buffer);
+	else if (i == Q2BSPVERSION)
+		Mod_Q2BSP_Load(mod,buffer);
+	else
+		Host_Error("Mod_IBSP_Load: unknown/unsupported version %i\n", i);
+}
 
-		// LordHavoc: only register submodels if it is the world
-		// (prevents bsp models from replacing world submodels)
-		if (loadmodel->isworldmodel && i < (mod->numsubmodels - 1))
-		{
-			char	name[10];
-			// duplicate the basic information
-			sprintf (name, "*%i", i+1);
-			loadmodel = Mod_FindName (name);
-			*loadmodel = *mod;
-			strcpy (loadmodel->name, name);
-			// textures and memory belong to the main model
-			loadmodel->texturepool = NULL;
-			loadmodel->mempool = NULL;
-			mod = loadmodel;
-		}
-	}
+void Mod_MAP_Load(model_t *mod, void *buffer)
+{
+	Host_Error("Mod_MAP_Load: not yet implemented\n");
 }