X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_brush.c;h=10cd356477ea5e9dd70f1b9e05d56fd8859ea7b3;hp=dfc3fa02b7a9f95e00e0ddd601000bde8d6134b0;hb=fdfa815d659f4ceec149ce3f907c107f38022c3d;hpb=13cddb8cd076368e86c62b99ed8d7956ec738aae

diff --git a/model_brush.c b/model_brush.c
index dfc3fa02..10cd3564 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -19,127 +19,260 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "image.h"
+#include "r_shadow.h"
 
-byte mod_novis[(MAX_MAP_LEAFS + 7)/ 8];
+// note: model_shared.c sets up r_notexture, and r_surf_notexture
 
-cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
+qbyte mod_q1bsp_novis[(MAX_MAP_LEAFS + 7)/ 8];
+
+//cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
 cvar_t halflifebsp = {0, "halflifebsp", "0"};
 cvar_t 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", "48"};
+cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
+cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
 
-/*
-===============
-Mod_BrushInit
-===============
-*/
-void Mod_BrushInit (void)
+void Mod_BrushInit(void)
 {
-	Cvar_RegisterVariable(&r_subdivide_size);
+//	Cvar_RegisterVariable(&r_subdivide_size);
 	Cvar_RegisterVariable(&halflifebsp);
 	Cvar_RegisterVariable(&r_novis);
 	Cvar_RegisterVariable(&r_miplightmaps);
 	Cvar_RegisterVariable(&r_lightmaprgba);
-	Cvar_RegisterVariable(&r_vertexsurfacesthreshold);
-	memset(mod_novis, 0xff, sizeof(mod_novis));
+	Cvar_RegisterVariable(&r_nosurftextures);
+	Cvar_RegisterVariable(&r_sortsurfaces);
+	memset(mod_q1bsp_novis, 0xff, sizeof(mod_q1bsp_novis));
 }
 
-void Mod_Brush_SERAddEntity(void)
+static mleaf_t *Mod_Q1BSP_PointInLeaf(model_t *model, const vec3_t p)
 {
-	R_Clip_AddBox(currentrenderentity->mins, currentrenderentity->maxs, R_Entity_Callback, currentrenderentity, NULL);
-}
+	mnode_t *node;
 
-/*
-===============
-Mod_PointInLeaf
-===============
-*/
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
-{
-	mnode_t		*node;
+	if (model == NULL)
+		return NULL;
 
 	Mod_CheckLoaded(model);
-//	if (!model || !model->nodes)
-//		Sys_Error ("Mod_PointInLeaf: bad 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 = 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 int Mod_Q1BSP_PointContents(model_t *model, const vec3_t p)
 {
-	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;
+	mnode_t *node;
+
+	if (model == NULL)
+		return CONTENTS_EMPTY;
+
+	Mod_CheckLoaded(model);
+
+	// LordHavoc: modified to start at first clip node,
+	// in other words: first node of the (sub)model
+	node = model->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];
+
+	return ((mleaf_t *)node)->contents;
 }
 
-/*
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
+typedef struct findnonsolidlocationinfo_s
 {
-	mnode_t		*node;
-	float		d;
-	mplane_t	*plane;
+	vec3_t center;
+	vec_t radius;
+	vec3_t nudge;
+	vec_t bestdist;
+	model_t *model;
+}
+findnonsolidlocationinfo_t;
 
-	if (!model || !model->nodes)
-		Sys_Error ("Mod_PointInLeaf: bad model");
+#if 0
+extern cvar_t samelevel;
+#endif
+static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *info, mleaf_t *leaf)
+{
+	int i, surfnum, k, *tri, *mark;
+	float dist, f, vert[3][3], edge[3][3], facenormal[3], edgenormal[3][3], point[3];
+#if 0
+	float surfnormal[3];
+#endif
+	msurface_t *surf;
+	surfmesh_t *mesh;
+	for (surfnum = 0, mark = leaf->firstmarksurface;surfnum < leaf->nummarksurfaces;surfnum++, mark++)
+	{
+		surf = info->model->surfaces + *mark;
+		if (surf->flags & SURF_SOLIDCLIP)
+		{
+#if 0
+			VectorCopy(surf->plane->normal, surfnormal);
+			if (surf->flags & SURF_PLANEBACK)
+				VectorNegate(surfnormal, surfnormal);
+#endif
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				for (k = 0;k < mesh->numtriangles;k++)
+				{
+					tri = mesh->element3i + k * 3;
+					VectorCopy((mesh->vertex3f + tri[0] * 3), vert[0]);
+					VectorCopy((mesh->vertex3f + tri[1] * 3), vert[1]);
+					VectorCopy((mesh->vertex3f + tri[2] * 3), vert[2]);
+					VectorSubtract(vert[1], vert[0], edge[0]);
+					VectorSubtract(vert[2], vert[1], edge[1]);
+					CrossProduct(edge[1], edge[0], facenormal);
+					if (facenormal[0] || facenormal[1] || facenormal[2])
+					{
+						VectorNormalize(facenormal);
+#if 0
+						if (VectorDistance(facenormal, surfnormal) > 0.01f)
+							Con_Printf("a2! %f %f %f != %f %f %f\n", facenormal[0], facenormal[1], facenormal[2], surfnormal[0], surfnormal[1], surfnormal[2]);
+#endif
+						f = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
+						if (f <= info->bestdist && f >= -info->bestdist)
+						{
+							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]);
+#if 0
+							if (samelevel.integer & 1)
+								VectorNegate(edgenormal[0], edgenormal[0]);
+							if (samelevel.integer & 2)
+								VectorNegate(edgenormal[1], edgenormal[1]);
+							if (samelevel.integer & 4)
+								VectorNegate(edgenormal[2], edgenormal[2]);
+							for (i = 0;i < 3;i++)
+								if (DotProduct(vert[0], edgenormal[i]) > DotProduct(vert[i], edgenormal[i]) + 0.1f
+								 || DotProduct(vert[1], edgenormal[i]) > DotProduct(vert[i], edgenormal[i]) + 0.1f
+								 || DotProduct(vert[2], edgenormal[i]) > DotProduct(vert[i], edgenormal[i]) + 0.1f)
+									Con_Printf("a! %i : %f %f %f (%f %f %f)\n", i, edgenormal[i][0], edgenormal[i][1], edgenormal[i][2], facenormal[0], facenormal[1], facenormal[2]);
+#endif
+							// face distance
+							if (DotProduct(info->center, edgenormal[0]) < DotProduct(vert[0], edgenormal[0])
+							 && DotProduct(info->center, edgenormal[1]) < DotProduct(vert[1], edgenormal[1])
+							 && DotProduct(info->center, edgenormal[2]) < DotProduct(vert[2], edgenormal[2]))
+							{
+								// we got lucky, the center is within the face
+								dist = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
+								if (dist < 0)
+								{
+									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);
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
 
-	node = model->nodes;
-	while (1)
+static void Mod_Q1BSP_FindNonSolidLocation_r(findnonsolidlocationinfo_t *info, mnode_t *node)
+{
+	if (node->contents)
 	{
-		if (node->contents < 0)
-			return (mleaf_t *)node;
-		plane = node->plane;
-		d = DotProduct (p,plane->normal) - plane->dist;
-		if (d > 0)
-			node = node->children[0];
-		else
-			node = node->children[1];
+		if (((mleaf_t *)node)->nummarksurfaces)
+			Mod_Q1BSP_FindNonSolidLocation_r_Leaf(info, (mleaf_t *)node);
+	}
+	else
+	{
+		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]);
 	}
+}
 
-	return NULL;	// never reached
+static void Mod_Q1BSP_FindNonSolidLocation(model_t *model, 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->nodes + model->hulls[0].firstclipnode);
+		VectorAdd(info.center, info.nudge, info.center);
+	}
+	while (info.bestdist < radius && ++i < 10);
+	VectorCopy(info.center, out);
 }
-*/
 
-/*
-===================
-Mod_DecompressVis
-===================
-*/
-static byte *Mod_DecompressVis (byte *in, model_t *model)
+static qbyte *Mod_Q1BSP_DecompressVis(model_t *model, qbyte *in)
 {
-	static byte	decompressed[MAX_MAP_LEAFS/8];
-	int		c;
-	byte	*out;
-	int		row;
+	static qbyte decompressed[MAX_MAP_LEAFS/8];
+	int c;
+	qbyte *out;
+	int row;
 
 	row = (model->numleafs+7)>>3;
 	out = decompressed;
 
-	/*
-	if (!in)
-	{	// no vis info, so make all visible
-		while (row)
-		{
-			*out++ = 0xff;
-			row--;
-		}
-		return decompressed;
-	}
-	*/
-
 	do
 	{
 		if (*in)
@@ -160,280 +293,223 @@ static byte *Mod_DecompressVis (byte *in, model_t *model)
 	return decompressed;
 }
 
-byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
+static qbyte *Mod_Q1BSP_LeafPVS(model_t *model, mleaf_t *leaf)
 {
 	if (r_novis.integer || leaf == model->leafs || leaf->compressed_vis == NULL)
-		return mod_novis;
-	return Mod_DecompressVis (leaf->compressed_vis, model);
-}
-
-void Mod_SetupNoTexture(void)
-{
-	int		x, y;
-	byte	pix[16][16][4];
-
-	for (y = 0;y < 16;y++)
-	{
-		for (x = 0;x < 16;x++)
-		{
-			if ((y < 8) ^ (x < 8))
-			{
-				pix[y][x][0] = 128;
-				pix[y][x][1] = 128;
-				pix[y][x][2] = 128;
-				pix[y][x][3] = 255;
-			}
-			else
-			{
-				pix[y][x][0] = 64;
-				pix[y][x][1] = 64;
-				pix[y][x][2] = 64;
-				pix[y][x][3] = 255;
-			}
-		}
-	}
-
-	memset(&loadmodel->notexture, 0, sizeof(texture_t));
-	strcpy(loadmodel->notexture.name, "notexture");
-	loadmodel->notexture.width = 16;
-	loadmodel->notexture.height = 16;
-	loadmodel->notexture.flags = 0;
-	loadmodel->notexture.texture = R_LoadTexture(loadmodel->texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP);
+		return mod_q1bsp_novis;
+	return Mod_Q1BSP_DecompressVis(model, leaf->compressed_vis);
 }
 
-/*
-=================
-Mod_LoadTextures
-=================
-*/
-static void Mod_LoadTextures (lump_t *l)
+static void Mod_Q1BSP_LoadTextures(lump_t *l)
 {
-	int				i, j, k, num, max, altmax, mtwidth, mtheight, *dofs;
-	miptex_t		*dmiptex;
-	texture_t		*tx, *tx2, *anims[10], *altanims[10];
-	dmiptexlump_t	*m;
-	byte			*data, *mtdata, *data2;
-	char			name[256];
+	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];
 
-	Mod_SetupNoTexture();
+	loadmodel->textures = NULL;
 
 	if (!l->filelen)
-	{
-		loadmodel->textures = NULL;
 		return;
-	}
 
 	m = (dmiptexlump_t *)(mod_base + l->fileofs);
 
 	m->nummiptex = LittleLong (m->nummiptex);
 
-	loadmodel->numtextures = m->nummiptex;
-	loadmodel->textures = Mem_Alloc(loadmodel->mempool, m->nummiptex * sizeof(*loadmodel->textures));
+	// add two slots for notexture walls and notexture liquids
+	loadmodel->numtextures = m->nummiptex + 2;
+	loadmodel->textures = Mem_Alloc(loadmodel->mempool, loadmodel->numtextures * sizeof(texture_t));
+
+	// fill out all slots with notexture
+	for (i = 0, tx = loadmodel->textures;i < loadmodel->numtextures;i++, tx++)
+	{
+		tx->number = i;
+		strcpy(tx->name, "NO TEXTURE FOUND");
+		tx->width = 16;
+		tx->height = 16;
+		tx->skin.base = r_notexture;
+		tx->shader = &Cshader_wall_lightmap;
+		tx->flags = SURF_SOLIDCLIP;
+		if (i == loadmodel->numtextures - 1)
+		{
+			tx->flags |= SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+			tx->shader = &Cshader_water;
+		}
+		tx->currentframe = tx;
+	}
 
 	// 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)
+		if (dofs[i] == -1 || r_nosurftextures.integer)
 			continue;
-		dmiptex = (miptex_t *)((byte *)m + dofs[i]);
-		mtwidth = LittleLong (dmiptex->width);
-		mtheight = LittleLong (dmiptex->height);
+		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]);
+		j = LittleLong(dmiptex->offsets[0]);
 		if (j)
 		{
 			// texture included
 			if (j < 40 || j + mtwidth * mtheight > l->filelen)
-				Host_Error ("Texture %s is corrupt or incomplete\n", dmiptex->name);
-			mtdata = (byte *)dmiptex + j;
+			{
+				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))
-			Host_Error ("Texture %s is not 16 aligned", dmiptex->name);
-		// LordHavoc: rewriting the map texture loader for GLQuake
-		tx = Mem_Alloc(loadmodel->mempool, sizeof(texture_t));
-		memset(tx, 0, sizeof(texture_t));
-		tx->anim_total = 0;
-		tx->alternate_anims = NULL;
-		loadmodel->textures[i] = tx;
-
-		// LordHavoc: force all names to lowercase and make sure they are terminated while copying
-		for (j = 0;dmiptex->name[j] && j < 15;j++)
-		{
-			if (dmiptex->name[j] >= 'A' && dmiptex->name[j] <= 'Z')
-				tx->name[j] = dmiptex->name[j] + ('a' - 'A');
-			else
-				tx->name[j] = dmiptex->name[j];
-		}
-		for (;j < 16;j++)
-			tx->name[j] = 0;
+			Con_Printf("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
 
-		if (!tx->name[0])
-		{
-			Con_Printf("warning: unnamed texture in %s\n", loadmodel->name);
-			sprintf(tx->name, "unnamed%i", i);
-		}
+		// 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 (!loadmodel->ishlbsp && !strncmp(tx->name,"sky",3) && mtwidth == 256 && mtheight == 128) // LordHavoc: HL sky textures are entirely unrelated
-		{
-			data = loadimagepixels(tx->name, false, 0, 0);
-			if (data)
-			{
-				if (image_width == 256 && image_height == 128)
-				{
-					if (loadmodel->isworldmodel)
-	 					R_InitSky (data, 4);
-					Mem_Free(data);
-				}
-				else
-				{
-					Mem_Free(data);
-					Host_Error("Mod_LoadTextures: replacement sky image must be 256x128 pixels\n");
-				}
-			}
-			else if (loadmodel->isworldmodel)
-				R_InitSky (mtdata, 1);
-		}
-		else if ((tx->texture = loadtextureimagewithmask(loadmodel->texturepool, tx->name, 0, 0, false, true, true)))
+		if (!tx->name[0])
 		{
-			tx->fogtexture = image_masktex;
-			strcpy(name, tx->name);
-			strcat(name, "_glow");
-			tx->glowtexture = loadtextureimage(loadmodel->texturepool, name, 0, 0, false, true, true);
+			sprintf(tx->name, "unnamed%i", i);
+			Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
 		}
-		else
+
+		// LordHavoc: HL sky textures are entirely different than quake
+		if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
 		{
-			if (loadmodel->ishlbsp)
+			if (loadmodel->isworldmodel)
 			{
-				if (mtdata && (data = W_ConvertWAD3Texture(dmiptex)))
+				data = loadimagepixels(tx->name, false, 0, 0);
+				if (data)
 				{
-					// 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))
+					if (image_width == 256 && image_height == 128)
 					{
-						// 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);
+						R_InitSky(data, 4);
+						Mem_Free(data);
 					}
-					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))
+					else
 					{
-						// 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);
+						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);
 					}
-					Mem_Free(data);
-				}
-				else
-				{
-					tx->width = 16;
-					tx->height = 16;
-					tx->texture = loadmodel->notexture.texture;
 				}
+				else if (mtdata != NULL)
+					R_InitSky(mtdata, 1);
 			}
-			else
+		}
+		else
+		{
+			if (!Mod_LoadSkinFrame(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, false, true, true))
 			{
-				if (mtdata) // texture included
+				// did not find external texture, load it from the bsp or wad3
+				if (loadmodel->ishlbsp)
 				{
-					int fullbrights;
-					data = mtdata;
-					fullbrights = false;
-					if (r_fullbrights.value && tx->name[0] != '*')
+					// 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)
 					{
-						for (j = 0;j < tx->width*tx->height;j++)
+						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, NULL);
+						if (Image_CheckAlpha(pixels, image_width * image_height, true))
 						{
-							if (data[j] >= 224) // fullbright
+							fogpixels = Mem_Alloc(tempmempool, image_width * image_height * 4);
+							for (j = 0;j < image_width * image_height * 4;j += 4)
 							{
-								fullbrights = true;
-								break;
+								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, NULL);
+							Mem_Free(fogpixels);
 						}
 					}
-					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 = loadmodel->notexture.texture;
+					if (freepixels)
+						Mem_Free(freepixels);
 				}
+				else if (mtdata) // texture included
+					Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_PRECACHE, false, true, 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_notexture;
+		}
 
 		if (tx->name[0] == '*')
 		{
-			tx->flags |= (SURF_DRAWTURB | SURF_LIGHTBOTHSIDES);
+			// turb does not block movement
+			tx->flags &= ~SURF_SOLIDCLIP;
+			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);
+				tx->flags |= SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA;
+			else
+				tx->flags |= SURF_WATERALPHA;
+			tx->shader = &Cshader_water;
 		}
 		else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
-			tx->flags |= (SURF_DRAWSKY | SURF_CLIPSOLID);
+		{
+			tx->flags |= SURF_DRAWSKY;
+			tx->shader = &Cshader_sky;
+		}
 		else
 		{
 			tx->flags |= SURF_LIGHTMAP;
-			if (!R_TextureHasAlpha(tx->texture))
-				tx->flags |= SURF_CLIPSOLID;
+			if (!tx->skin.fog)
+				tx->flags |= SURF_SHADOWCAST | SURF_SHADOWLIGHT;
+			tx->shader = &Cshader_wall_lightmap;
 		}
+
+		// start out with no animation
+		tx->currentframe = tx;
 	}
 
-//
-// sequence the animations
-//
+	// sequence the animations
 	for (i = 0;i < m->nummiptex;i++)
 	{
-		tx = loadmodel->textures[i];
-		if (!tx || tx->name[0] != '+')
+		tx = loadmodel->textures + i;
+		if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
 			continue;
-		if (tx->anim_total)
+		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));
-		max = altmax = 0;
+		memset(anims, 0, sizeof(anims));
+		memset(altanims, 0, sizeof(altanims));
 
 		for (j = i;j < m->nummiptex;j++)
 		{
-			tx2 = loadmodel->textures[j];
-			if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2))
+			tx2 = loadmodel->textures + j;
+			if (!tx2 || tx2->name[0] != '+' || strcmp(tx2->name+2, tx->name+2))
 				continue;
 
 			num = tx2->name[1];
@@ -442,76 +518,111 @@ static void Mod_LoadTextures (lump_t *l)
 			else if (num >= 'a' && num <= 'j')
 				altanims[num - 'a'] = tx2;
 			else
-				Host_Error ("Bad animating texture %s", tx->name);
+				Con_Printf("Bad animating texture %s\n", tx->name);
 		}
 
+		max = altmax = 0;
 		for (j = 0;j < 10;j++)
 		{
-			if (anims[j] != NULL)
+			if (anims[j])
 				max = j + 1;
-			if (altanims[j] != NULL)
+			if (altanims[j])
 				altmax = j + 1;
 		}
+		//Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
 
-		// link them all together
+		incomplete = false;
 		for (j = 0;j < max;j++)
 		{
-			tx2 = anims[j];
-			if (!tx2)
-				Host_Error ("Missing frame %i of %s", j, tx->name);
-			tx2->anim_total = max;
-			tx2->alternate_anims = altanims[0]; // NULL if there is no alternate
+			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++)
-				tx2->anim_frames[k] = anims[k];
+				altanims[k] = anims[k];
 		}
 
-		for (j = 0;j < altmax;j++)
+		// link together the primary animation
+		for (j = 0;j < max;j++)
 		{
-			tx2 = altanims[j];
-			if (!tx2)
-				Host_Error ("Missing frame %i of %s", j, tx->name);
-			tx2->anim_total = altmax;
-			tx2->alternate_anims = anims[0]; // NULL if there is no alternate
+			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[k] = altanims[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];
+				}
+			}
 		}
 	}
 }
 
-/*
-=================
-Mod_LoadLighting
-=================
-*/
-static void Mod_LoadLighting (lump_t *l)
+static void Mod_Q1BSP_LoadLighting(lump_t *l)
 {
 	int i;
-	byte *in, *out, *data;
-	byte d;
+	qbyte *in, *out, *data, d;
 	char litfilename[1024];
 	loadmodel->lightdata = NULL;
 	if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight
 	{
 		loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen);
-		memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
+		memcpy(loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
 	}
 	else // LordHavoc: bsp version 29 (normal white lighting)
 	{
 		// LordHavoc: hope is not lost yet, check for a .lit file to load
 		strcpy(litfilename, loadmodel->name);
-		COM_StripExtension(litfilename, litfilename);
+		FS_StripExtension(litfilename, litfilename);
 		strcat(litfilename, ".lit");
-		data = (byte*) COM_LoadFile (litfilename, false);
+		data = (qbyte*) FS_LoadFile(litfilename, false);
 		if (data)
 		{
-			if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+			if (fs_filesize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
 			{
 				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);
+					Con_DPrintf("loaded %s\n", litfilename);
+					loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, fs_filesize - 8);
+					memcpy(loadmodel->lightdata, data + 8, fs_filesize - 8);
 					Mem_Free(data);
 					return;
 				}
@@ -523,7 +634,7 @@ static void Mod_LoadLighting (lump_t *l)
 			}
 			else
 			{
-				if (loadsize == 8)
+				if (fs_filesize == 8)
 					Con_Printf("Empty .lit file, ignoring\n");
 				else
 					Con_Printf("Corrupt .lit file (old version?), ignoring\n");
@@ -536,7 +647,7 @@ static void Mod_LoadLighting (lump_t *l)
 		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);
+		memcpy(in, mod_base + l->fileofs, l->filelen);
 		for (i = 0;i < l->filelen;i++)
 		{
 			d = *in++;
@@ -547,40 +658,349 @@ static void Mod_LoadLighting (lump_t *l)
 	}
 }
 
+static void Mod_Q1BSP_LoadLightList(void)
+{
+	int a, n, numlights;
+	char lightsfilename[1024], *s, *t, *lightsstring;
+	mlight_t *e;
+
+	strcpy(lightsfilename, loadmodel->name);
+	FS_StripExtension(lightsfilename, lightsfilename);
+	strcat(lightsfilename, ".lights");
+	s = lightsstring = (char *) FS_LoadFile(lightsfilename, false);
+	if (s)
+	{
+		numlights = 0;
+		while (*s)
+		{
+			while (*s && *s != '\n')
+				s++;
+			if (!*s)
+			{
+				Mem_Free(lightsstring);
+				Host_Error("lights file must end with a newline\n");
+			}
+			s++;
+			numlights++;
+		}
+		loadmodel->lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
+		s = lightsstring;
+		n = 0;
+		while (*s && n < numlights)
+		{
+			t = s;
+			while (*s && *s != '\n')
+				s++;
+			if (!*s)
+			{
+				Mem_Free(lightsstring);
+				Host_Error("misparsed lights file!\n");
+			}
+			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)
+			{
+				Mem_Free(lightsstring);
+				Host_Error("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);
+			}
+			s++;
+			n++;
+		}
+		if (*s)
+		{
+			Mem_Free(lightsstring);
+			Host_Error("misparsed lights file!\n");
+		}
+		loadmodel->numlights = numlights;
+		Mem_Free(lightsstring);
+	}
+}
 
 /*
-=================
-Mod_LoadVisibility
-=================
+static int castshadowcount = 0;
+static void Mod_Q1BSP_ProcessLightList(void)
+{
+	int j, k, l, *mark, lnum;
+	mlight_t *e;
+	msurface_t *surf;
+	float dist;
+	mleaf_t *leaf;
+	qbyte *pvs;
+	vec3_t temp;
+	float *v, radius2;
+	for (lnum = 0, e = loadmodel->lights;lnum < loadmodel->numlights;lnum++, e++)
+	{
+		e->cullradius2 = DotProduct(e->light, e->light) / (e->falloff * e->falloff * 8192.0f * 8192.0f * 2.0f * 2.0f);// + 4096.0f;
+		if (e->cullradius2 > 4096.0f * 4096.0f)
+			e->cullradius2 = 4096.0f * 4096.0f;
+		e->cullradius = e->lightradius = sqrt(e->cullradius2);
+		leaf = Mod_Q1BSP_PointInLeaf(e->origin, loadmodel);
+		if (leaf->compressed_vis)
+			pvs = Mod_Q1BSP_DecompressVis(leaf->compressed_vis, loadmodel);
+		else
+			pvs = mod_q1bsp_novis;
+		for (j = 0;j < loadmodel->numsurfaces;j++)
+			loadmodel->surfacevisframes[j] = -1;
+		for (j = 0, leaf = loadmodel->leafs + 1;j < loadmodel->numleafs - 1;j++, leaf++)
+		{
+			if (pvs[j >> 3] & (1 << (j & 7)))
+			{
+				for (k = 0, mark = leaf->firstmarksurface;k < leaf->nummarksurfaces;k++, mark++)
+				{
+					surf = loadmodel->surfaces + *mark;
+					if (surf->number != *mark)
+						Con_Printf("%d != %d\n", surf->number, *mark);
+					dist = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+					if (surf->flags & SURF_PLANEBACK)
+						dist = -dist;
+					if (dist > 0 && dist < e->cullradius)
+					{
+						temp[0] = bound(surf->poly_mins[0], e->origin[0], surf->poly_maxs[0]) - e->origin[0];
+						temp[1] = bound(surf->poly_mins[1], e->origin[1], surf->poly_maxs[1]) - e->origin[1];
+						temp[2] = bound(surf->poly_mins[2], e->origin[2], surf->poly_maxs[2]) - e->origin[2];
+						if (DotProduct(temp, temp) < lightradius2)
+							loadmodel->surfacevisframes[*mark] = -2;
+					}
+				}
+			}
+		}
+		// build list of light receiving surfaces
+		e->numsurfaces = 0;
+		for (j = 0;j < loadmodel->numsurfaces;j++)
+			if (loadmodel->surfacevisframes[j] == -2)
+				e->numsurfaces++;
+		e->surfaces = NULL;
+		if (e->numsurfaces > 0)
+		{
+			e->surfaces = Mem_Alloc(loadmodel->mempool, sizeof(msurface_t *) * e->numsurfaces);
+			e->numsurfaces = 0;
+			for (j = 0;j < loadmodel->numsurfaces;j++)
+				if (loadmodel->surfacevisframes[j] == -2)
+					e->surfaces[e->numsurfaces++] = loadmodel->surfaces + j;
+		}
+		// find bounding box and sphere of lit surfaces
+		// (these will be used for creating a shape to clip the light)
+		radius2 = 0;
+		for (j = 0;j < e->numsurfaces;j++)
+		{
+			surf = e->surfaces[j];
+			if (j == 0)
+			{
+				VectorCopy(surf->poly_verts, e->mins);
+				VectorCopy(surf->poly_verts, e->maxs);
+			}
+			for (k = 0, v = surf->poly_verts;k < surf->poly_numverts;k++, v += 3)
+			{
+				if (e->mins[0] > v[0]) e->mins[0] = v[0];if (e->maxs[0] < v[0]) e->maxs[0] = v[0];
+				if (e->mins[1] > v[1]) e->mins[1] = v[1];if (e->maxs[1] < v[1]) e->maxs[1] = v[1];
+				if (e->mins[2] > v[2]) e->mins[2] = v[2];if (e->maxs[2] < v[2]) e->maxs[2] = v[2];
+				VectorSubtract(v, e->origin, temp);
+				dist = DotProduct(temp, temp);
+				if (radius2 < dist)
+					radius2 = dist;
+			}
+		}
+		if (e->cullradius2 > radius2)
+		{
+			e->cullradius2 = radius2;
+			e->cullradius = sqrt(e->cullradius2);
+		}
+		if (e->mins[0] < e->origin[0] - e->lightradius) e->mins[0] = e->origin[0] - e->lightradius;
+		if (e->maxs[0] > e->origin[0] + e->lightradius) e->maxs[0] = e->origin[0] + e->lightradius;
+		if (e->mins[1] < e->origin[1] - e->lightradius) e->mins[1] = e->origin[1] - e->lightradius;
+		if (e->maxs[1] > e->origin[1] + e->lightradius) e->maxs[1] = e->origin[1] + e->lightradius;
+		if (e->mins[2] < e->origin[2] - e->lightradius) e->mins[2] = e->origin[2] - e->lightradius;
+		if (e->maxs[2] > e->origin[2] + e->lightradius) e->maxs[2] = e->origin[2] + e->lightradius;
+		// clip shadow volumes against eachother to remove unnecessary
+		// polygons(and sections of polygons)
+		{
+			//vec3_t polymins, polymaxs;
+			int maxverts = 4;
+			float *verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+			float f, *v0, *v1, projectdistance;
+
+			e->shadowvolume = Mod_ShadowMesh_Begin(loadmodel->mempool, 1024);
+#if 0
+			{
+			vec3_t outermins, outermaxs, innermins, innermaxs;
+			innermins[0] = e->mins[0] - 1;
+			innermins[1] = e->mins[1] - 1;
+			innermins[2] = e->mins[2] - 1;
+			innermaxs[0] = e->maxs[0] + 1;
+			innermaxs[1] = e->maxs[1] + 1;
+			innermaxs[2] = e->maxs[2] + 1;
+			outermins[0] = loadmodel->normalmins[0] - 1;
+			outermins[1] = loadmodel->normalmins[1] - 1;
+			outermins[2] = loadmodel->normalmins[2] - 1;
+			outermaxs[0] = loadmodel->normalmaxs[0] + 1;
+			outermaxs[1] = loadmodel->normalmaxs[1] + 1;
+			outermaxs[2] = loadmodel->normalmaxs[2] + 1;
+			// add bounding box around the whole shadow volume set,
+			// facing inward to limit light area, with an outer bounding box
+			// facing outward (this is needed by the shadow rendering method)
+			// X major
+			verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+			verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+			verts[ 6] = innermaxs[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
+			verts[ 9] = innermaxs[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+			verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+			verts[ 6] = outermaxs[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
+			verts[ 9] = outermaxs[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			// X minor
+			verts[ 0] = innermins[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
+			verts[ 3] = innermins[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
+			verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+			verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			verts[ 0] = outermins[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
+			verts[ 3] = outermins[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
+			verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+			verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			// Y major
+			verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
+			verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
+			verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
+			verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			verts[ 0] = outermins[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+			verts[ 3] = outermins[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+			verts[ 6] = outermaxs[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+			verts[ 9] = outermaxs[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			// Y minor
+			verts[ 0] = innermins[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+			verts[ 3] = innermins[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+			verts[ 6] = innermaxs[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+			verts[ 9] = innermaxs[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
+			verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
+			verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
+			verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			// Z major
+			verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+			verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermaxs[2];
+			verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermaxs[2];
+			verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+			verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermaxs[2];
+			verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermaxs[2];
+			verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			// Z minor
+			verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermins[2];
+			verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+			verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+			verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermins[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermins[2];
+			verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+			verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+			verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermins[2];
+			Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+			}
+#endif
+			castshadowcount++;
+			for (j = 0;j < e->numsurfaces;j++)
+			{
+				surf = e->surfaces[j];
+				if (surf->flags & SURF_SHADOWCAST)
+					surf->castshadow = castshadowcount;
+			}
+			for (j = 0;j < e->numsurfaces;j++)
+			{
+				surf = e->surfaces[j];
+				if (surf->castshadow != castshadowcount)
+					continue;
+				f = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+				if (surf->flags & SURF_PLANEBACK)
+					f = -f;
+				projectdistance = e->lightradius;
+				if (maxverts < surf->poly_numverts)
+				{
+					maxverts = surf->poly_numverts;
+					if (verts)
+						Mem_Free(verts);
+					verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+				}
+				// copy the original polygon, for the front cap of the volume
+				for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
+					VectorCopy(v0, v1);
+				Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, surf->poly_numverts, verts);
+				// project the original polygon, reversed, for the back cap of the volume
+				for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
+				{
+					VectorSubtract(v0, e->origin, temp);
+					VectorNormalize(temp);
+					VectorMA(v0, projectdistance, temp, v1);
+				}
+				Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, surf->poly_numverts, verts);
+				// project the shadow volume sides
+				for (l = surf->poly_numverts - 1, k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;l = k, k++, v0 = v1, v1 += 3)
+				{
+					if (!surf->neighborsurfaces[l] || surf->neighborsurfaces[l]->castshadow != castshadowcount)
+					{
+						VectorCopy(v1, &verts[0]);
+						VectorCopy(v0, &verts[3]);
+						VectorCopy(v0, &verts[6]);
+						VectorCopy(v1, &verts[9]);
+						VectorSubtract(&verts[6], e->origin, temp);
+						VectorNormalize(temp);
+						VectorMA(&verts[6], projectdistance, temp, &verts[6]);
+						VectorSubtract(&verts[9], e->origin, temp);
+						VectorNormalize(temp);
+						VectorMA(&verts[9], projectdistance, temp, &verts[9]);
+						Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+					}
+				}
+			}
+			// build the triangle mesh
+			e->shadowvolume = Mod_ShadowMesh_Finish(loadmodel->mempool, e->shadowvolume);
+			{
+				shadowmesh_t *mesh;
+				l = 0;
+				for (mesh = e->shadowvolume;mesh;mesh = mesh->next)
+					l += mesh->numtriangles;
+				Con_Printf("light %i shadow volume built containing %i triangles\n", lnum, l);
+			}
+		}
+	}
+}
 */
-static void Mod_LoadVisibility (lump_t *l)
+
+
+static void Mod_Q1BSP_LoadVisibility(lump_t *l)
 {
+	loadmodel->visdata = NULL;
 	if (!l->filelen)
-	{
-		loadmodel->visdata = NULL;
 		return;
-	}
 	loadmodel->visdata = Mem_Alloc(loadmodel->mempool, l->filelen);
-	memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen);
+	memcpy(loadmodel->visdata, mod_base + l->fileofs, l->filelen);
 }
 
 // used only for HalfLife maps
-void Mod_ParseWadsFromEntityLump(char *data)
+static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data)
 {
 	char key[128], value[4096];
 	char wadname[128];
 	int i, j, k;
 	if (!data)
 		return;
-	data = COM_Parse(data);
-	if (!data)
+	if (!COM_ParseToken(&data))
 		return; // error
 	if (com_token[0] != '{')
 		return; // error
 	while (1)
 	{
-		data = COM_Parse(data);
-		if (!data)
+		if (!COM_ParseToken(&data))
 			return; // error
 		if (com_token[0] == '}')
 			break; // end of worldspawn
@@ -590,8 +1010,7 @@ void Mod_ParseWadsFromEntityLump(char *data)
 			strcpy(key, com_token);
 		while (key[strlen(key)-1] == ' ') // remove trailing spaces
 			key[strlen(key)-1] = 0;
-		data = COM_Parse(data);
-		if (!data)
+		if (!COM_ParseToken(&data))
 			return; // error
 		strcpy(value, com_token);
 		if (!strcmp("wad", key)) // for HalfLife maps
@@ -615,7 +1034,7 @@ void Mod_ParseWadsFromEntityLump(char *data)
 							value[i] = 0;
 							strcpy(wadname, "textures/");
 							strcat(wadname, &value[j]);
-							W_LoadTextureWadFile (wadname, false);
+							W_LoadTextureWadFile(wadname, false);
 							j = i+1;
 							if (!k)
 								break;
@@ -627,31 +1046,19 @@ void Mod_ParseWadsFromEntityLump(char *data)
 	}
 }
 
-/*
-=================
-Mod_LoadEntities
-=================
-*/
-static void Mod_LoadEntities (lump_t *l)
+static void Mod_Q1BSP_LoadEntities(lump_t *l)
 {
+	loadmodel->entities = NULL;
 	if (!l->filelen)
-	{
-		loadmodel->entities = NULL;
 		return;
-	}
 	loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen);
-	memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
+	memcpy(loadmodel->entities, mod_base + l->fileofs, l->filelen);
 	if (loadmodel->ishlbsp)
-		Mod_ParseWadsFromEntityLump(loadmodel->entities);
+		Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->entities);
 }
 
 
-/*
-=================
-Mod_LoadVertexes
-=================
-*/
-static void Mod_LoadVertexes (lump_t *l)
+static void Mod_Q1BSP_LoadVertexes(lump_t *l)
 {
 	dvertex_t	*in;
 	mvertex_t	*out;
@@ -659,7 +1066,7 @@ static void Mod_LoadVertexes (lump_t *l)
 
 	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_Q1BSP_LoadVertexes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
@@ -668,18 +1075,13 @@ static void Mod_LoadVertexes (lump_t *l)
 
 	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]);
+		out->position[0] = LittleFloat(in->point[0]);
+		out->position[1] = LittleFloat(in->point[1]);
+		out->position[2] = LittleFloat(in->point[2]);
 	}
 }
 
-/*
-=================
-Mod_LoadSubmodels
-=================
-*/
-static void Mod_LoadSubmodels (lump_t *l)
+static void Mod_Q1BSP_LoadSubmodels(lump_t *l)
 {
 	dmodel_t	*in;
 	dmodel_t	*out;
@@ -687,7 +1089,7 @@ static void Mod_LoadSubmodels (lump_t *l)
 
 	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_Q1BSP_LoadSubmodels: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
@@ -699,24 +1101,19 @@ static void Mod_LoadSubmodels (lump_t *l)
 		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]);
+			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);
+			out->headnode[j] = LittleLong(in->headnode[j]);
+		out->visleafs = LittleLong(in->visleafs);
+		out->firstface = LittleLong(in->firstface);
+		out->numfaces = LittleLong(in->numfaces);
 	}
 }
 
-/*
-=================
-Mod_LoadEdges
-=================
-*/
-static void Mod_LoadEdges (lump_t *l)
+static void Mod_Q1BSP_LoadEdges(lump_t *l)
 {
 	dedge_t *in;
 	medge_t *out;
@@ -724,7 +1121,7 @@ static void Mod_LoadEdges (lump_t *l)
 
 	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_Q1BSP_LoadEdges: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
@@ -738,21 +1135,15 @@ static void Mod_LoadEdges (lump_t *l)
 	}
 }
 
-/*
-=================
-Mod_LoadTexinfo
-=================
-*/
-static void Mod_LoadTexinfo (lump_t *l)
+static void Mod_Q1BSP_LoadTexinfo(lump_t *l)
 {
 	texinfo_t *in;
 	mtexinfo_t *out;
-	int 	i, j, k, count;
-	int		miptex;
+	int i, j, k, count, miptex;
 
 	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_Q1BSP_LoadTexinfo: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
@@ -763,79 +1154,36 @@ static void Mod_LoadTexinfo (lump_t *l)
 	{
 		for (k = 0;k < 2;k++)
 			for (j = 0;j < 4;j++)
-				out->vecs[k][j] = LittleFloat (in->vecs[k][j]);
+				out->vecs[k][j] = LittleFloat(in->vecs[k][j]);
 
-		miptex = LittleLong (in->miptex);
-		out->flags = LittleLong (in->flags);
+		miptex = LittleLong(in->miptex);
+		out->flags = LittleLong(in->flags);
 
-		if (!loadmodel->textures)
-			out->texture = &loadmodel->notexture;
-		else
+		out->texture = NULL;
+		if (loadmodel->textures)
 		{
-			if (miptex < 0)
-				Host_Error ("miptex < 0");
-			if (miptex >= loadmodel->numtextures)
-				Host_Error ("miptex >= loadmodel->numtextures");
-			out->texture = loadmodel->textures[miptex];
+			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->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->shader->flags & SHADERFLAGS_NEEDLIGHTMAP)
+				out->texture = loadmodel->textures + (loadmodel->numtextures - 1);
 		}
-		if (!out->texture)
-			out->texture = &loadmodel->notexture;
-	}
-}
-
-/*
-================
-CalcSurfaceExtents
-
-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];
-
-	mins[0] = mins[1] = 999999999;
-	maxs[0] = maxs[1] = -999999999;
-
-	tex = s->texinfo;
-
-	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]];
-
-		for (j=0 ; j<2 ; j++)
 		{
-			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;
+			// if texture chosen is NULL, force to notexture
+			if (out->texture == NULL)
+				out->texture = loadmodel->textures + (loadmodel->numtextures - 2);
 		}
 	}
-
-	for (i=0 ; i<2 ; i++)
-	{
-		bmins[i] = floor(mins[i]/16);
-		bmaxs[i] = ceil(maxs[i]/16);
-
-		s->texturemins[i] = bmins[i] * 16;
-		s->extents[i] = (bmaxs[i] - bmins[i]) * 16;
-	}
 }
 
-
-void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
+void BoundPoly(int numverts, float *verts, vec3_t mins, vec3_t maxs)
 {
 	int		i, j;
 	float	*v;
@@ -855,8 +1203,9 @@ void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
 	}
 }
 
+#if 0
 #define MAX_SUBDIVPOLYTRIANGLES 4096
-#define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3)
+#define MAX_SUBDIVPOLYVERTS(MAX_SUBDIVPOLYTRIANGLES * 3)
 
 static int subdivpolyverts, subdivpolytriangles;
 static int subdivpolyindex[MAX_SUBDIVPOLYTRIANGLES][3];
@@ -876,21 +1225,21 @@ static int subdivpolylookupvert(vec3_t v)
 	return subdivpolyverts++;
 }
 
-static void SubdividePolygon (int numverts, float *verts)
+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");
+		Host_Error("SubdividePolygon: ran out of verts in buffer");
 
-	BoundPoly (numverts, verts, mins, maxs);
+	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);
+		m = r_subdivide_size.value * floor(m/r_subdivide_size.value + 0.5);
 		if (maxs[i] - m < 8)
 			continue;
 		if (m - mins[i] < 8)
@@ -905,17 +1254,17 @@ static void SubdividePolygon (int numverts, float *verts)
 		{
 			if (dist[p] >= 0)
 			{
-				VectorCopy (pv, front[f]);
+				VectorCopy(pv, front[f]);
 				f++;
 			}
 			if (dist[p] <= 0)
 			{
-				VectorCopy (pv, back[b]);
+				VectorCopy(pv, back[b]);
 				b++;
 			}
 			if (dist[p] == 0 || dist[c] == 0)
 				continue;
-			if ( (dist[p] > 0) != (dist[c] > 0) )
+			if ((dist[p] > 0) != (dist[c] > 0) )
 			{
 				// clip point
 				frac = dist[p] / (dist[p] - dist[c]);
@@ -927,8 +1276,8 @@ static void SubdividePolygon (int numverts, float *verts)
 			}
 		}
 
-		SubdividePolygon (f, front[0]);
-		SubdividePolygon (b, back[0]);
+		SubdividePolygon(f, front[0]);
+		SubdividePolygon(b, back[0]);
 		return;
 	}
 
@@ -951,390 +1300,290 @@ static void SubdividePolygon (int numverts, float *verts)
 	}
 }
 
-/*
-================
-Mod_GenerateWarpMesh
-
-Breaks a polygon up along axial 64 unit
-boundaries so that turbulent and sky warps
-can be done reasonably.
-================
-*/
-void Mod_GenerateWarpMesh (msurface_t *surf)
+//Breaks a polygon up along axial 64 unit
+//boundaries so that turbulent and sky warps
+//can be done reasonably.
+static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surf)
 {
-	int				i, j;
-	surfvertex_t	*v;
-	surfmesh_t		*mesh;
+	int i, j;
+	surfvertex_t *v;
+	surfmesh_t *mesh;
 
 	subdivpolytriangles = 0;
 	subdivpolyverts = 0;
-	SubdividePolygon (surf->poly_numverts, surf->poly_verts);
+	SubdividePolygon(surf->poly_numverts, surf->poly_verts);
+	if (subdivpolytriangles < 1)
+		Host_Error("Mod_Q1BSP_GenerateWarpMesh: no triangles?\n");
 
-	mesh = &surf->mesh;
+	surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
 	mesh->numverts = subdivpolyverts;
 	mesh->numtriangles = subdivpolytriangles;
-	if (mesh->numtriangles < 1)
-		Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
-	mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-	mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
+	mesh->vertex = (surfvertex_t *)(mesh + 1);
+	mesh->index = (int *)(mesh->vertex + mesh->numverts);
 	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
 
 	for (i = 0;i < mesh->numtriangles;i++)
-	{
 		for (j = 0;j < 3;j++)
-		{
 			mesh->index[i*3+j] = subdivpolyindex[i][j];
-			//if (mesh->index[i] < 0 || mesh->index[i] >= mesh->numverts)
-			//	Host_Error("Mod_GenerateWarpMesh: invalid index generated\n");
-		}
-	}
 
 	for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
 	{
 		VectorCopy(subdivpolyvert[i], v->v);
-		v->st[0] = DotProduct (v->v, surf->texinfo->vecs[0]);
-		v->st[1] = DotProduct (v->v, surf->texinfo->vecs[1]);
+		v->st[0] = DotProduct(v->v, surf->texinfo->vecs[0]);
+		v->st[1] = DotProduct(v->v, surf->texinfo->vecs[1]);
 	}
 }
+#endif
 
-void Mod_GenerateVertexLitMesh (msurface_t *surf)
+static surfmesh_t *Mod_Q1BSP_AllocSurfMesh(int numverts, int numtriangles)
 {
-	int				i, is, it, *index, smax, tmax;
-	float			*in, s, t;
-	surfvertex_t	*out;
-	surfmesh_t		*mesh;
-
-	//surf->flags |= SURF_LIGHTMAP;
-	smax = surf->extents[0] >> 4;
-	tmax = surf->extents[1] >> 4;
-	surf->lightmaptexturestride = 0;
-	surf->lightmaptexture = NULL;
-
-	mesh = &surf->mesh;
-	mesh->numverts = surf->poly_numverts;
-	mesh->numtriangles = surf->poly_numverts - 2;
-	mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-	mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
-
-	index = mesh->index;
-	for (i = 0;i < mesh->numtriangles;i++)
-	{
-		*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);
-
-		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;
-
-		s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-		t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-
-		// lightmap coordinates
-		out->uv[0] = 0;
-		out->uv[1] = 0;
-
-		// 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);
-	}
+	surfmesh_t *mesh;
+	mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + numtriangles * sizeof(int[6]) + numverts * (3 + 2 + 2 + 2 + 3 + 3 + 3 + 1) * sizeof(float));
+	mesh->numverts = numverts;
+	mesh->numtriangles = numtriangles;
+	mesh->vertex3f = (float *)(mesh + 1);
+	mesh->texcoordtexture2f = mesh->vertex3f + mesh->numverts * 3;
+	mesh->texcoordlightmap2f = mesh->texcoordtexture2f + mesh->numverts * 2;
+	mesh->texcoorddetail2f = mesh->texcoordlightmap2f + mesh->numverts * 2;
+	mesh->svector3f = (float *)(mesh->texcoorddetail2f + mesh->numverts * 2);
+	mesh->tvector3f = mesh->svector3f + mesh->numverts * 3;
+	mesh->normal3f = mesh->tvector3f + mesh->numverts * 3;
+	mesh->lightmapoffsets = (int *)(mesh->normal3f + mesh->numverts * 3);
+	mesh->element3i = mesh->lightmapoffsets + mesh->numverts;
+	mesh->neighbor3i = mesh->element3i + mesh->numtriangles * 3;
+	return mesh;
 }
 
-void Mod_GenerateLightmappedMesh (msurface_t *surf)
+static void Mod_Q1BSP_GenerateSurfacePolygon(msurface_t *surf, int firstedge, int numedges)
 {
-	int				i, is, it, *index, smax, tmax;
-	float			*in, s, t, xbase, ybase, xscale, yscale;
-	surfvertex_t	*out;
-	surfmesh_t		*mesh;
-
-	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_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP/* | TEXF_PRECACHE*/, NULL, NULL, 0);
-	}
-	else
-	{
-		surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
-		surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT/* | TEXF_PRECACHE*/, NULL, NULL, 0);
-	}
-//	surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE);
-//	surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_PRECACHE);
-	R_GetFragmentLocation(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);
+	int i, lindex, j;
+	float *vec, *vert, mins[3], maxs[3], val, *v;
+	mtexinfo_t *tex;
 
-	mesh = &surf->mesh;
-	mesh->numverts = surf->poly_numverts;
-	mesh->numtriangles = surf->poly_numverts - 2;
-	mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-	mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
-
-	index = mesh->index;
-	for (i = 0;i < mesh->numtriangles;i++)
-	{
-		*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++)
+	// convert edges back to a normal polygon
+	surf->poly_numverts = numedges;
+	vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * numedges);
+	for (i = 0;i < numedges;i++)
 	{
-		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;
-
-		s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-		t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-
-		// lightmap coordinates
-		out->uv[0] = s * xscale + xbase;
-		out->uv[1] = t * yscale + ybase;
-
-		// 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);
+		lindex = loadmodel->surfedges[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;
 	}
-}
-
-void Mod_GenerateVertexMesh (msurface_t *surf)
-{
-	int				i, *index;
-	float			*in;
-	surfvertex_t	*out;
-	surfmesh_t		*mesh;
 
-	surf->lightmaptexturestride = 0;
-	surf->lightmaptexture = NULL;
-
-	mesh = &surf->mesh;
-	mesh->numverts = surf->poly_numverts;
-	mesh->numtriangles = surf->poly_numverts - 2;
-	mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-	mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
-	memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
-
-	index = mesh->index;
-	for (i = 0;i < mesh->numtriangles;i++)
+	// calculate polygon bounding box and center
+	vert = surf->poly_verts;
+	VectorCopy(vert, mins);
+	VectorCopy(vert, maxs);
+	vert += 3;
+	for (i = 1;i < surf->poly_numverts;i++, vert += 3)
 	{
-		*index++ = 0;
-		*index++ = i + 1;
-		*index++ = i + 2;
+		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];
 	}
-
-	for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+	VectorCopy(mins, surf->poly_mins);
+	VectorCopy(maxs, surf->poly_maxs);
+	surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
+	surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
+	surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
+
+	// generate surface extents information
+	tex = surf->texinfo;
+	mins[0] = maxs[0] = DotProduct(surf->poly_verts, tex->vecs[0]) + tex->vecs[0][3];
+	mins[1] = maxs[1] = DotProduct(surf->poly_verts, tex->vecs[1]) + tex->vecs[1][3];
+	for (i = 1, v = surf->poly_verts + 3;i < surf->poly_numverts;i++, v += 3)
 	{
-		VectorCopy (in, out->v);
-		out->st[0] = (DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]) / surf->texinfo->texture->width;
-		out->st[1] = (DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]) / surf->texinfo->texture->height;
+		for (j = 0;j < 2;j++)
+		{
+			val = DotProduct(v, tex->vecs[j]) + tex->vecs[j][3];
+			if (mins[j] > val)
+				mins[j] = val;
+			if (maxs[j] < val)
+				maxs[j] = val;
+		}
 	}
-}
-
-void Mod_GenerateSurfacePolygon (msurface_t *surf)
-{
-	float		*vert;
-	int			i;
-	int			lindex;
-	float		*vec;
-
-	// 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 < 2;i++)
 	{
-		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;
+		surf->texturemins[i] = (int) floor(mins[i] / 16) * 16;
+		surf->extents[i] = (int) ceil(maxs[i] / 16) * 16 - surf->texturemins[i];
 	}
 }
 
-/*
-=================
-Mod_LoadFaces
-=================
-*/
-static void Mod_LoadFaces (lump_t *l)
+static void Mod_Q1BSP_LoadFaces(lump_t *l)
 {
-	dface_t		*in;
-	msurface_t 	*out;
-	int			i, count, surfnum;
-	int			planenum, side;
+	dface_t *in;
+	msurface_t *surf;
+	int i, count, surfnum, planenum, ssize, tsize, firstedge, numedges, totalverts, totaltris, totalmeshes;
+	surfmesh_t *mesh;
+	float s, t;
 
 	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_Q1BSP_LoadFaces: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
-	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+	loadmodel->surfaces = Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_t));
 
-	loadmodel->surfaces = out;
 	loadmodel->numsurfaces = count;
+	loadmodel->surfacevisframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+	loadmodel->surfacepvsframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+	loadmodel->pvssurflist = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
 
-	for (surfnum = 0;surfnum < count;surfnum++, in++, out++)
+	for (surfnum = 0, surf = loadmodel->surfaces, totalverts = 0, totaltris = 0, totalmeshes = 0;surfnum < count;surfnum++, totalverts += surf->poly_numverts, totaltris += surf->poly_numverts - 2, totalmeshes++, in++, surf++)
 	{
+		surf->number = surfnum;
 		// FIXME: validate edges, texinfo, etc?
-		out->firstedge = LittleLong(in->firstedge);
-		out->numedges = LittleShort(in->numedges);
-
-		out->texinfo = loadmodel->texinfo + LittleShort (in->texinfo);
-		out->flags = out->texinfo->texture->flags;
+		firstedge = LittleLong(in->firstedge);
+		numedges = LittleShort(in->numedges);
+		if ((unsigned int) firstedge > (unsigned int) loadmodel->numsurfedges || (unsigned int) numedges > (unsigned int) loadmodel->numsurfedges || (unsigned int) firstedge + (unsigned int) numedges > (unsigned int) loadmodel->numsurfedges)
+			Host_Error("Mod_Q1BSP_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", firstedge, numedges, loadmodel->numsurfedges);
+		i = LittleShort(in->texinfo);
+		if ((unsigned int) i >= (unsigned int) loadmodel->numtexinfo)
+			Host_Error("Mod_Q1BSP_LoadFaces: invalid texinfo index %i(model has %i texinfos)\n", i, loadmodel->numtexinfo);
+		surf->texinfo = loadmodel->texinfo + i;
+		surf->flags = surf->texinfo->texture->flags;
 
 		planenum = LittleShort(in->planenum);
-		side = LittleShort(in->side);
-		if (side)
-			out->flags |= SURF_PLANEBACK;
+		if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes)
+			Host_Error("Mod_Q1BSP_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
 
-		out->plane = loadmodel->planes + planenum;
+		if (LittleShort(in->side))
+			surf->flags |= SURF_PLANEBACK;
+
+		surf->plane = loadmodel->planes + planenum;
 
 		// clear lightmap (filled in later)
-		out->lightmaptexture = NULL;
+		surf->lightmaptexture = NULL;
 
 		// force lightmap upload on first time seeing the surface
-		out->cached_dlight = true;
-		out->cached_ambient = -1000;
-		out->cached_lightscalebit = -1000;
-		out->cached_light[0] = -1000;
-		out->cached_light[1] = -1000;
-		out->cached_light[2] = -1000;
-		out->cached_light[3] = -1000;
+		surf->cached_dlight = true;
+
+		Mod_Q1BSP_GenerateSurfacePolygon(surf, firstedge, numedges);
 
-		CalcSurfaceExtents (out);
+		ssize = (surf->extents[0] >> 4) + 1;
+		tsize = (surf->extents[1] >> 4) + 1;
 
 		// lighting info
 		for (i = 0;i < MAXLIGHTMAPS;i++)
-			out->styles[i] = in->styles[i];
+			surf->styles[i] = in->styles[i];
 		i = LittleLong(in->lightofs);
 		if (i == -1)
-			out->samples = NULL;
+			surf->samples = NULL;
 		else if (loadmodel->ishlbsp) // LordHavoc: HalfLife map (bsp version 30)
-			out->samples = loadmodel->lightdata + i;
+			surf->samples = loadmodel->lightdata + i;
 		else // LordHavoc: white lighting (bsp version 29)
-			out->samples = loadmodel->lightdata + (i * 3);
+			surf->samples = loadmodel->lightdata + (i * 3);
 
-		Mod_GenerateSurfacePolygon(out);
-
-		if (out->texinfo->texture->flags & SURF_DRAWSKY)
+		if (surf->texinfo->texture->shader == &Cshader_wall_lightmap)
 		{
-			out->shader = &Cshader_sky;
-			out->samples = NULL;
-			Mod_GenerateWarpMesh (out);
-			continue;
+			if ((surf->extents[0] >> 4) + 1 > (256) || (surf->extents[1] >> 4) + 1 > (256))
+				Host_Error("Bad surface extents");
+			// stainmap for permanent marks on walls
+			surf->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
+			// clear to white
+			memset(surf->stainsamples, 255, ssize * tsize * 3);
 		}
+	}
 
-		if (out->texinfo->texture->flags & SURF_DRAWTURB)
-		{
-			out->shader = &Cshader_water;
-			/*
-			for (i=0 ; i<2 ; i++)
-			{
-				out->extents[i] = 16384*1024;
-				out->texturemins[i] = -8192*1024;
-			}
-			*/
-			out->samples = NULL;
-			Mod_GenerateWarpMesh (out);
-			continue;
-		}
+	loadmodel->entiremesh = Mod_Q1BSP_AllocSurfMesh(totalverts, totaltris);
+	loadmodel->surfmeshes = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) * totalmeshes);
 
-		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->samples = NULL;
-			Mod_GenerateWarpMesh (out);
-		}
-		else if ((out->extents[0]+1) > (256*16) || (out->extents[1]+1) > (256*16))
-		{
-			Con_Printf ("Bad surface extents, converting to fullbright polygon");
-			out->shader = &Cshader_wall_fullbright;
-			out->samples = NULL;
-			Mod_GenerateVertexMesh(out);
-		}
-		else if (out->extents[0] < r_vertexsurfacesthreshold.integer && out->extents[1] < r_vertexsurfacesthreshold.integer)
+	for (surfnum = 0, surf = loadmodel->surfaces, totalverts = 0, totaltris = 0, totalmeshes = 0;surfnum < count;surfnum++, totalverts += surf->poly_numverts, totaltris += surf->poly_numverts - 2, totalmeshes++, surf++)
+	{
+		mesh = surf->mesh = loadmodel->surfmeshes + totalmeshes;
+		mesh->numverts = surf->poly_numverts;
+		mesh->numtriangles = surf->poly_numverts - 2;
+		mesh->vertex3f = loadmodel->entiremesh->vertex3f + totalverts * 3;
+		mesh->texcoordtexture2f = loadmodel->entiremesh->texcoordtexture2f + totalverts * 2;
+		mesh->texcoordlightmap2f = loadmodel->entiremesh->texcoordlightmap2f + totalverts * 2;
+		mesh->texcoorddetail2f = loadmodel->entiremesh->texcoorddetail2f + totalverts * 2;
+		mesh->svector3f = loadmodel->entiremesh->svector3f + totalverts * 3;
+		mesh->tvector3f = loadmodel->entiremesh->tvector3f + totalverts * 3;
+		mesh->normal3f = loadmodel->entiremesh->normal3f + totalverts * 3;
+		mesh->lightmapoffsets = loadmodel->entiremesh->lightmapoffsets + totalverts;
+		mesh->element3i = loadmodel->entiremesh->element3i + totaltris * 3;
+		mesh->neighbor3i = loadmodel->entiremesh->neighbor3i + totaltris * 3;
+
+		surf->lightmaptexturestride = 0;
+		surf->lightmaptexture = NULL;
+
+		for (i = 0;i < mesh->numverts;i++)
 		{
-			out->shader = &Cshader_wall_vertex;
-			Mod_GenerateVertexLitMesh(out);
+			mesh->vertex3f[i * 3 + 0] = surf->poly_verts[i * 3 + 0];
+			mesh->vertex3f[i * 3 + 1] = surf->poly_verts[i * 3 + 1];
+			mesh->vertex3f[i * 3 + 2] = surf->poly_verts[i * 3 + 2];
+			s = DotProduct((mesh->vertex3f + i * 3), surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
+			t = DotProduct((mesh->vertex3f + i * 3), surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
+			mesh->texcoordtexture2f[i * 2 + 0] = s / surf->texinfo->texture->width;
+			mesh->texcoordtexture2f[i * 2 + 1] = t / surf->texinfo->texture->height;
+			mesh->texcoorddetail2f[i * 2 + 0] = s * (1.0f / 16.0f);
+			mesh->texcoorddetail2f[i * 2 + 1] = t * (1.0f / 16.0f);
+			mesh->texcoordlightmap2f[i * 2 + 0] = 0;
+			mesh->texcoordlightmap2f[i * 2 + 1] = 0;
+			mesh->lightmapoffsets[i] = 0;
 		}
-		else
+
+		for (i = 0;i < mesh->numtriangles;i++)
 		{
-			out->shader = &Cshader_wall_lightmap;
-			Mod_GenerateLightmappedMesh(out);
+			mesh->element3i[i * 3 + 0] = 0;
+			mesh->element3i[i * 3 + 1] = i + 1;
+			mesh->element3i[i * 3 + 2] = i + 2;
 		}
-	}
-}
 
-static model_t *sortmodel;
+		Mod_BuildTriangleNeighbors(mesh->neighbor3i, mesh->element3i, mesh->numtriangles);
+		Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->vertex3f, mesh->texcoordtexture2f, mesh->element3i, mesh->svector3f, mesh->tvector3f, mesh->normal3f);
 
-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 (long) a->shader - (long) b->shader;
-	if (a->texinfo->texture != b->texinfo->texture);
-		return a->texinfo->texture - b->texinfo->texture;
-	return 0;
-}
+		if (surf->texinfo->texture->shader == &Cshader_wall_lightmap)
+		{
+			int i, iu, iv, smax, tmax;
+			float u, v, ubase, vbase, uscale, vscale;
 
-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];
+			smax = surf->extents[0] >> 4;
+			tmax = surf->extents[1] >> 4;
 
-	qsort(sortmodel->modelsortedsurfaces, sortmodel->nummodelsurfaces, sizeof(msurface_t *), Mod_SurfaceQSortCompare);
-}
+			surf->flags |= SURF_LIGHTMAP;
+			if (r_miplightmaps.integer)
+			{
+				surf->lightmaptexturestride = smax+1;
+				surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+			}
+			else
+			{
+				surf->lightmaptexturestride = R_CompatibleFragmentWidth(smax+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
+				surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+			}
+			R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
+			uscale = (uscale - ubase) / (smax + 1);
+			vscale = (vscale - vbase) / (tmax + 1);
 
+			for (i = 0;i < mesh->numverts;i++)
+			{
+				u = ((DotProduct((mesh->vertex3f + i * 3), surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]) + 8 - surf->texturemins[0]) * (1.0 / 16.0);
+				v = ((DotProduct((mesh->vertex3f + i * 3), surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]) + 8 - surf->texturemins[1]) * (1.0 / 16.0);
+				mesh->texcoordlightmap2f[i * 2 + 0] = u * uscale + ubase;
+				mesh->texcoordlightmap2f[i * 2 + 1] = v * vscale + vbase;
+				// LordHavoc: calc lightmap data offset for vertex lighting to use
+				iu = (int) u;
+				iv = (int) v;
+				mesh->lightmapoffsets[i] = (bound(0, iv, tmax) * (smax+1) + bound(0, iu, smax)) * 3;
+			}
+		}
+	}
+}
 
-/*
-=================
-Mod_SetParent
-=================
-*/
-static void Mod_SetParent (mnode_t *node, mnode_t *parent)
+static void Mod_Q1BSP_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_Q1BSP_SetParent(node->children[0], node);
+	Mod_Q1BSP_SetParent(node->children[1], node);
 }
 
-/*
-=================
-Mod_LoadNodes
-=================
-*/
-static void Mod_LoadNodes (lump_t *l)
+static void Mod_Q1BSP_LoadNodes(lump_t *l)
 {
 	int			i, j, count, p;
 	dnode_t		*in;
@@ -1342,7 +1591,7 @@ static void Mod_LoadNodes (lump_t *l)
 
 	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_Q1BSP_LoadNodes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
@@ -1353,19 +1602,19 @@ static void Mod_LoadNodes (lump_t *l)
 	{
 		for (j=0 ; j<3 ; j++)
 		{
-			out->mins[j] = LittleShort (in->mins[j]);
-			out->maxs[j] = LittleShort (in->maxs[j]);
+			out->mins[j] = LittleShort(in->mins[j]);
+			out->maxs[j] = LittleShort(in->maxs[j]);
 		}
 
 		p = LittleLong(in->planenum);
 		out->plane = loadmodel->planes + p;
 
-		out->firstsurface = LittleShort (in->firstface);
-		out->numsurfaces = LittleShort (in->numfaces);
+		out->firstsurface = LittleShort(in->firstface);
+		out->numsurfaces = LittleShort(in->numfaces);
 
 		for (j=0 ; j<2 ; j++)
 		{
-			p = LittleShort (in->children[j]);
+			p = LittleShort(in->children[j]);
 			if (p >= 0)
 				out->children[j] = loadmodel->nodes + p;
 			else
@@ -1373,15 +1622,10 @@ static void Mod_LoadNodes (lump_t *l)
 		}
 	}
 
-	Mod_SetParent (loadmodel->nodes, NULL);	// sets nodes and leafs
+	Mod_Q1BSP_SetParent(loadmodel->nodes, NULL);	// sets nodes and leafs
 }
 
-/*
-=================
-Mod_LoadLeafs
-=================
-*/
-static void Mod_LoadLeafs (lump_t *l)
+static void Mod_Q1BSP_LoadLeafs(lump_t *l)
 {
 	dleaf_t 	*in;
 	mleaf_t 	*out;
@@ -1389,7 +1633,7 @@ static void Mod_LoadLeafs (lump_t *l)
 
 	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_Q1BSP_LoadLeafs: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
@@ -1400,8 +1644,8 @@ static void Mod_LoadLeafs (lump_t *l)
 	{
 		for (j=0 ; j<3 ; j++)
 		{
-			out->mins[j] = LittleShort (in->mins[j]);
-			out->maxs[j] = LittleShort (in->maxs[j]);
+			out->mins[j] = LittleShort(in->mins[j]);
+			out->maxs[j] = LittleShort(in->maxs[j]);
 		}
 
 		p = LittleLong(in->contents);
@@ -1420,24 +1664,11 @@ static void Mod_LoadLeafs (lump_t *l)
 		for (j=0 ; j<4 ; j++)
 			out->ambient_sound_level[j] = in->ambient_level[j];
 
-		// gl underwater warp
-		// LordHavoc: disabled underwater warping
-		/*
-		if (out->contents != CONTENTS_EMPTY)
-		{
-			for (j=0 ; j<out->nummarksurfaces ; j++)
-				out->firstmarksurface[j]->flags |= SURF_UNDERWATER;
-		}
-		*/
+		// FIXME: Insert caustics here
 	}
 }
 
-/*
-=================
-Mod_LoadClipnodes
-=================
-*/
-static void Mod_LoadClipnodes (lump_t *l)
+static void Mod_Q1BSP_LoadClipnodes(lump_t *l)
 {
 	dclipnode_t *in, *out;
 	int			i, count;
@@ -1445,7 +1676,7 @@ static void Mod_LoadClipnodes (lump_t *l)
 
 	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_Q1BSP_LoadClipnodes: funny lump size in %s",loadmodel->name);
 	count = l->filelen / sizeof(*in);
 	out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
@@ -1465,6 +1696,7 @@ static void Mod_LoadClipnodes (lump_t *l)
 		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->hulls[2];
 		hull->clipnodes = out;
@@ -1477,6 +1709,7 @@ static void Mod_LoadClipnodes (lump_t *l)
 		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->hulls[3];
 		hull->clipnodes = out;
@@ -1489,6 +1722,7 @@ static void Mod_LoadClipnodes (lump_t *l)
 		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
 	{
@@ -1503,6 +1737,7 @@ static void Mod_LoadClipnodes (lump_t *l)
 		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->hulls[2];
 		hull->clipnodes = out;
@@ -1515,6 +1750,7 @@ static void Mod_LoadClipnodes (lump_t *l)
 		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++)
@@ -1523,18 +1759,12 @@ static void Mod_LoadClipnodes (lump_t *l)
 		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");
+			Host_Error("Corrupt clipping hull(out of range child)\n");
 	}
 }
 
-/*
-=================
-Mod_MakeHull0
-
-Duplicate the drawing hull structure as a clipping hull
-=================
-*/
-static void Mod_MakeHull0 (void)
+//Duplicate the drawing hull structure as a clipping hull
+static void Mod_Q1BSP_MakeHull0(void)
 {
 	mnode_t		*in;
 	dclipnode_t *out;
@@ -1559,58 +1789,43 @@ static void Mod_MakeHull0 (void)
 	}
 }
 
-/*
-=================
-Mod_LoadMarksurfaces
-=================
-*/
-static void Mod_LoadMarksurfaces (lump_t *l)
+static void Mod_Q1BSP_LoadMarksurfaces(lump_t *l)
 {
-	int		i, j;
-	short	*in;
+	int i, j;
+	short *in;
 
 	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_Q1BSP_LoadMarksurfaces: funny lump size in %s",loadmodel->name);
 	loadmodel->nummarksurfaces = l->filelen / sizeof(*in);
-	loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(msurface_t *));
+	loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(int));
 
 	for (i = 0;i < loadmodel->nummarksurfaces;i++)
 	{
 		j = (unsigned) LittleShort(in[i]);
 		if (j >= loadmodel->numsurfaces)
-			Host_Error ("Mod_ParseMarksurfaces: bad surface number");
-		loadmodel->marksurfaces[i] = loadmodel->surfaces + j;
+			Host_Error("Mod_Q1BSP_LoadMarksurfaces: bad surface number");
+		loadmodel->marksurfaces[i] = j;
 	}
 }
 
-/*
-=================
-Mod_LoadSurfedges
-=================
-*/
-static void Mod_LoadSurfedges (lump_t *l)
+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_LoadBmodel: funny lump size in %s",loadmodel->name);
+		Host_Error("Mod_Q1BSP_LoadSurfedges: funny lump size in %s",loadmodel->name);
 	loadmodel->numsurfedges = l->filelen / sizeof(*in);
 	loadmodel->surfedges = Mem_Alloc(loadmodel->mempool, loadmodel->numsurfedges * sizeof(int));
 
 	for (i = 0;i < loadmodel->numsurfedges;i++)
-		loadmodel->surfedges[i] = LittleLong (in[i]);
+		loadmodel->surfedges[i] = LittleLong(in[i]);
 }
 
 
-/*
-=================
-Mod_LoadPlanes
-=================
-*/
-static void Mod_LoadPlanes (lump_t *l)
+static void Mod_Q1BSP_LoadPlanes(lump_t *l)
 {
 	int			i;
 	mplane_t	*out;
@@ -1618,20 +1833,18 @@ static void Mod_LoadPlanes (lump_t *l)
 
 	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_Q1BSP_LoadPlanes: funny lump size in %s", loadmodel->name);
 
 	loadmodel->numplanes = l->filelen / sizeof(*in);
 	loadmodel->planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->numplanes * sizeof(*out));
 
 	for (i = 0;i < loadmodel->numplanes;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);
+		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);
 
-		// LordHavoc: recalculated by PlaneClassify, FIXME: validate type and report error if type does not match normal?
-//		out->type = LittleLong (in->type);
 		PlaneClassify(out);
 	}
 }
@@ -1641,37 +1854,32 @@ static void Mod_LoadPlanes (lump_t *l)
 typedef struct
 {
 	int numpoints;
+	int padding;
 	double points[8][3]; // variable sized
 }
 winding_t;
 
-typedef struct
-{
-	int numpoints;
-}
-windingsizeof_t;
-
 /*
 ==================
 NewWinding
 ==================
 */
-static winding_t *NewWinding (int points)
+static winding_t *NewWinding(int points)
 {
 	winding_t *w;
 	int size;
 
 	if (points > MAX_POINTS_ON_WINDING)
-		Host_Error("NewWinding: too many points\n");
+		Sys_Error("NewWinding: too many points\n");
 
-	size = sizeof(windingsizeof_t) + sizeof(double[3]) * points;
+	size = sizeof(winding_t) + sizeof(double[3]) * (points - 8);
 	w = Mem_Alloc(loadmodel->mempool, size);
-	memset (w, 0, size);
+	memset(w, 0, size);
 
 	return w;
 }
 
-static void FreeWinding (winding_t *w)
+static void FreeWinding(winding_t *w)
 {
 	Mem_Free(w);
 }
@@ -1681,7 +1889,7 @@ static void FreeWinding (winding_t *w)
 BaseWindingForPlane
 =================
 */
-static winding_t *BaseWindingForPlane (mplane_t *p)
+static winding_t *BaseWindingForPlane(mplane_t *p)
 {
 	double org[3], vright[3], vup[3], normal[3];
 	winding_t *w;
@@ -1689,25 +1897,25 @@ static winding_t *BaseWindingForPlane (mplane_t *p)
 	VectorCopy(p->normal, normal);
 	VectorVectorsDouble(normal, vright, vup);
 
-	VectorScale (vup, 1024.0*1024.0*1024.0, vup);
-	VectorScale (vright, 1024.0*1024.0*1024.0, vright);
+	VectorScale(vup, 1024.0*1024.0*1024.0, vup);
+	VectorScale(vright, 1024.0*1024.0*1024.0, vright);
 
 	// project a really big	axis aligned box onto the plane
-	w = NewWinding (4);
+	w = NewWinding(4);
 
-	VectorScale (p->normal, p->dist, org);
+	VectorScale(p->normal, p->dist, org);
 
-	VectorSubtract (org, vright, w->points[0]);
-	VectorAdd (w->points[0], vup, w->points[0]);
+	VectorSubtract(org, vright, w->points[0]);
+	VectorAdd(w->points[0], vup, w->points[0]);
 
-	VectorAdd (org, vright, w->points[1]);
-	VectorAdd (w->points[1], vup, w->points[1]);
+	VectorAdd(org, vright, w->points[1]);
+	VectorAdd(w->points[1], vup, w->points[1]);
 
-	VectorAdd (org, vright, w->points[2]);
-	VectorSubtract (w->points[2], vup, w->points[2]);
+	VectorAdd(org, vright, w->points[2]);
+	VectorSubtract(w->points[2], vup, w->points[2]);
 
-	VectorSubtract (org, vright, w->points[3]);
-	VectorSubtract (w->points[3], vup, w->points[3]);
+	VectorSubtract(org, vright, w->points[3]);
+	VectorSubtract(w->points[3], vup, w->points[3]);
 
 	w->numpoints = 4;
 
@@ -1724,7 +1932,7 @@ 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 winding_t *ClipWinding(winding_t *in, mplane_t *split, int keepon)
 {
 	double	dists[MAX_POINTS_ON_WINDING + 1];
 	int		sides[MAX_POINTS_ON_WINDING + 1];
@@ -1736,15 +1944,12 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
 	winding_t	*neww;
 	int		maxpts;
 
-	// debugging
-	Mem_CheckSentinels(in);
-
 	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;
+		dists[i] = dot = DotProduct(in->points[i], split->normal) - split->dist;
 		if (dot > ON_EPSILON)
 			sides[i] = SIDE_FRONT;
 		else if (dot < -ON_EPSILON)
@@ -1761,32 +1966,35 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
 
 	if (!counts[0])
 	{
-		FreeWinding (in);
+		FreeWinding(in);
 		return NULL;
 	}
 	if (!counts[1])
 		return in;
 
 	maxpts = in->numpoints+4;	// can't use counts[0]+2 because of fp grouping errors
-	neww = NewWinding (maxpts);
+	if (maxpts > MAX_POINTS_ON_WINDING)
+		Sys_Error("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+
+	neww = NewWinding(maxpts);
 
 	for (i = 0;i < in->numpoints;i++)
 	{
 		if (neww->numpoints >= maxpts)
-			Host_Error ("ClipWinding: points exceeded estimate");
+			Sys_Error("ClipWinding: points exceeded estimate");
 
 		p1 = in->points[i];
 
 		if (sides[i] == SIDE_ON)
 		{
-			VectorCopy (p1, neww->points[neww->numpoints]);
+			VectorCopy(p1, neww->points[neww->numpoints]);
 			neww->numpoints++;
 			continue;
 		}
 
 		if (sides[i] == SIDE_FRONT)
 		{
-			VectorCopy (p1, neww->points[neww->numpoints]);
+			VectorCopy(p1, neww->points[neww->numpoints]);
 			neww->numpoints++;
 		}
 
@@ -1804,18 +2012,15 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
 			else if (split->normal[j] == -1)
 				mid[j] = -split->dist;
 			else
-				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+				mid[j] = p1[j] + dot* (p2[j]-p1[j]);
 		}
 
-		VectorCopy (mid, neww->points[neww->numpoints]);
+		VectorCopy(mid, neww->points[neww->numpoints]);
 		neww->numpoints++;
 	}
 
 	// free the original winding
-	FreeWinding (in);
-
-	// debugging
-	Mem_CheckSentinels(neww);
+	FreeWinding(in);
 
 	return neww;
 }
@@ -1831,7 +2036,7 @@ 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 DivideWinding(winding_t *in, mplane_t *split, winding_t **front, winding_t **back)
 {
 	double	dists[MAX_POINTS_ON_WINDING + 1];
 	int		sides[MAX_POINTS_ON_WINDING + 1];
@@ -1843,15 +2048,12 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
 	winding_t	*f, *b;
 	int		maxpts;
 
-	// debugging
-	Mem_CheckSentinels(in);
-
 	counts[SIDE_FRONT] = counts[SIDE_BACK] = counts[SIDE_ON] = 0;
 
 	// determine sides for each point
 	for (i = 0;i < in->numpoints;i++)
 	{
-		dot = DotProduct (in->points[i], split->normal);
+		dot = DotProduct(in->points[i], split->normal);
 		dot -= split->dist;
 		dists[i] = dot;
 		if (dot > ON_EPSILON) sides[i] = SIDE_FRONT;
@@ -1877,33 +2079,36 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
 
 	maxpts = in->numpoints+4;	// can't use counts[0]+2 because of fp grouping errors
 
-	*front = f = NewWinding (maxpts);
-	*back = b = NewWinding (maxpts);
+	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++)
 	{
 		if (f->numpoints >= maxpts || b->numpoints >= maxpts)
-			Host_Error ("DivideWinding: points exceeded estimate");
+			Sys_Error("DivideWinding: points exceeded estimate");
 
 		p1 = in->points[i];
 
 		if (sides[i] == SIDE_ON)
 		{
-			VectorCopy (p1, f->points[f->numpoints]);
+			VectorCopy(p1, f->points[f->numpoints]);
 			f->numpoints++;
-			VectorCopy (p1, b->points[b->numpoints]);
+			VectorCopy(p1, b->points[b->numpoints]);
 			b->numpoints++;
 			continue;
 		}
 
 		if (sides[i] == SIDE_FRONT)
 		{
-			VectorCopy (p1, f->points[f->numpoints]);
+			VectorCopy(p1, f->points[f->numpoints]);
 			f->numpoints++;
 		}
 		else if (sides[i] == SIDE_BACK)
 		{
-			VectorCopy (p1, b->points[b->numpoints]);
+			VectorCopy(p1, b->points[b->numpoints]);
 			b->numpoints++;
 		}
 
@@ -1921,18 +2126,14 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
 			else if (split->normal[j] == -1)
 				mid[j] = -split->dist;
 			else
-				mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+				mid[j] = p1[j] + dot* (p2[j]-p1[j]);
 		}
 
-		VectorCopy (mid, f->points[f->numpoints]);
+		VectorCopy(mid, f->points[f->numpoints]);
 		f->numpoints++;
-		VectorCopy (mid, b->points[b->numpoints]);
+		VectorCopy(mid, b->points[b->numpoints]);
 		b->numpoints++;
 	}
-
-	// debugging
-	Mem_CheckSentinels(front);
-	Mem_CheckSentinels(back);
 }
 
 typedef struct portal_s
@@ -1952,11 +2153,10 @@ static portal_t *portalchain;
 AllocPortal
 ===========
 */
-static portal_t *AllocPortal (void)
+static portal_t *AllocPortal(void)
 {
 	portal_t *p;
 	p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
-	//memset(p, 0, sizeof(portal_t));
 	p->chain = portalchain;
 	portalchain = p;
 	return p;
@@ -1967,13 +2167,13 @@ static void FreePortal(portal_t *p)
 	Mem_Free(p);
 }
 
-static void Mod_RecursiveRecalcNodeBBox(mnode_t *node)
+static void Mod_Q1BSP_RecursiveRecalcNodeBBox(mnode_t *node)
 {
 	// calculate children first
 	if (node->children[0]->contents >= 0)
-		Mod_RecursiveRecalcNodeBBox(node->children[0]);
+		Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[0]);
 	if (node->children[1]->contents >= 0)
-		Mod_RecursiveRecalcNodeBBox(node->children[1]);
+		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]);
@@ -1984,7 +2184,7 @@ static void Mod_RecursiveRecalcNodeBBox(mnode_t *node)
 	node->maxs[2] = max(node->children[0]->maxs[2], node->children[1]->maxs[2]);
 }
 
-static void Mod_FinalizePortals(void)
+static void Mod_Q1BSP_FinalizePortals(void)
 {
 	int i, j, numportals, numpoints;
 	portal_t *p, *pnext;
@@ -1993,16 +2193,16 @@ static void Mod_FinalizePortals(void)
 	mleaf_t *leaf, *endleaf;
 	winding_t *w;
 
-	// recalculate bounding boxes for all leafs (because qbsp is very sloppy)
+	// recalculate bounding boxes for all leafs(because qbsp is very sloppy)
 	leaf = loadmodel->leafs;
 	endleaf = leaf + loadmodel->numleafs;
 	for (;leaf < endleaf;leaf++)
 	{
-		VectorSet( 2000000000,  2000000000,  2000000000, leaf->mins);
-		VectorSet(-2000000000, -2000000000, -2000000000, leaf->maxs);
+		VectorSet(leaf->mins,  2000000000,  2000000000,  2000000000);
+		VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
 	}
 	p = portalchain;
-	while(p)
+	while (p)
 	{
 		if (p->winding)
 		{
@@ -2024,13 +2224,13 @@ static void Mod_FinalizePortals(void)
 		p = p->chain;
 	}
 
-	Mod_RecursiveRecalcNodeBBox(loadmodel->nodes);
+	Mod_Q1BSP_RecursiveRecalcNodeBBox(loadmodel->nodes);
 
 	// tally up portal and point counts
 	p = portalchain;
 	numportals = 0;
 	numpoints = 0;
-	while(p)
+	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
@@ -2045,7 +2245,7 @@ static void Mod_FinalizePortals(void)
 	}
 	loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
 	loadmodel->numportals = numportals;
-	loadmodel->portalpoints = (void *) ((long) loadmodel->portals + numportals * sizeof(mportal_t));
+	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++)
@@ -2067,7 +2267,7 @@ static void Mod_FinalizePortals(void)
 			 && 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)
+				// first make the back to front portal(forward portal)
 				portal->points = point;
 				portal->numpoints = p->winding->numpoints;
 				portal->plane.dist = p->plane.dist;
@@ -2089,7 +2289,7 @@ static void Mod_FinalizePortals(void)
 				// advance to next portal
 				portal++;
 
-				// then make the front to back portal (backward portal)
+				// then make the front to back portal(backward portal)
 				portal->points = point;
 				portal->numpoints = p->winding->numpoints;
 				portal->plane.dist = -p->plane.dist;
@@ -2123,14 +2323,14 @@ static void Mod_FinalizePortals(void)
 AddPortalToNodes
 =============
 */
-static void AddPortalToNodes (portal_t *p, mnode_t *front, mnode_t *back)
+static void AddPortalToNodes(portal_t *p, mnode_t *front, mnode_t *back)
 {
 	if (!front)
-		Host_Error ("AddPortalToNodes: NULL front node");
+		Host_Error("AddPortalToNodes: NULL front node");
 	if (!back)
-		Host_Error ("AddPortalToNodes: NULL back node");
+		Host_Error("AddPortalToNodes: NULL back node");
 	if (p->nodes[0] || p->nodes[1])
-		Host_Error ("AddPortalToNodes: already included");
+		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;
@@ -2162,7 +2362,7 @@ static void RemovePortalFromNodes(portal_t *portal)
 		{
 			t = *portalpointer;
 			if (!t)
-				Host_Error ("RemovePortalFromNodes: portal not in leaf");
+				Host_Error("RemovePortalFromNodes: portal not in leaf");
 
 			if (t == portal)
 			{
@@ -2177,7 +2377,7 @@ static void RemovePortalFromNodes(portal_t *portal)
 					portal->nodes[1] = NULL;
 				}
 				else
-					Host_Error ("RemovePortalFromNodes: portal not bounding leaf");
+					Host_Error("RemovePortalFromNodes: portal not bounding leaf");
 				break;
 			}
 
@@ -2186,12 +2386,12 @@ static void RemovePortalFromNodes(portal_t *portal)
 			else if (t->nodes[1] == node)
 				portalpointer = (void **) &t->next[1];
 			else
-				Host_Error ("RemovePortalFromNodes: portal not bounding leaf");
+				Host_Error("RemovePortalFromNodes: portal not bounding leaf");
 		}
 	}
 }
 
-static void Mod_RecursiveNodePortals (mnode_t *node)
+static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node)
 {
 	int side;
 	mnode_t *front, *back, *other_node;
@@ -2199,8 +2399,6 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
 	portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
 	winding_t *nodeportalwinding, *frontwinding, *backwinding;
 
-	//	CheckLeafPortalConsistancy (node);
-
 	// if a leaf, we're done
 	if (node->contents)
 		return;
@@ -2210,35 +2408,35 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
 	front = node->children[0];
 	back = node->children[1];
 	if (front == back)
-		Host_Error("Mod_RecursiveNodePortals: corrupt node hierarchy");
+		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 ();
+	// 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);
+	nodeportalwinding = BaseWindingForPlane(node->plane);
 	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_RecursiveNodePortals: portal has same node on both sides (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);
+			VectorNegate(clipplane.normal, clipplane.normal);
 			side = 1;
 		}
 		else
-			Host_Error ("Mod_RecursiveNodePortals: mislinked portal");
+			Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
 
-		nodeportalwinding = ClipWinding (nodeportalwinding, &clipplane, true);
+		nodeportalwinding = ClipWinding(nodeportalwinding, &clipplane, true);
 		if (!nodeportalwinding)
 		{
-			printf ("Mod_RecursiveNodePortals: WARNING: new portal was clipped away\n");
+			Con_Printf("Mod_Q1BSP_RecursiveNodePortals: WARNING: new portal was clipped away\n");
 			break;
 		}
 	}
@@ -2247,7 +2445,7 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
 	{
 		// if the plane was not clipped on all sides, there was an error
 		nodeportal->winding = nodeportalwinding;
-		AddPortalToNodes (nodeportal, front, back);
+		AddPortalToNodes(nodeportal, front, back);
 	}
 
 	// split the portals of this node along this node's plane and assign them to the children of this node
@@ -2255,204 +2453,287 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
 	for (portal = (portal_t *)node->portals;portal;portal = nextportal)
 	{
 		if (portal->nodes[0] == portal->nodes[1])
-			Host_Error("Mod_RecursiveNodePortals: portal has same node on both sides (2)");
+			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_RecursiveNodePortals: mislinked portal");
+			Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
 		nextportal = portal->next[side];
 
 		other_node = portal->nodes[!side];
-		RemovePortalFromNodes (portal);
+		RemovePortalFromNodes(portal);
 
 		// cut the portal into two portals, one on each side of the node plane
-		DivideWinding (portal->winding, plane, &frontwinding, &backwinding);
+		DivideWinding(portal->winding, plane, &frontwinding, &backwinding);
 
 		if (!frontwinding)
 		{
 			if (side == 0)
-				AddPortalToNodes (portal, back, other_node);
+				AddPortalToNodes(portal, back, other_node);
 			else
-				AddPortalToNodes (portal, other_node, back);
+				AddPortalToNodes(portal, other_node, back);
 			continue;
 		}
 		if (!backwinding)
 		{
 			if (side == 0)
-				AddPortalToNodes (portal, front, other_node);
+				AddPortalToNodes(portal, front, other_node);
 			else
-				AddPortalToNodes (portal, other_node, front);
+				AddPortalToNodes(portal, other_node, front);
 			continue;
 		}
 
 		// the winding is split
-		splitportal = AllocPortal ();
+		splitportal = AllocPortal();
 		temp = splitportal->chain;
 		*splitportal = *portal;
 		splitportal->chain = temp;
 		splitportal->winding = backwinding;
-		FreeWinding (portal->winding);
+		FreeWinding(portal->winding);
 		portal->winding = frontwinding;
 
 		if (side == 0)
 		{
-			AddPortalToNodes (portal, front, other_node);
-			AddPortalToNodes (splitportal, back, other_node);
+			AddPortalToNodes(portal, front, other_node);
+			AddPortalToNodes(splitportal, back, other_node);
 		}
 		else
 		{
-			AddPortalToNodes (portal, other_node, front);
-			AddPortalToNodes (splitportal, other_node, back);
+			AddPortalToNodes(portal, other_node, front);
+			AddPortalToNodes(splitportal, other_node, back);
 		}
 	}
 
-	Mod_RecursiveNodePortals(front);
-	Mod_RecursiveNodePortals(back);
+	Mod_Q1BSP_RecursiveNodePortals(front);
+	Mod_Q1BSP_RecursiveNodePortals(back);
 }
 
-/*
-void Mod_MakeOutsidePortals(mnode_t *node)
-{
-	int			i, j;
-	portal_t	*p, *portals[6];
-	mnode_t		*outside_node;
 
-	outside_node = Mem_Alloc(loadmodel->mempool, sizeof(mnode_t));
-	outside_node->contents = CONTENTS_SOLID;
-	outside_node->portals = NULL;
+static void Mod_Q1BSP_MakePortals(void)
+{
+	portalchain = NULL;
+	Mod_Q1BSP_RecursiveNodePortals(loadmodel->nodes);
+	Mod_Q1BSP_FinalizePortals();
+}
 
-	for (i = 0;i < 3;i++)
+static void Mod_Q1BSP_BuildSurfaceNeighbors(msurface_t *surfaces, int numsurfaces, mempool_t *mempool)
+{
+#if 0
+	int surfnum, vertnum, vertnum2, snum, vnum, vnum2;
+	msurface_t *surf, *s;
+	float *v0, *v1, *v2, *v3;
+	for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
+		surf->neighborsurfaces = Mem_Alloc(mempool, surf->poly_numverts * sizeof(msurface_t *));
+	for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
 	{
-		for (j = 0;j < 2;j++)
+		for (vertnum = surf->poly_numverts - 1, vertnum2 = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;vertnum2 < surf->poly_numverts;vertnum = vertnum2, vertnum2++, v0 = v1, v1 += 3)
 		{
-			portals[j*3 + i] = p = AllocPortal ();
-			memset (&p->plane, 0, sizeof(mplane_t));
-			p->plane.normal[i] = j ? -1 : 1;
-			p->plane.dist = -65536;
-			p->winding = BaseWindingForPlane (&p->plane);
-			if (j)
-				AddPortalToNodes (p, outside_node, node);
-			else
-				AddPortalToNodes (p, node, outside_node);
+			if (surf->neighborsurfaces[vertnum])
+				continue;
+			surf->neighborsurfaces[vertnum] = NULL;
+			for (s = surfaces, snum = 0;snum < numsurfaces;s++, snum++)
+			{
+				if (s->poly_mins[0] > (surf->poly_maxs[0] + 1) || s->poly_maxs[0] < (surf->poly_mins[0] - 1)
+				 || s->poly_mins[1] > (surf->poly_maxs[1] + 1) || s->poly_maxs[1] < (surf->poly_mins[1] - 1)
+				 || s->poly_mins[2] > (surf->poly_maxs[2] + 1) || s->poly_maxs[2] < (surf->poly_mins[2] - 1)
+				 || s == surf)
+					continue;
+				for (vnum = 0;vnum < s->poly_numverts;vnum++)
+					if (s->neighborsurfaces[vnum] == surf)
+						break;
+				if (vnum < s->poly_numverts)
+					continue;
+				for (vnum = s->poly_numverts - 1, vnum2 = 0, v2 = s->poly_verts + (s->poly_numverts - 1) * 3, v3 = s->poly_verts;vnum2 < s->poly_numverts;vnum = vnum2, vnum2++, v2 = v3, v3 += 3)
+				{
+					if (s->neighborsurfaces[vnum] == NULL
+					 && ((v0[0] == v2[0] && v0[1] == v2[1] && v0[2] == v2[2] && v1[0] == v3[0] && v1[1] == v3[1] && v1[2] == v3[2])
+					  || (v1[0] == v2[0] && v1[1] == v2[1] && v1[2] == v2[2] && v0[0] == v3[0] && v0[1] == v3[1] && v0[2] == v3[2])))
+					{
+						surf->neighborsurfaces[vertnum] = s;
+						s->neighborsurfaces[vnum] = surf;
+						break;
+					}
+				}
+				if (vnum < s->poly_numverts)
+					break;
+			}
 		}
 	}
+#endif
+}
 
-	// clip the basewindings by all the other planes
-	for (i = 0;i < 6;i++)
+static void Mod_Q1BSP_BuildLightmapUpdateChains(mempool_t *mempool, model_t *model)
+{
+	int i, j, stylecounts[256], totalcount, remapstyles[256];
+	msurface_t *surf;
+	memset(stylecounts, 0, sizeof(stylecounts));
+	for (i = 0;i < model->nummodelsurfaces;i++)
 	{
-		for (j = 0;j < 6;j++)
+		surf = model->surfaces + model->firstmodelsurface + i;
+		for (j = 0;j < MAXLIGHTMAPS;j++)
+			stylecounts[surf->styles[j]]++;
+	}
+	totalcount = 0;
+	model->light_styles = 0;
+	for (i = 0;i < 255;i++)
+	{
+		if (stylecounts[i])
 		{
-			if (j == i)
-				continue;
-			portals[i]->winding = ClipWinding (portals[i]->winding, &portals[j]->plane, true);
+			remapstyles[i] = model->light_styles++;
+			totalcount += stylecounts[i] + 1;
 		}
 	}
+	if (!totalcount)
+		return;
+	model->light_style = Mem_Alloc(mempool, model->light_styles * sizeof(qbyte));
+	model->light_stylevalue = Mem_Alloc(mempool, model->light_styles * sizeof(int));
+	model->light_styleupdatechains = Mem_Alloc(mempool, model->light_styles * sizeof(msurface_t **));
+	model->light_styleupdatechainsbuffer = Mem_Alloc(mempool, totalcount * sizeof(msurface_t *));
+	model->light_styles = 0;
+	for (i = 0;i < 255;i++)
+		if (stylecounts[i])
+			model->light_style[model->light_styles++] = i;
+	j = 0;
+	for (i = 0;i < model->light_styles;i++)
+	{
+		model->light_styleupdatechains[i] = model->light_styleupdatechainsbuffer + j;
+		j += stylecounts[model->light_style[i]] + 1;
+	}
+	for (i = 0;i < model->nummodelsurfaces;i++)
+	{
+		surf = model->surfaces + model->firstmodelsurface + i;
+		for (j = 0;j < MAXLIGHTMAPS;j++)
+			if (surf->styles[j] != 255)
+				*model->light_styleupdatechains[remapstyles[surf->styles[j]]]++ = surf;
+	}
+	j = 0;
+	for (i = 0;i < model->light_styles;i++)
+	{
+		*model->light_styleupdatechains[i] = NULL;
+		model->light_styleupdatechains[i] = model->light_styleupdatechainsbuffer + j;
+		j += stylecounts[model->light_style[i]] + 1;
+	}
 }
-*/
 
-static void Mod_MakePortals(void)
+static void Mod_Q1BSP_BuildPVSTextureChains(model_t *model)
 {
-//	Con_Printf("building portals for %s\n", loadmodel->name);
-
-	portalchain = NULL;
-//	Mod_MakeOutsidePortals (loadmodel->nodes);
-	Mod_RecursiveNodePortals (loadmodel->nodes);
-	Mod_FinalizePortals();
+	int i, j;
+	for (i = 0;i < model->numtextures;i++)
+		model->pvstexturechainslength[i] = 0;
+	for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
+	{
+		if (model->surfacepvsframes[j] == model->pvsframecount)
+		{
+			model->pvssurflist[model->pvssurflistlength++] = j;
+			model->pvstexturechainslength[model->surfaces[j].texinfo->texture->number]++;
+		}
+	}
+	for (i = 0, j = 0;i < model->numtextures;i++)
+	{
+		if (model->pvstexturechainslength[i])
+		{
+			model->pvstexturechains[i] = model->pvstexturechainsbuffer + j;
+			j += model->pvstexturechainslength[i] + 1;
+		}
+		else
+			model->pvstexturechains[i] = NULL;
+	}
+	for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
+		if (model->surfacepvsframes[j] == model->pvsframecount)
+			*model->pvstexturechains[model->surfaces[j].texinfo->texture->number]++ = model->surfaces + j;
+	for (i = 0;i < model->numtextures;i++)
+	{
+		if (model->pvstexturechainslength[i])
+		{
+			*model->pvstexturechains[i] = NULL;
+			model->pvstexturechains[i] -= model->pvstexturechainslength[i];
+		}
+	}
 }
 
-/*
-=================
-Mod_LoadBrushModel
-=================
-*/
-void Mod_LoadBrushModel (model_t *mod, void *buffer)
+extern void R_Model_Brush_DrawSky(entity_render_t *ent);
+extern void R_Model_Brush_Draw(entity_render_t *ent);
+extern void R_Model_Brush_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius);
+extern void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
+void Mod_Q1BSP_Load(model_t *mod, void *buffer)
 {
-	int			i, j;
-	dheader_t	*header;
-	dmodel_t 	*bm;
-	mempool_t	*mainmempool;
+	int i, j, k;
+	dheader_t *header;
+	dmodel_t *bm;
+	mempool_t *mainmempool;
+	char *loadname;
+	model_t *originalloadmodel;
+	float dist, modelyawradius, modelradius, *vec;
+	msurface_t *surf;
+	surfmesh_t *mesh;
 
 	mod->type = mod_brush;
 
 	header = (dheader_t *)buffer;
 
-	i = LittleLong (header->version);
+	i = LittleLong(header->version);
 	if (i != BSPVERSION && i != 30)
-		Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i or 30 (HalfLife))", mod->name, i, BSPVERSION);
+		Host_Error("Mod_Q1BSP_Load: %s has wrong version number(%i should be %i(Quake) or 30(HalfLife))", mod->name, i, BSPVERSION);
 	mod->ishlbsp = i == 30;
+
+	mod->FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
+	mod->PointInLeaf = Mod_Q1BSP_PointInLeaf;
+	mod->PointContents = Mod_Q1BSP_PointContents;
+	mod->LeafPVS = Mod_Q1BSP_LeafPVS;
+	mod->BuildPVSTextureChains = Mod_Q1BSP_BuildPVSTextureChains;
+
 	if (loadmodel->isworldmodel)
+	{
 		Cvar_SetValue("halflifebsp", mod->ishlbsp);
+		// until we get a texture for it...
+		R_ResetQuakeSky();
+	}
 
 // swap all the lumps
-	mod_base = (byte *)header;
+	mod_base = (qbyte *)header;
 
-	for (i=0 ; i<sizeof(dheader_t)/4 ; i++)
-		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
+	for (i = 0;i < (int) 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;
 
-//	Mem_CheckSentinelsGlobal();
-	// LordHavoc: had to move entity loading above everything to allow parsing various settings from worldspawn
-	Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-//	Mem_CheckSentinelsGlobal();
-	Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-//	Mem_CheckSentinelsGlobal();
-//	Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-	Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-//	Mem_CheckSentinelsGlobal();
-
-	Mod_MakeHull0 ();
-//	Mem_CheckSentinelsGlobal();
-	Mod_MakePortals();
-//	Mem_CheckSentinelsGlobal();
+	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_LoadMarksurfaces(&header->lumps[LUMP_MARKSURFACES]);
+	Mod_Q1BSP_LoadVisibility(&header->lumps[LUMP_VISIBILITY]);
+	Mod_Q1BSP_LoadLeafs(&header->lumps[LUMP_LEAFS]);
+	Mod_Q1BSP_LoadNodes(&header->lumps[LUMP_NODES]);
+	Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES]);
+	Mod_Q1BSP_LoadSubmodels(&header->lumps[LUMP_MODELS]);
+
+	Mod_Q1BSP_MakeHull0();
+	Mod_Q1BSP_MakePortals();
 
 	mod->numframes = 2;		// regular and alternate animation
 
 	mainmempool = mod->mempool;
+	loadname = mod->name;
+
+	Mod_Q1BSP_LoadLightList();
+	originalloadmodel = loadmodel;
 
 //
-// set up the submodels (FIXME: this is confusing)
+// set up the submodels(FIXME: this is confusing)
 //
 	for (i = 0;i < mod->numsubmodels;i++)
 	{
-		int k, l;
-		float dist, modelyawradius, modelradius, *vec;
-		msurface_t *surf;
-
-		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;
-
 		bm = &mod->submodels[i];
 
 		mod->hulls[0].firstclipnode = bm->headnode[0];
@@ -2465,71 +2746,538 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
 		mod->firstmodelsurface = bm->firstface;
 		mod->nummodelsurfaces = bm->numfaces;
 
+		// this gets altered below if sky is used
 		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++)
+		mod->Draw = R_Model_Brush_Draw;
+		mod->DrawFakeShadow = NULL;
+		mod->DrawShadowVolume = R_Model_Brush_DrawShadowVolume;
+		mod->DrawLight = R_Model_Brush_DrawLight;
+		mod->pvstexturechains = Mem_Alloc(originalloadmodel->mempool, mod->numtextures * sizeof(msurface_t **));
+		mod->pvstexturechainsbuffer = Mem_Alloc(originalloadmodel->mempool,(mod->nummodelsurfaces + mod->numtextures) * sizeof(msurface_t *));
+		mod->pvstexturechainslength = Mem_Alloc(originalloadmodel->mempool, mod->numtextures * sizeof(int));
+		Mod_Q1BSP_BuildPVSTextureChains(mod);
+		Mod_Q1BSP_BuildLightmapUpdateChains(originalloadmodel->mempool, mod);
+		if (mod->nummodelsurfaces)
 		{
-			// 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++)
+			// 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, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
 			{
-				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;
+				// we only need to have a drawsky function if it is used(usually only on world model)
+				if (surf->texinfo->texture->shader == &Cshader_sky)
+					mod->DrawSky = R_Model_Brush_DrawSky;
+				// LordHavoc: submodels always clip, even if water
+				if (mod->numsubmodels - 1)
+					surf->flags |= SURF_SOLIDCLIP;
+				// calculate bounding shapes
+				for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+				{
+					for (k = 0, vec = mesh->vertex3f;k < mesh->numverts;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;
 		}
-		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->modelradius = modelradius;
-
-//		VectorCopy (bm->maxs, mod->maxs);
-//		VectorCopy (bm->mins, mod->mins);
-
-//		mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
+		else
+		{
+			// LordHavoc: empty submodel(lacrima.bsp has such a glitch)
+			Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname);
+		}
+		Mod_Q1BSP_BuildSurfaceNeighbors(mod->surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, originalloadmodel->mempool);
 
 		mod->numleafs = bm->visleafs;
 
-		mod->SERAddEntity = Mod_Brush_SERAddEntity;
-		mod->Draw = R_DrawBrushModelNormal;
-		mod->DrawShadow = NULL;
-
-		Mod_BrushSortedSurfaces(mod, mainmempool);
-
 		// 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);
+			sprintf(name, "*%i", i+1);
+			loadmodel = Mod_FindName(name);
 			*loadmodel = *mod;
-			strcpy (loadmodel->name, name);
+			strcpy(loadmodel->name, name);
 			// textures and memory belong to the main model
 			loadmodel->texturepool = NULL;
 			loadmodel->mempool = NULL;
 			mod = loadmodel;
 		}
 	}
-//	Mem_CheckSentinelsGlobal();
+
+	loadmodel = originalloadmodel;
+	//Mod_Q1BSP_ProcessLightList();
+}
+
+static void Mod_Q2BSP_LoadEntities(lump_t *l)
+{
 }
+
+static void Mod_Q2BSP_LoadPlanes(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_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++)
+	{
+	}
+*/
+}
+
+static void Mod_Q2BSP_LoadVertices(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_LoadVertices: 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_Q2BSP_LoadVisibility(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_LoadVisibility: 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_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));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
+
+static void Mod_Q2BSP_LoadTexInfo(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_LoadTexInfo: 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_Q2BSP_LoadFaces(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_LoadFaces: 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_Q2BSP_LoadLighting(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_LoadLighting: 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_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));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
+
+static void Mod_Q2BSP_LoadLeafFaces(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_LoadLeafFaces: 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_Q2BSP_LoadLeafBrushes(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_LoadLeafBrushes: 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_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));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
+
+static void Mod_Q2BSP_LoadSurfEdges(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_LoadSurfEdges: 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_Q2BSP_LoadBrushes(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_LoadBrushes: 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_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));
+
+	loadmodel-> = out;
+	loadmodel->num = count;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
+
+static void Mod_Q2BSP_LoadAreas(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_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;
+
+	for (i = 0;i < count;i++, in++, out++)
+	{
+	}
+*/
+}
+
+static void Mod_Q2BSP_LoadAreaPortals(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_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_Q2BSP_LoadModels(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_LoadModels: 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++)
+	{
+	}
+*/
+}
+
+void Mod_Q2BSP_Load(model_t *mod, void *buffer)
+{
+	int i;
+	q2dheader_t *header;
+
+	mod->type = mod_brushq2;
+
+	header = (q2dheader_t *)buffer;
+
+	i = LittleLong(header->version);
+	if (i != Q2BSPVERSION)
+		Host_Error("Mod_Q2BSP_Load: %s has wrong version number(%i should be %i)", mod->name, i, BSPVERSION);
+	mod->ishlbsp = false;
+	if (loadmodel->isworldmodel)
+	{
+		Cvar_SetValue("halflifebsp", mod->ishlbsp);
+		// until we get a texture for it...
+		R_ResetQuakeSky();
+	}
+
+	mod_base = (qbyte *)header;
+
+	// swap all the lumps
+	for (i = 0;i < (int) sizeof(dheader_t) / 4;i++)
+		((int *)header)[i] = LittleLong(((int *)header)[i]);
+
+	// store which lightmap format to use
+	mod->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]);
+}
+
+void Mod_Q3BSP_Load(model_t *mod, void *buffer)
+{
+	Host_Error("Mod_Q3BSP_Load: not yet implemented\n");
+}
+
+void Mod_IBSP_Load(model_t *mod, void *buffer)
+{
+	int i = LittleLong(* ((int *)buffer));
+	if (i == 46)
+		Mod_Q3BSP_Load(mod,buffer);
+	else if (i == 38)
+		Mod_Q2BSP_Load(mod,buffer);
+	else
+		Host_Error("Mod_IBSP_Load: unknown/unsupported version %i\n", i);
+}
+
+void Mod_MAP_Load(model_t *mod, void *buffer)
+{
+	Host_Error("Mod_MAP_Load: not yet implemented\n");
+}
+