]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_brush.c
changed brush model API - now uses function pointers for some of the brush model...
[xonotic/darkplaces.git] / model_brush.c
index c003fb2c5f3228311ab9979b0d87a34cf6361836..10cd356477ea5e9dd70f1b9e05d56fd8859ea7b3 100644 (file)
@@ -20,10 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "image.h"
+#include "r_shadow.h"
 
 // note: model_shared.c sets up r_notexture, and r_surf_notexture
 
-qbyte mod_novis[(MAX_MAP_LEAFS + 7)/ 8];
+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"};
@@ -33,16 +34,7 @@ cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
 cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
 cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
 
-#define NUM_DETAILTEXTURES 1
-static rtexture_t *detailtextures[NUM_DETAILTEXTURES];
-static rtexturepool_t *detailtexturepool;
-
-/*
-===============
-Mod_BrushInit
-===============
-*/
-void Mod_BrushInit (void)
+void Mod_BrushInit(void)
 {
 //     Cvar_RegisterVariable(&r_subdivide_size);
        Cvar_RegisterVariable(&halflifebsp);
@@ -51,64 +43,10 @@ void Mod_BrushInit (void)
        Cvar_RegisterVariable(&r_lightmaprgba);
        Cvar_RegisterVariable(&r_nosurftextures);
        Cvar_RegisterVariable(&r_sortsurfaces);
-       memset(mod_novis, 0xff, sizeof(mod_novis));
-}
-
-void Mod_BrushStartup (void)
-{
-       int i, x, y, light;
-       float vc[3], vx[3], vy[3], vn[3], lightdir[3];
-#define DETAILRESOLUTION 256
-       qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION];
-       detailtexturepool = R_AllocTexturePool();
-       lightdir[0] = 0.5;
-       lightdir[1] = 1;
-       lightdir[2] = -0.25;
-       VectorNormalize(lightdir);
-       for (i = 0;i < NUM_DETAILTEXTURES;i++)
-       {
-               fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4);
-               for (y = 0;y < DETAILRESOLUTION;y++)
-               {
-                       for (x = 0;x < DETAILRESOLUTION;x++)
-                       {
-                               vc[0] = x;
-                               vc[1] = y;
-                               vc[2] = noise[y][x] * (1.0f / 32.0f);
-                               vx[0] = x + 1;
-                               vx[1] = y;
-                               vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f);
-                               vy[0] = x;
-                               vy[1] = y + 1;
-                               vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f);
-                               VectorSubtract(vx, vc, vx);
-                               VectorSubtract(vy, vc, vy);
-                               CrossProduct(vx, vy, vn);
-                               VectorNormalize(vn);
-                               light = 128 - DotProduct(vn, lightdir) * 128;
-                               light = bound(0, light, 255);
-                               data[y][x][0] = data[y][x][1] = data[y][x][2] = light;
-                               data[y][x][3] = 255;
-                       }
-               }
-               detailtextures[i] = R_LoadTexture2D(detailtexturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
-       }
-}
-
-void Mod_BrushShutdown (void)
-{
-       int i;
-       for (i = 0;i < NUM_DETAILTEXTURES;i++)
-               R_FreeTexture(detailtextures[i]);
-       R_FreeTexturePool(&detailtexturepool);
+       memset(mod_q1bsp_novis, 0xff, sizeof(mod_q1bsp_novis));
 }
 
-/*
-===============
-Mod_PointInLeaf
-===============
-*/
-mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
+static mleaf_t *Mod_Q1BSP_PointInLeaf(model_t *model, const vec3_t p)
 {
        mnode_t *node;
 
@@ -121,12 +59,12 @@ mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
        // 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;
 }
 
-int Mod_PointContents (const vec3_t p, model_t *model)
+static int Mod_Q1BSP_PointContents(model_t *model, const vec3_t p)
 {
        mnode_t *node;
 
@@ -139,32 +77,193 @@ int Mod_PointContents (const vec3_t p, model_t *model)
        // 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)->contents;
 }
 
-void Mod_FindNonSolidLocation(vec3_t pos, model_t *mod)
+typedef struct findnonsolidlocationinfo_s
 {
-       if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[0]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[0]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[0]-=1;
-       pos[1]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[1]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[1]-=1;
-       pos[2]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[2]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
-       pos[2]-=1;
+       vec3_t center;
+       vec_t radius;
+       vec3_t nudge;
+       vec_t bestdist;
+       model_t *model;
 }
+findnonsolidlocationinfo_t;
 
+#if 0
+extern cvar_t samelevel;
+#endif
+static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *info, mleaf_t *leaf)
+{
+       int i, surfnum, k, *tri, *mark;
+       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);
+                                                                               }
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+}
 
-/*
-===================
-Mod_DecompressVis
-===================
-*/
-static qbyte *Mod_DecompressVis (qbyte *in, model_t *model)
+static void Mod_Q1BSP_FindNonSolidLocation_r(findnonsolidlocationinfo_t *info, mnode_t *node)
+{
+       if (node->contents)
+       {
+               if (((mleaf_t *)node)->nummarksurfaces)
+                       Mod_Q1BSP_FindNonSolidLocation_r_Leaf(info, (mleaf_t *)node);
+       }
+       else
+       {
+               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]);
+       }
+}
+
+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);
+}
+
+static qbyte *Mod_Q1BSP_DecompressVis(model_t *model, qbyte *in)
 {
        static qbyte decompressed[MAX_MAP_LEAFS/8];
        int c;
@@ -194,19 +293,14 @@ static qbyte *Mod_DecompressVis (qbyte *in, model_t *model)
        return decompressed;
 }
 
-qbyte *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);
+               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, incomplete;
        miptex_t *dmiptex;
@@ -214,11 +308,6 @@ static void Mod_LoadTextures (lump_t *l)
        dmiptexlump_t *m;
        qbyte *data, *mtdata;
        char name[256];
-       qbyte *basepixels, *bumppixels, *nmappixels, *glosspixels, *glowpixels, *maskpixels;
-       int basepixels_width, basepixels_height, bumppixels_width, bumppixels_height;
-       int nmappixels_width, nmappixels_height, glosspixels_width, glosspixels_height;
-       int glowpixels_width, glowpixels_height, maskpixels_width, maskpixels_height;
-       rtexture_t *detailtexture;
 
        loadmodel->textures = NULL;
 
@@ -236,15 +325,19 @@ static void Mod_LoadTextures (lump_t *l)
        // 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->texture = r_notexture;
+               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->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)
@@ -262,23 +355,23 @@ static void Mod_LoadTextures (lump_t *l)
                        name[j] = dmiptex->name[j];
                name[j] = 0;
 
-               mtwidth = LittleLong (dmiptex->width);
-               mtheight = LittleLong (dmiptex->height);
+               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)
                        {
-                               Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
+                               Con_Printf("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
                                continue;
                        }
                        mtdata = (qbyte *)dmiptex + j;
                }
 
                if ((mtwidth & 15) || (mtheight & 15))
-                       Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
+                       Con_Printf("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
 
                // LordHavoc: force all names to lowercase
                for (j = 0;name[j];j++)
@@ -296,14 +389,6 @@ static void Mod_LoadTextures (lump_t *l)
                        Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
                }
 
-               basepixels = NULL;basepixels_width = 0;basepixels_height = 0;
-               bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0;
-               nmappixels = NULL;nmappixels_width = 0;nmappixels_height = 0;
-               glosspixels = NULL;glosspixels_width = 0;glosspixels_height = 0;
-               glowpixels = NULL;glowpixels_width = 0;glowpixels_height = 0;
-               maskpixels = NULL;maskpixels_width = 0;maskpixels_height = 0;
-               detailtexture = NULL;
-
                // LordHavoc: HL sky textures are entirely different than quake
                if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
                {
@@ -314,179 +399,73 @@ static void Mod_LoadTextures (lump_t *l)
                                {
                                        if (image_width == 256 && image_height == 128)
                                        {
-                                               R_InitSky (data, 4);
+                                               R_InitSky(data, 4);
                                                Mem_Free(data);
                                        }
                                        else
                                        {
                                                Mem_Free(data);
-                                               Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
+                                               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);
+                                                       R_InitSky(mtdata, 1);
                                        }
                                }
                                else if (mtdata != NULL)
-                                       R_InitSky (mtdata, 1);
+                                       R_InitSky(mtdata, 1);
                        }
                }
                else
                {
-                       if ((basepixels = loadimagepixels(tx->name, false, 0, 0)) != NULL)
-                       {
-                               basepixels_width = image_width;
-                               basepixels_height = image_height;
-                       }
-                       // _luma is supported for tenebrae compatibility
-                       // (I think it's a very stupid name, but oh well)
-                       if ((glowpixels = loadimagepixels(va("%s_glow", tx->name), false, 0, 0)) != NULL
-                        || (glowpixels = loadimagepixels(va("%s_luma", tx->name), false, 0, 0)) != NULL)
-                       {
-                               glowpixels_width = image_width;
-                               glowpixels_height = image_height;
-                       }
-                       if ((bumppixels = loadimagepixels(va("%s_bump", tx->name), false, 0, 0)) != NULL)
-                       {
-                               bumppixels_width = image_width;
-                               bumppixels_height = image_height;
-                       }
-                       if ((glosspixels = loadimagepixels(va("%s_gloss", tx->name), false, 0, 0)) != NULL)
-                       {
-                               glosspixels_width = image_width;
-                               glosspixels_height = image_height;
-                       }
-                       if (!basepixels)
+                       if (!Mod_LoadSkinFrame(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, false, true, true))
                        {
+                               // did not find external texture, load it from the bsp or wad3
                                if (loadmodel->ishlbsp)
                                {
                                        // internal texture overrides wad
-                                       if (mtdata && (basepixels = W_ConvertWAD3Texture(dmiptex)) != NULL)
-                                       {
-                                               basepixels_width = image_width;
-                                               basepixels_height = image_height;
-                                       }
-                                       else if ((basepixels = W_GetTexture(tx->name)) != NULL)
-                                       {
-                                               // get the size from the wad texture
-                                               tx->width = basepixels_width = image_width;
-                                               tx->height = basepixels_height = image_height;
-                                       }
-                               }
-                               else
-                               {
-                                       if (mtdata) // texture included
+                                       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)
                                        {
-                                               if (r_fullbrights.integer && tx->name[0] != '*')
+                                               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))
                                                {
-                                                       basepixels_width = tx->width;
-                                                       basepixels_height = tx->height;
-                                                       basepixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
-                                                       Image_Copy8bitRGBA(mtdata, basepixels, basepixels_width * basepixels_height, palette_nofullbrights);
-                                                       if (!glowpixels)
+                                                       fogpixels = Mem_Alloc(tempmempool, image_width * image_height * 4);
+                                                       for (j = 0;j < image_width * image_height * 4;j += 4)
                                                        {
-                                                               for (j = 0;j < (int)(tx->width*tx->height);j++)
-                                                                       if (((qbyte *)&palette_onlyfullbrights[mtdata[j]])[3] > 0) // fullbright
-                                                                               break;
-                                                               if (j < (int)(tx->width * tx->height))
-                                                               {
-                                                                       glowpixels_width = tx->width;
-                                                                       glowpixels_height = tx->height;
-                                                                       glowpixels = Mem_Alloc(loadmodel->mempool, glowpixels_width * glowpixels_height * 4);
-                                                                       Image_Copy8bitRGBA(mtdata, glowpixels, glowpixels_width * glowpixels_height, palette_onlyfullbrights);
-                                                               }
+                                                               fogpixels[j + 0] = 255;
+                                                               fogpixels[j + 1] = 255;
+                                                               fogpixels[j + 2] = 255;
+                                                               fogpixels[j + 3] = pixels[j + 3];
                                                        }
-                                               }
-                                               else
-                                               {
-                                                       basepixels_width = tx->width;
-                                                       basepixels_height = tx->height;
-                                                       basepixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
-                                                       Image_Copy8bitRGBA(mtdata, basepixels, tx->width * tx->height, palette_complete);
+                                                       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 (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 (basepixels)
-               {
-                       for (j = 3;j < basepixels_width * basepixels_height * 4;j += 4)
-                               if (basepixels[j] < 255)
-                                       break;
-                       if (j < basepixels_width * basepixels_height * 4)
-                       {
-                               maskpixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
-                               maskpixels_width = basepixels_width;
-                               maskpixels_height = basepixels_height;
-                               for (j = 0;j < basepixels_width * basepixels_height * 4;j += 4)
-                               {
-                                       maskpixels[j+0] = 255;
-                                       maskpixels[j+1] = 255;
-                                       maskpixels[j+2] = 255;
-                                       maskpixels[j+3] = basepixels[j+3];
-                               }
-                       }
-
-                       if (!bumppixels)
-                       {
-                               bumppixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
-                               bumppixels_width = basepixels_width;
-                               bumppixels_height = basepixels_height;
-                               memcpy(bumppixels, basepixels, bumppixels_width * bumppixels_height * 4);
-                       }
-
-                       if (!nmappixels && bumppixels)
-                       {
-                               nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
-                               nmappixels_width = bumppixels_width;
-                               nmappixels_height = bumppixels_height;
-                               Image_HeightmapToNormalmap(bumppixels, nmappixels, nmappixels_width, nmappixels_height, false, 1);
-                       }
-               }
-
-               if (!detailtexture)
-                       detailtexture = detailtextures[i % NUM_DETAILTEXTURES];
-
-               if (basepixels)
-               {
-                       tx->texture = R_LoadTexture2D (loadmodel->texturepool, tx->name, basepixels_width, basepixels_height, basepixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
-                       if (nmappixels)
-                               tx->nmaptexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_nmap", tx->name), basepixels_width, basepixels_height, nmappixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
-                       if (glosspixels)
-                               tx->glosstexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_gloss", tx->name), glosspixels_width, glosspixels_height, glosspixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
-                       if (glowpixels)
-                               tx->glowtexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_glow", tx->name), glowpixels_width, glowpixels_height, glowpixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
-                       if (maskpixels)
-                               tx->fogtexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_mask", tx->name), maskpixels_width, maskpixels_height, maskpixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
-                       tx->detailtexture = detailtexture;
-               }
-               else
+               if (tx->skin.base == NULL)
                {
                        // no texture found
                        tx->width = 16;
                        tx->height = 16;
-                       tx->texture = r_notexture;
-                       tx->nmaptexture = NULL;
-                       tx->glosstexture = NULL;
-                       tx->glowtexture = NULL;
-                       tx->fogtexture = NULL;
-                       tx->detailtexture = NULL;
-               }
-
-               if (basepixels)
-                       Mem_Free(basepixels);
-               if (bumppixels)
-                       Mem_Free(bumppixels);
-               if (nmappixels)
-                       Mem_Free(nmappixels);
-               if (glosspixels)
-                       Mem_Free(glosspixels);
-               if (glowpixels)
-                       Mem_Free(glowpixels);
-               if (maskpixels)
-                       Mem_Free(maskpixels);
+                       tx->skin.base = r_notexture;
+               }
 
                if (tx->name[0] == '*')
                {
+                       // 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)
@@ -505,7 +484,7 @@ static void Mod_LoadTextures (lump_t *l)
                else
                {
                        tx->flags |= SURF_LIGHTMAP;
-                       if (!tx->fogtexture)
+                       if (!tx->skin.fog)
                                tx->flags |= SURF_SHADOWCAST | SURF_SHADOWLIGHT;
                        tx->shader = &Cshader_wall_lightmap;
                }
@@ -524,13 +503,13 @@ static void Mod_LoadTextures (lump_t *l)
                        continue;       // already sequenced
 
                // find the number of frames in the animation
-               memset (anims, 0, sizeof(anims));
-               memset (altanims, 0, sizeof(altanims));
+               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))
+                       if (!tx2 || tx2->name[0] != '+' || strcmp(tx2->name+2, tx->name+2))
                                continue;
 
                        num = tx2->name[1];
@@ -539,7 +518,7 @@ static void Mod_LoadTextures (lump_t *l)
                        else if (num >= 'a' && num <= 'j')
                                altanims[num - 'a'] = tx2;
                        else
-                               Con_Printf ("Bad animating texture %s\n", tx->name);
+                               Con_Printf("Bad animating texture %s\n", tx->name);
                }
 
                max = altmax = 0;
@@ -557,7 +536,7 @@ static void Mod_LoadTextures (lump_t *l)
                {
                        if (!anims[j])
                        {
-                               Con_Printf ("Missing frame %i of %s\n", j, tx->name);
+                               Con_Printf("Missing frame %i of %s\n", j, tx->name);
                                incomplete = true;
                        }
                }
@@ -565,7 +544,7 @@ static void Mod_LoadTextures (lump_t *l)
                {
                        if (!altanims[j])
                        {
-                               Con_Printf ("Missing altframe %i of %s\n", j, tx->name);
+                               Con_Printf("Missing altframe %i of %s\n", j, tx->name);
                                incomplete = true;
                        }
                }
@@ -616,12 +595,7 @@ static void Mod_LoadTextures (lump_t *l)
        }
 }
 
-/*
-=================
-Mod_LoadLighting
-=================
-*/
-static void Mod_LoadLighting (lump_t *l)
+static void Mod_Q1BSP_LoadLighting(lump_t *l)
 {
        int i;
        qbyte *in, *out, *data, d;
@@ -630,25 +604,25 @@ static void Mod_LoadLighting (lump_t *l)
        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 = (qbyte*) 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;
                                }
@@ -660,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");
@@ -673,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++;
@@ -684,16 +658,16 @@ static void Mod_LoadLighting (lump_t *l)
        }
 }
 
-void Mod_LoadLightList(void)
+static void Mod_Q1BSP_LoadLightList(void)
 {
        int a, n, numlights;
        char lightsfilename[1024], *s, *t, *lightsstring;
        mlight_t *e;
 
        strcpy(lightsfilename, loadmodel->name);
-       COM_StripExtension(lightsfilename, lightsfilename);
+       FS_StripExtension(lightsfilename, lightsfilename);
        strcat(lightsfilename, ".lights");
-       s = lightsstring = (char *) COM_LoadFile (lightsfilename, false);
+       s = lightsstring = (char *) FS_LoadFile(lightsfilename, false);
        if (s)
        {
                numlights = 0;
@@ -746,7 +720,7 @@ void Mod_LoadLightList(void)
 
 /*
 static int castshadowcount = 0;
-void Mod_ProcessLightList(void)
+static void Mod_Q1BSP_ProcessLightList(void)
 {
        int j, k, l, *mark, lnum;
        mlight_t *e;
@@ -762,11 +736,11 @@ void Mod_ProcessLightList(void)
                if (e->cullradius2 > 4096.0f * 4096.0f)
                        e->cullradius2 = 4096.0f * 4096.0f;
                e->cullradius = e->lightradius = sqrt(e->cullradius2);
-               leaf = Mod_PointInLeaf(e->origin, loadmodel);
+               leaf = Mod_Q1BSP_PointInLeaf(e->origin, loadmodel);
                if (leaf->compressed_vis)
-                       pvs = Mod_DecompressVis (leaf->compressed_vis, loadmodel);
+                       pvs = Mod_Q1BSP_DecompressVis(leaf->compressed_vis, loadmodel);
                else
-                       pvs = mod_novis;
+                       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++)
@@ -840,7 +814,7 @@ void Mod_ProcessLightList(void)
                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)
+               // polygons(and sections of polygons)
                {
                        //vec3_t polymins, polymaxs;
                        int maxverts = 4;
@@ -1003,22 +977,17 @@ void Mod_ProcessLightList(void)
 */
 
 
-/*
-=================
-Mod_LoadVisibility
-=================
-*/
-static void Mod_LoadVisibility (lump_t *l)
+static void Mod_Q1BSP_LoadVisibility(lump_t *l)
 {
        loadmodel->visdata = NULL;
        if (!l->filelen)
                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(const char *data)
+static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data)
 {
        char key[128], value[4096];
        char wadname[128];
@@ -1065,7 +1034,7 @@ void Mod_ParseWadsFromEntityLump(const 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;
@@ -1077,29 +1046,19 @@ void Mod_ParseWadsFromEntityLump(const 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)
                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;
@@ -1107,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));
 
@@ -1116,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;
@@ -1135,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));
 
@@ -1147,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;
@@ -1172,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));
 
@@ -1186,12 +1135,7 @@ 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;
@@ -1199,7 +1143,7 @@ static void Mod_LoadTexinfo (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_LoadTexinfo: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
        out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
@@ -1210,16 +1154,16 @@ 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);
 
                out->texture = NULL;
                if (loadmodel->textures)
                {
                        if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures)
-                               Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
+                               Con_Printf("error in model \"%s\": invalid miptex index %i(of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
                        else
                                out->texture = loadmodel->textures + miptex;
                }
@@ -1239,59 +1183,7 @@ static void Mod_LoadTexinfo (lump_t *l)
        }
 }
 
-/*
-================
-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;
-               }
-       }
-
-       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;
@@ -1313,7 +1205,7 @@ 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];
@@ -1333,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)
@@ -1362,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]);
@@ -1384,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;
        }
 
@@ -1408,16 +1300,10 @@ 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;
@@ -1425,9 +1311,9 @@ void Mod_GenerateWarpMesh (msurface_t *surf)
 
        subdivpolytriangles = 0;
        subdivpolyverts = 0;
-       SubdividePolygon (surf->poly_numverts, surf->poly_verts);
+       SubdividePolygon(surf->poly_numverts, surf->poly_verts);
        if (subdivpolytriangles < 1)
-               Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
+               Host_Error("Mod_Q1BSP_GenerateWarpMesh: no triangles?\n");
 
        surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
        mesh->numverts = subdivpolyverts;
@@ -1443,167 +1329,52 @@ void Mod_GenerateWarpMesh (msurface_t *surf)
        for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
        {
                VectorCopy(subdivpolyvert[i], v->v);
-               v->st[0] = DotProduct (v->v, surf->texinfo->vecs[0]);
-               v->st[1] = DotProduct (v->v, surf->texinfo->vecs[1]);
+               v->st[0] = DotProduct(v->v, surf->texinfo->vecs[0]);
+               v->st[1] = DotProduct(v->v, surf->texinfo->vecs[1]);
        }
 }
 #endif
 
-surfmesh_t *Mod_AllocSurfMesh(int numverts, int numtriangles)
+static surfmesh_t *Mod_Q1BSP_AllocSurfMesh(int numverts, int numtriangles)
 {
        surfmesh_t *mesh;
-       mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + numtriangles * sizeof(int[6]) + numverts * (4 + 4 + 4 + 4 + 4 + 4 + 4 + 1) * sizeof(float));
+       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->verts = (float *)(mesh + 1);
-       mesh->str = mesh->verts + mesh->numverts * 4;
-       mesh->uvw = mesh->str + mesh->numverts * 4;
-       mesh->abc = mesh->uvw + mesh->numverts * 4;
-       mesh->svectors = (float *)(mesh->abc + mesh->numverts * 4);
-       mesh->tvectors = mesh->svectors + mesh->numverts * 4;
-       mesh->normals = mesh->tvectors + mesh->numverts * 4;
-       mesh->lightmapoffsets = (int *)(mesh->normals + mesh->numverts * 4);
-       mesh->index = mesh->lightmapoffsets + mesh->numverts;
-       mesh->triangleneighbors = mesh->index + mesh->numtriangles * 3;
+       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_GenerateWallMesh (msurface_t *surf, int vertexonly)
-{
-       int i, iu, iv, *index, smax, tmax;
-       float *in, s, t, u, v, ubase, vbase, uscale, vscale, normal[3];
-       surfmesh_t *mesh;
-
-       smax = surf->extents[0] >> 4;
-       tmax = surf->extents[1] >> 4;
-
-       if (vertexonly)
-       {
-               surf->lightmaptexturestride = 0;
-               surf->lightmaptexture = NULL;
-               uscale = 0;
-               vscale = 0;
-               ubase = 0;
-               vbase = 0;
-       }
-       else
-       {
-               surf->flags |= SURF_LIGHTMAP;
-               if (r_miplightmaps.integer)
-               {
-                       surf->lightmaptexturestride = (surf->extents[0]>>4)+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_PRECACHE, NULL);
-               }
-               else
-               {
-                       surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+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_PRECACHE, NULL);
-               }
-               R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
-               uscale = (uscale - ubase) * 16.0 / ((surf->extents[0] & ~15) + 16);
-               vscale = (vscale - vbase) * 16.0 / ((surf->extents[1] & ~15) + 16);
-       }
-
-       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
-
-       index = mesh->index;
-       for (i = 0;i < mesh->numtriangles;i++)
-       {
-               *index++ = 0;
-               *index++ = i + 1;
-               *index++ = i + 2;
-       }
-       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
-
-       VectorCopy(surf->plane->normal, normal);
-       if (surf->flags & SURF_PLANEBACK)
-               VectorNegate(normal, normal);
-       for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
-       {
-               s = DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
-               t = DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
-               u = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-               v = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-               // LordHavoc: calc lightmap data offset for vertex lighting to use
-               iu = (int) u;
-               iv = (int) v;
-               iu = bound(0, iu, smax);
-               iv = bound(0, iv, tmax);
-               u = u * uscale + ubase;
-               v = v * vscale + vbase;
-
-               mesh->verts[i * 4 + 0] = in[0];
-               mesh->verts[i * 4 + 1] = in[1];
-               mesh->verts[i * 4 + 2] = in[2];
-               mesh->str[i * 4 + 0] = s / surf->texinfo->texture->width;
-               mesh->str[i * 4 + 1] = t / surf->texinfo->texture->height;
-               mesh->uvw[i * 4 + 0] = u;
-               mesh->uvw[i * 4 + 1] = v;
-               mesh->abc[i * 4 + 0] = s * (1.0f / 16.0f);
-               mesh->abc[i * 4 + 1] = t * (1.0f / 16.0f);
-               mesh->lightmapoffsets[i] = ((iv * (smax+1) + iu) * 3);
-       }
-       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
-}
-
-void Mod_GenerateVertexMesh (msurface_t *surf)
-{
-       int i, *index;
-       float *in, s, t, normal[3];
-       surfmesh_t *mesh;
-
-       surf->lightmaptexturestride = 0;
-       surf->lightmaptexture = NULL;
-
-       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
-
-       index = mesh->index;
-       for (i = 0;i < mesh->numtriangles;i++)
-       {
-               *index++ = 0;
-               *index++ = i + 1;
-               *index++ = i + 2;
-       }
-       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
-
-       VectorCopy(surf->plane->normal, normal);
-       if (surf->flags & SURF_PLANEBACK)
-               VectorNegate(normal, normal);
-       for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
-       {
-               s = (DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);
-               t = (DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);
-               mesh->verts[i * 4 + 0] = in[0];
-               mesh->verts[i * 4 + 1] = in[1];
-               mesh->verts[i * 4 + 2] = in[2];
-               mesh->str[i * 4 + 0] = s / surf->texinfo->texture->width;
-               mesh->str[i * 4 + 1] = t / surf->texinfo->texture->height;
-               mesh->uvw[i * 4 + 0] = 0;
-               mesh->uvw[i * 4 + 1] = 0;
-               mesh->abc[i * 4 + 0] = s * (1.0f / 16.0f);
-               mesh->abc[i * 4 + 1] = t * (1.0f / 16.0f);
-       }
-       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
-}
-
-void Mod_GenerateSurfacePolygon (msurface_t *surf)
+static void Mod_Q1BSP_GenerateSurfacePolygon(msurface_t *surf, int firstedge, int numedges)
 {
-       int i, lindex;
-       float *vec, *vert, mins[3], maxs[3];
+       int i, lindex, j;
+       float *vec, *vert, mins[3], maxs[3], val, *v;
+       mtexinfo_t *tex;
 
        // convert edges back to a normal polygon
-       surf->poly_numverts = surf->numedges;
-       vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * surf->numedges);
-       for (i = 0;i < surf->numedges;i++)
+       surf->poly_numverts = numedges;
+       vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * numedges);
+       for (i = 0;i < numedges;i++)
        {
-               lindex = loadmodel->surfedges[surf->firstedge + i];
+               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);
+               VectorCopy(vec, vert);
                vert += 3;
        }
+
+       // calculate polygon bounding box and center
        vert = surf->poly_verts;
        VectorCopy(vert, mins);
        VectorCopy(vert, maxs);
@@ -1619,144 +1390,231 @@ void Mod_GenerateSurfacePolygon (msurface_t *surf)
        surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
        surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
        surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
+
+       // generate surface extents information
+       tex = surf->texinfo;
+       mins[0] = maxs[0] = DotProduct(surf->poly_verts, tex->vecs[0]) + tex->vecs[0][3];
+       mins[1] = maxs[1] = DotProduct(surf->poly_verts, tex->vecs[1]) + tex->vecs[1][3];
+       for (i = 1, v = surf->poly_verts + 3;i < surf->poly_numverts;i++, v += 3)
+       {
+               for (j = 0;j < 2;j++)
+               {
+                       val = DotProduct(v, tex->vecs[j]) + tex->vecs[j][3];
+                       if (mins[j] > val)
+                               mins[j] = val;
+                       if (maxs[j] < val)
+                               maxs[j] = val;
+               }
+       }
+       for (i = 0;i < 2;i++)
+       {
+               surf->texturemins[i] = (int) floor(mins[i] / 16) * 16;
+               surf->extents[i] = (int) ceil(maxs[i] / 16) * 16 - surf->texturemins[i];
+       }
 }
 
-/*
-=================
-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, planenum, ssize, tsize;
+       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++)
        {
-               out->number = surfnum;
+               surf->number = surfnum;
                // FIXME: validate edges, texinfo, etc?
-               out->firstedge = LittleLong(in->firstedge);
-               out->numedges = LittleShort(in->numedges);
-               if ((unsigned int) out->firstedge + (unsigned int) out->numedges > (unsigned int) loadmodel->numsurfedges)
-                       Host_Error("Mod_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", out->firstedge, out->numedges, loadmodel->numsurfedges);
-
-               i = LittleShort (in->texinfo);
+               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_LoadFaces: invalid texinfo index %i (model has %i texinfos)\n", i, loadmodel->numtexinfo);
-               out->texinfo = loadmodel->texinfo + i;
-               out->flags = out->texinfo->texture->flags;
+                       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);
                if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes)
-                       Host_Error("Mod_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
+                       Host_Error("Mod_Q1BSP_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
 
                if (LittleShort(in->side))
-                       out->flags |= SURF_PLANEBACK;
+                       surf->flags |= SURF_PLANEBACK;
 
-               out->plane = loadmodel->planes + planenum;
+               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;
+               surf->cached_dlight = true;
 
-               CalcSurfaceExtents (out);
+               Mod_Q1BSP_GenerateSurfacePolygon(surf, firstedge, numedges);
 
-               ssize = (out->extents[0] >> 4) + 1;
-               tsize = (out->extents[1] >> 4) + 1;
+               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->shader == &Cshader_wall_lightmap)
+               if (surf->texinfo->texture->shader == &Cshader_wall_lightmap)
                {
-                       if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256))
-                               Host_Error ("Bad surface extents");
-                       Mod_GenerateWallMesh (out, false);
+                       if ((surf->extents[0] >> 4) + 1 > (256) || (surf->extents[1] >> 4) + 1 > (256))
+                               Host_Error("Bad surface extents");
                        // stainmap for permanent marks on walls
-                       out->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
+                       surf->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
                        // clear to white
-                       memset(out->stainsamples, 255, ssize * tsize * 3);
+                       memset(surf->stainsamples, 255, ssize * tsize * 3);
                }
-               else
-                       Mod_GenerateVertexMesh (out);
        }
-}
 
-/*
-=================
-Mod_SetParent
-=================
-*/
-static void Mod_SetParent (mnode_t *node, mnode_t *parent)
-{
-       node->parent = parent;
-       if (node->contents < 0)
-               return;
-       Mod_SetParent (node->children[0], node);
-       Mod_SetParent (node->children[1], node);
-}
+       loadmodel->entiremesh = Mod_Q1BSP_AllocSurfMesh(totalverts, totaltris);
+       loadmodel->surfmeshes = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) * totalmeshes);
 
-/*
-=================
-Mod_LoadNodes
-=================
-*/
-static void Mod_LoadNodes (lump_t *l)
-{
-       int                     i, j, count, p;
-       dnode_t         *in;
-       mnode_t         *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++, 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;
 
-       in = (void *)(mod_base + l->fileofs);
-       if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       count = l->filelen / sizeof(*in);
-       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+               surf->lightmaptexturestride = 0;
+               surf->lightmaptexture = NULL;
 
-       loadmodel->nodes = out;
-       loadmodel->numnodes = count;
+               for (i = 0;i < mesh->numverts;i++)
+               {
+                       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;
+               }
+
+               for (i = 0;i < mesh->numtriangles;i++)
+               {
+                       mesh->element3i[i * 3 + 0] = 0;
+                       mesh->element3i[i * 3 + 1] = i + 1;
+                       mesh->element3i[i * 3 + 2] = i + 2;
+               }
+
+               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);
+
+               if (surf->texinfo->texture->shader == &Cshader_wall_lightmap)
+               {
+                       int i, iu, iv, smax, tmax;
+                       float u, v, ubase, vbase, uscale, vscale;
+
+                       smax = surf->extents[0] >> 4;
+                       tmax = surf->extents[1] >> 4;
+
+                       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;
+                       }
+               }
+       }
+}
+
+static void Mod_Q1BSP_SetParent(mnode_t *node, mnode_t *parent)
+{
+       node->parent = parent;
+       if (node->contents < 0)
+               return;
+       Mod_Q1BSP_SetParent(node->children[0], node);
+       Mod_Q1BSP_SetParent(node->children[1], node);
+}
+
+static void Mod_Q1BSP_LoadNodes(lump_t *l)
+{
+       int                     i, j, count, p;
+       dnode_t         *in;
+       mnode_t         *out;
+
+       in = (void *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadNodes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+
+       loadmodel->nodes = out;
+       loadmodel->numnodes = count;
 
        for ( i=0 ; i<count ; i++, in++, out++)
        {
                for (j=0 ; j<3 ; j++)
                {
-                       out->mins[j] = LittleShort (in->mins[j]);
-                       out->maxs[j] = LittleShort (in->maxs[j]);
+                       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
@@ -1764,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;
@@ -1780,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));
 
@@ -1791,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);
@@ -1815,12 +1668,7 @@ static void Mod_LoadLeafs (lump_t *l)
        }
 }
 
-/*
-=================
-Mod_LoadClipnodes
-=================
-*/
-static void Mod_LoadClipnodes (lump_t *l)
+static void Mod_Q1BSP_LoadClipnodes(lump_t *l)
 {
        dclipnode_t *in, *out;
        int                     i, count;
@@ -1828,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));
 
@@ -1911,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;
@@ -1947,19 +1789,14 @@ 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;
 
        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(int));
 
@@ -1967,38 +1804,28 @@ static void Mod_LoadMarksurfaces (lump_t *l)
        {
                j = (unsigned) LittleShort(in[i]);
                if (j >= loadmodel->numsurfaces)
-                       Host_Error ("Mod_ParseMarksurfaces: bad surface number");
+                       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;
@@ -2006,17 +1833,17 @@ 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);
 
                PlaneClassify(out);
        }
@@ -2037,7 +1864,7 @@ winding_t;
 NewWinding
 ==================
 */
-static winding_t *NewWinding (int points)
+static winding_t *NewWinding(int points)
 {
        winding_t *w;
        int size;
@@ -2047,12 +1874,12 @@ static winding_t *NewWinding (int 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);
 }
@@ -2062,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;
@@ -2070,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;
 
@@ -2105,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];
@@ -2122,7 +1949,7 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
        // 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)
@@ -2139,7 +1966,7 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
 
        if (!counts[0])
        {
-               FreeWinding (in);
+               FreeWinding(in);
                return NULL;
        }
        if (!counts[1])
@@ -2147,27 +1974,27 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
 
        maxpts = in->numpoints+4;       // can't use counts[0]+2 because of fp grouping errors
        if (maxpts > MAX_POINTS_ON_WINDING)
-               Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+               Sys_Error("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
 
-       neww = NewWinding (maxpts);
+       neww = NewWinding(maxpts);
 
        for (i = 0;i < in->numpoints;i++)
        {
                if (neww->numpoints >= maxpts)
-                       Sys_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++;
                }
 
@@ -2185,15 +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);
+       FreeWinding(in);
 
        return neww;
 }
@@ -2209,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];
@@ -2226,7 +2053,7 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
        // 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;
@@ -2253,35 +2080,35 @@ 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
 
        if (maxpts > MAX_POINTS_ON_WINDING)
-               Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+               Sys_Error("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
 
-       *front = f = NewWinding (maxpts);
-       *back = b = NewWinding (maxpts);
+       *front = f = NewWinding(maxpts);
+       *back = b = NewWinding(maxpts);
 
        for (i = 0;i < in->numpoints;i++)
        {
                if (f->numpoints >= maxpts || b->numpoints >= maxpts)
-                       Sys_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++;
                }
 
@@ -2299,12 +2126,12 @@ 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++;
        }
 }
@@ -2326,7 +2153,7 @@ 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));
@@ -2340,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]);
@@ -2357,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;
@@ -2366,7 +2193,7 @@ 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++)
@@ -2375,7 +2202,7 @@ static void Mod_FinalizePortals(void)
                VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
        }
        p = portalchain;
-       while(p)
+       while (p)
        {
                if (p->winding)
                {
@@ -2397,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
@@ -2418,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 *) ((qbyte *) 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++)
@@ -2440,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;
@@ -2462,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;
@@ -2496,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;
@@ -2535,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)
                        {
@@ -2550,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;
                        }
 
@@ -2559,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;
@@ -2581,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;
                }
        }
@@ -2618,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
@@ -2626,72 +2453,72 @@ 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);
 }
 
 
-static void Mod_MakePortals(void)
+static void Mod_Q1BSP_MakePortals(void)
 {
        portalchain = NULL;
-       Mod_RecursiveNodePortals (loadmodel->nodes);
-       Mod_FinalizePortals();
+       Mod_Q1BSP_RecursiveNodePortals(loadmodel->nodes);
+       Mod_Q1BSP_FinalizePortals();
 }
 
-static void Mod_BuildSurfaceNeighbors (msurface_t *surfaces, int numsurfaces, mempool_t *mempool)
+static void Mod_Q1BSP_BuildSurfaceNeighbors(msurface_t *surfaces, int numsurfaces, mempool_t *mempool)
 {
 #if 0
        int surfnum, vertnum, vertnum2, snum, vnum, vnum2;
@@ -2737,32 +2564,126 @@ static void Mod_BuildSurfaceNeighbors (msurface_t *surfaces, int numsurfaces, me
 #endif
 }
 
-/*
-=================
-Mod_LoadBrushModel
-=================
-*/
+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++)
+       {
+               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])
+               {
+                       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_Q1BSP_BuildPVSTextureChains(model_t *model)
+{
+       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];
+               }
+       }
+}
+
 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);
-void Mod_LoadBrushModel (model_t *mod, void *buffer)
+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;
-       char            *loadname;
-       model_t         *originalloadmodel;
+       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 (Quake) 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);
@@ -2774,54 +2695,45 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
        mod_base = (qbyte *)header;
 
        for (i = 0;i < (int) sizeof(dheader_t) / 4;i++)
-               ((int *)header)[i] = LittleLong ( ((int *)header)[i]);
+               ((int *)header)[i] = LittleLong(((int *)header)[i]);
 
 // load into heap
 
        // store which lightmap format to use
        mod->lightmaprgba = r_lightmaprgba.integer;
 
-       Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-       Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-       Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-       Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-       Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-       Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-       Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-       Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-       Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-       Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-       Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-       Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-       Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-       Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-       Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-
-       Mod_MakeHull0 ();
-       Mod_MakePortals();
+       Mod_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_LoadLightList ();
+       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];
@@ -2840,73 +2752,62 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                mod->DrawFakeShadow = NULL;
                mod->DrawShadowVolume = R_Model_Brush_DrawShadowVolume;
                mod->DrawLight = R_Model_Brush_DrawLight;
-               mod->texturesurfacechains = Mem_Alloc(originalloadmodel->mempool, mod->numtextures * sizeof(msurface_t *));
+               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)
                {
                        // 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++)
                        {
-                               // we only need to have a drawsky function if it is used (usually only on world model)
+                               // 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;
-                               // link into texture chain
-                               surf->texturechain = mod->texturesurfacechains[surf->texinfo->texture - mod->textures];
-                               mod->texturesurfacechains[surf->texinfo->texture - mod->textures] = surf;
+                               // LordHavoc: submodels always clip, even if water
+                               if (mod->numsubmodels - 1)
+                                       surf->flags |= SURF_SOLIDCLIP;
                                // calculate bounding shapes
-                               for (k = 0;k < surf->numedges;k++)
+                               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                                {
-                                       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;
+                                       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[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;
-                       // LordHavoc: build triangle meshs for entire model's geometry
-                       // (only used for shadow volumes)
-                       mod->shadowmesh = Mod_ShadowMesh_Begin(originalloadmodel->mempool, 1024);
-                       for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
-                               if (surf->flags & SURF_SHADOWCAST)
-                                       Mod_ShadowMesh_AddPolygon(originalloadmodel->mempool, mod->shadowmesh, surf->poly_numverts, surf->poly_verts);
-                       mod->shadowmesh = Mod_ShadowMesh_Finish(originalloadmodel->mempool, mod->shadowmesh);
-                       Mod_ShadowMesh_CalcBBox(mod->shadowmesh, mod->shadowmesh_mins, mod->shadowmesh_maxs, mod->shadowmesh_center, &mod->shadowmesh_radius);
                }
                else
                {
-                       // LordHavoc: empty submodel (lacrima.bsp has such a glitch)
+                       // LordHavoc: empty submodel(lacrima.bsp has such a glitch)
                        Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname);
-                       VectorClear(mod->normalmins);
-                       VectorClear(mod->normalmaxs);
-                       VectorClear(mod->yawmins);
-                       VectorClear(mod->yawmaxs);
-                       VectorClear(mod->rotatedmins);
-                       VectorClear(mod->rotatedmaxs);
-                       mod->radius = 0;
-                       mod->radius2 = 0;
-                       mod->shadowmesh = NULL;
-               }
-               Mod_BuildSurfaceNeighbors(mod->surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, originalloadmodel->mempool);
+               }
+               Mod_Q1BSP_BuildSurfaceNeighbors(mod->surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, originalloadmodel->mempool);
 
                mod->numleafs = bm->visleafs;
 
@@ -2916,10 +2817,10 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                {
                        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;
@@ -2928,6 +2829,455 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
        }
 
        loadmodel = originalloadmodel;
-       //Mod_ProcessLightList ();
+       //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");
 }