]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_brush.c
re-enable saturation on sidebyside and stereobuffer (it's harmless there), only keep...
[xonotic/darkplaces.git] / model_brush.c
index d7825c7a0c9ac7b7bdf9a7cb6ed7b03d877a0e51..f9def07322ba87fb5527bc9a49274adfdc89d415 100644 (file)
@@ -21,2776 +21,6164 @@ 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];
-
-//cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
-cvar_t halflifebsp = {0, "halflifebsp", "0"};
-cvar_t r_novis = {0, "r_novis", "0"};
-cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"};
-cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
-cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
-cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
-
-/*
-===============
-Mod_BrushInit
-===============
-*/
-void Mod_BrushInit (void)
+#include "polygon.h"
+#include "curves.h"
+#include "wad.h"
+
+
+//cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128", "how large water polygons should be (smaller values produce more polygons which give better warping effects)"};
+cvar_t r_novis = {0, "r_novis", "0", "draws whole level, see also sv_cullentities_pvs 0"};
+cvar_t r_picmipworld = {CVAR_SAVE, "r_picmipworld", "1", "whether gl_picmip shall apply to world textures too"};
+cvar_t r_nosurftextures = {0, "r_nosurftextures", "0", "pretends there was no texture lump found in the q1bsp/hlbsp loading (useful for debugging this rare case)"};
+cvar_t r_subdivisions_tolerance = {0, "r_subdivisions_tolerance", "4", "maximum error tolerance on curve subdivision for rendering purposes (in other words, the curves will be given as many polygons as necessary to represent curves at this quality)"};
+cvar_t r_subdivisions_mintess = {0, "r_subdivisions_mintess", "0", "minimum number of subdivisions (values above 0 will smooth curves that don't need it)"};
+cvar_t r_subdivisions_maxtess = {0, "r_subdivisions_maxtess", "1024", "maximum number of subdivisions (prevents curves beyond a certain detail level, limits smoothing)"};
+cvar_t r_subdivisions_maxvertices = {0, "r_subdivisions_maxvertices", "65536", "maximum vertices allowed per subdivided curve"};
+cvar_t r_subdivisions_collision_tolerance = {0, "r_subdivisions_collision_tolerance", "15", "maximum error tolerance on curve subdivision for collision purposes (usually a larger error tolerance than for rendering)"};
+cvar_t r_subdivisions_collision_mintess = {0, "r_subdivisions_collision_mintess", "0", "minimum number of subdivisions (values above 0 will smooth curves that don't need it)"};
+cvar_t r_subdivisions_collision_maxtess = {0, "r_subdivisions_collision_maxtess", "1024", "maximum number of subdivisions (prevents curves beyond a certain detail level, limits smoothing)"};
+cvar_t r_subdivisions_collision_maxvertices = {0, "r_subdivisions_collision_maxvertices", "4225", "maximum vertices allowed per subdivided curve"};
+cvar_t mod_q3bsp_curves_collisions = {0, "mod_q3bsp_curves_collisions", "1", "enables collisions with curves (SLOW)"};
+cvar_t mod_q3bsp_curves_collisions_stride = {0, "mod_q3bsp_curves_collisions_stride", "16", "collisions against curves: optimize performance by doing a combined collision check for this triangle amount first"};
+cvar_t mod_q3bsp_curves_stride = {0, "mod_q3bsp_curves_stride", "16", "particle effect collisions against curves: optimize performance by doing a combined collision check for this triangle amount first"};
+cvar_t mod_q3bsp_optimizedtraceline = {0, "mod_q3bsp_optimizedtraceline", "1", "whether to use optimized traceline code for line traces (as opposed to tracebox code)"};
+cvar_t mod_q3bsp_debugtracebrush = {0, "mod_q3bsp_debugtracebrush", "0", "selects different tracebrush bsp recursion algorithms (for debugging purposes only)"};
+cvar_t mod_q3bsp_lightmapmergepower = {CVAR_SAVE, "mod_q3bsp_lightmapmergepower", "4", "merges the quake3 128x128 lightmap textures into larger lightmap group textures to speed up rendering, 1 = 256x256, 2 = 512x512, 3 = 1024x1024, 4 = 2048x2048, 5 = 4096x4096, ..."};
+cvar_t mod_q3bsp_nolightmaps = {CVAR_SAVE, "mod_q3bsp_nolightmaps", "0", "do not load lightmaps in Q3BSP maps (to save video RAM, but be warned: it looks ugly)"};
+
+static texture_t mod_q1bsp_texture_solid;
+static texture_t mod_q1bsp_texture_sky;
+static texture_t mod_q1bsp_texture_lava;
+static texture_t mod_q1bsp_texture_slime;
+static texture_t mod_q1bsp_texture_water;
+
+void Mod_BrushInit(void)
 {
 //     Cvar_RegisterVariable(&r_subdivide_size);
-       Cvar_RegisterVariable(&halflifebsp);
        Cvar_RegisterVariable(&r_novis);
-       Cvar_RegisterVariable(&r_miplightmaps);
-       Cvar_RegisterVariable(&r_lightmaprgba);
+       Cvar_RegisterVariable(&r_picmipworld);
        Cvar_RegisterVariable(&r_nosurftextures);
-       Cvar_RegisterVariable(&r_sortsurfaces);
-       memset(mod_novis, 0xff, sizeof(mod_novis));
+       Cvar_RegisterVariable(&r_subdivisions_tolerance);
+       Cvar_RegisterVariable(&r_subdivisions_mintess);
+       Cvar_RegisterVariable(&r_subdivisions_maxtess);
+       Cvar_RegisterVariable(&r_subdivisions_maxvertices);
+       Cvar_RegisterVariable(&r_subdivisions_collision_tolerance);
+       Cvar_RegisterVariable(&r_subdivisions_collision_mintess);
+       Cvar_RegisterVariable(&r_subdivisions_collision_maxtess);
+       Cvar_RegisterVariable(&r_subdivisions_collision_maxvertices);
+       Cvar_RegisterVariable(&mod_q3bsp_curves_collisions);
+       Cvar_RegisterVariable(&mod_q3bsp_curves_collisions_stride);
+       Cvar_RegisterVariable(&mod_q3bsp_curves_stride);
+       Cvar_RegisterVariable(&mod_q3bsp_optimizedtraceline);
+       Cvar_RegisterVariable(&mod_q3bsp_debugtracebrush);
+       Cvar_RegisterVariable(&mod_q3bsp_lightmapmergepower);
+       Cvar_RegisterVariable(&mod_q3bsp_nolightmaps);
+
+       memset(&mod_q1bsp_texture_solid, 0, sizeof(mod_q1bsp_texture_solid));
+       strlcpy(mod_q1bsp_texture_solid.name, "solid" , sizeof(mod_q1bsp_texture_solid.name));
+       mod_q1bsp_texture_solid.surfaceflags = 0;
+       mod_q1bsp_texture_solid.supercontents = SUPERCONTENTS_SOLID;
+
+       mod_q1bsp_texture_sky = mod_q1bsp_texture_solid;
+       strlcpy(mod_q1bsp_texture_sky.name, "sky", sizeof(mod_q1bsp_texture_sky.name));
+       mod_q1bsp_texture_sky.surfaceflags = Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT | Q3SURFACEFLAG_NOMARKS | Q3SURFACEFLAG_NODLIGHT | Q3SURFACEFLAG_NOLIGHTMAP;
+       mod_q1bsp_texture_sky.supercontents = SUPERCONTENTS_SKY | SUPERCONTENTS_NODROP;
+
+       mod_q1bsp_texture_lava = mod_q1bsp_texture_solid;
+       strlcpy(mod_q1bsp_texture_lava.name, "*lava", sizeof(mod_q1bsp_texture_lava.name));
+       mod_q1bsp_texture_lava.surfaceflags = Q3SURFACEFLAG_NOMARKS;
+       mod_q1bsp_texture_lava.supercontents = SUPERCONTENTS_LAVA | SUPERCONTENTS_NODROP;
+
+       mod_q1bsp_texture_slime = mod_q1bsp_texture_solid;
+       strlcpy(mod_q1bsp_texture_slime.name, "*slime", sizeof(mod_q1bsp_texture_slime.name));
+       mod_q1bsp_texture_slime.surfaceflags = Q3SURFACEFLAG_NOMARKS;
+       mod_q1bsp_texture_slime.supercontents = SUPERCONTENTS_SLIME;
+
+       mod_q1bsp_texture_water = mod_q1bsp_texture_solid;
+       strlcpy(mod_q1bsp_texture_water.name, "*water", sizeof(mod_q1bsp_texture_water.name));
+       mod_q1bsp_texture_water.surfaceflags = Q3SURFACEFLAG_NOMARKS;
+       mod_q1bsp_texture_water.supercontents = SUPERCONTENTS_WATER;
 }
 
-/*
-===============
-Mod_PointInLeaf
-===============
-*/
-mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
+static mleaf_t *Mod_Q1BSP_PointInLeaf(dp_model_t *model, const vec3_t p)
 {
        mnode_t *node;
 
        if (model == NULL)
                return NULL;
 
-       Mod_CheckLoaded(model);
-
        // LordHavoc: modified to start at first clip node,
        // in other words: first node of the (sub)model
-       node = model->nodes + model->hulls[0].firstclipnode;
-       while (node->contents == 0)
-               node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct (p,node->plane->normal)) < node->plane->dist];
+       node = model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode;
+       while (node->plane)
+               node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct(p,node->plane->normal)) < node->plane->dist];
 
        return (mleaf_t *)node;
 }
 
-int Mod_PointContents (const vec3_t p, model_t *model)
-{
-       mnode_t *node;
-
-       if (model == NULL)
-               return CONTENTS_EMPTY;
-
-       Mod_CheckLoaded(model);
-
-       // LordHavoc: modified to start at first clip node,
-       // in other words: first node of the (sub)model
-       node = model->nodes + model->hulls[0].firstclipnode;
-       while (node->contents == 0)
-               node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct (p,node->plane->normal)) < node->plane->dist];
-
-       return ((mleaf_t *)node)->contents;
-}
-
-void Mod_FindNonSolidLocation(vec3_t pos, model_t *mod)
+static void Mod_Q1BSP_AmbientSoundLevelsForPoint(dp_model_t *model, const vec3_t p, unsigned char *out, int outsize)
 {
-       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;
+       int i;
+       mleaf_t *leaf;
+       leaf = Mod_Q1BSP_PointInLeaf(model, p);
+       if (leaf)
+       {
+               i = min(outsize, (int)sizeof(leaf->ambient_sound_level));
+               if (i)
+               {
+                       memcpy(out, leaf->ambient_sound_level, i);
+                       out += i;
+                       outsize -= i;
+               }
+       }
+       if (outsize)
+               memset(out, 0, outsize);
 }
 
-
-/*
-===================
-Mod_DecompressVis
-===================
-*/
-static qbyte *Mod_DecompressVis (qbyte *in, model_t *model)
+static int Mod_Q1BSP_FindBoxClusters(dp_model_t *model, const vec3_t mins, const vec3_t maxs, int maxclusters, int *clusterlist)
 {
-       static qbyte decompressed[MAX_MAP_LEAFS/8];
-       int c;
-       qbyte *out;
-       int row;
-
-       row = (model->numleafs+7)>>3;
-       out = decompressed;
-
-       do
+       int numclusters = 0;
+       int nodestackindex = 0;
+       mnode_t *node, *nodestack[1024];
+       if (!model->brush.num_pvsclusters)
+               return -1;
+       node = model->brush.data_nodes;
+       for (;;)
        {
-               if (*in)
+#if 1
+               if (node->plane)
                {
-                       *out++ = *in++;
+                       // node - recurse down the BSP tree
+                       int sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides < 3)
+                       {
+                               if (sides == 0)
+                                       return -1; // ERROR: NAN bounding box!
+                               // box is on one side of plane, take that path
+                               node = node->children[sides-1];
+                       }
+                       else
+                       {
+                               // box crosses plane, take one path and remember the other
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
+                       }
                        continue;
                }
-
-               c = in[1];
-               in += 2;
-               while (c)
+               else
                {
-                       *out++ = 0;
-                       c--;
+                       // leaf - add clusterindex to list
+                       if (numclusters < maxclusters)
+                               clusterlist[numclusters] = ((mleaf_t *)node)->clusterindex;
+                       numclusters++;
                }
-       } while (out - decompressed < row);
-
-       return decompressed;
-}
-
-qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
-{
-       if (r_novis.integer || leaf == model->leafs || leaf->compressed_vis == NULL)
-               return mod_novis;
-       return Mod_DecompressVis (leaf->compressed_vis, model);
-}
-
-/*
-=================
-Mod_LoadTextures
-=================
-*/
-static void Mod_LoadTextures (lump_t *l)
-{
-       int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
-       miptex_t *dmiptex;
-       texture_t *tx, *tx2, *anims[10], *altanims[10];
-       dmiptexlump_t *m;
-       qbyte *data, *mtdata;
-       char name[256];
-
-       loadmodel->textures = NULL;
-
-       if (!l->filelen)
-               return;
-
-       m = (dmiptexlump_t *)(mod_base + l->fileofs);
-
-       m->nummiptex = LittleLong (m->nummiptex);
-
-       // add two slots for notexture walls and notexture liquids
-       loadmodel->numtextures = m->nummiptex + 2;
-       loadmodel->textures = Mem_Alloc(loadmodel->mempool, loadmodel->numtextures * sizeof(texture_t));
-
-       // fill out all slots with notexture
-       for (i = 0, tx = loadmodel->textures;i < loadmodel->numtextures;i++, tx++)
-       {
-               tx->number = i;
-               strcpy(tx->name, "NO TEXTURE FOUND");
-               tx->width = 16;
-               tx->height = 16;
-               tx->skin.base = r_notexture;
-               tx->shader = &Cshader_wall_lightmap;
-               tx->flags = SURF_SOLIDCLIP;
-               if (i == loadmodel->numtextures - 1)
+#else
+               if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
                {
-                       tx->flags |= SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
-                       tx->shader = &Cshader_water;
+                       if (node->plane)
+                       {
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
+                               continue;
+                       }
+                       else
+                       {
+                               // leaf - add clusterindex to list
+                               if (numclusters < maxclusters)
+                                       clusterlist[numclusters] = ((mleaf_t *)node)->clusterindex;
+                               numclusters++;
+                       }
                }
-               tx->currentframe = tx;
+#endif
+               // try another path we didn't take earlier
+               if (nodestackindex == 0)
+                       break;
+               node = nodestack[--nodestackindex];
        }
+       // return number of clusters found (even if more than the maxclusters)
+       return numclusters;
+}
 
-       // just to work around bounds checking when debugging with it (array index out of bounds error thing)
-       dofs = m->dataofs;
-       // LordHavoc: mostly rewritten map texture loader
-       for (i = 0;i < m->nummiptex;i++)
+static int Mod_Q1BSP_BoxTouchingPVS(dp_model_t *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs)
+{
+       int nodestackindex = 0;
+       mnode_t *node, *nodestack[1024];
+       if (!model->brush.num_pvsclusters)
+               return true;
+       node = model->brush.data_nodes;
+       for (;;)
        {
-               dofs[i] = LittleLong(dofs[i]);
-               if (dofs[i] == -1 || r_nosurftextures.integer)
-                       continue;
-               dmiptex = (miptex_t *)((qbyte *)m + dofs[i]);
-
-               // make sure name is no more than 15 characters
-               for (j = 0;dmiptex->name[j] && j < 15;j++)
-                       name[j] = dmiptex->name[j];
-               name[j] = 0;
-
-               mtwidth = LittleLong (dmiptex->width);
-               mtheight = LittleLong (dmiptex->height);
-               mtdata = NULL;
-               j = LittleLong (dmiptex->offsets[0]);
-               if (j)
+#if 1
+               if (node->plane)
                {
-                       // texture included
-                       if (j < 40 || j + mtwidth * mtheight > l->filelen)
+                       // node - recurse down the BSP tree
+                       int sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides < 3)
                        {
-                               Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
-                               continue;
+                               if (sides == 0)
+                                       return -1; // ERROR: NAN bounding box!
+                               // box is on one side of plane, take that path
+                               node = node->children[sides-1];
                        }
-                       mtdata = (qbyte *)dmiptex + j;
-               }
-
-               if ((mtwidth & 15) || (mtheight & 15))
-                       Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
-
-               // LordHavoc: force all names to lowercase
-               for (j = 0;name[j];j++)
-                       if (name[j] >= 'A' && name[j] <= 'Z')
-                               name[j] += 'a' - 'A';
-
-               tx = loadmodel->textures + i;
-               strcpy(tx->name, name);
-               tx->width = mtwidth;
-               tx->height = mtheight;
-
-               if (!tx->name[0])
-               {
-                       sprintf(tx->name, "unnamed%i", i);
-                       Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
+                       else
+                       {
+                               // box crosses plane, take one path and remember the other
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
+                       }
+                       continue;
                }
-
-               // LordHavoc: HL sky textures are entirely different than quake
-               if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
+               else
                {
-                       if (loadmodel->isworldmodel)
+                       // leaf - check cluster bit
+                       int clusterindex = ((mleaf_t *)node)->clusterindex;
+                       if (CHECKPVSBIT(pvs, clusterindex))
                        {
-                               data = loadimagepixels(tx->name, false, 0, 0);
-                               if (data)
-                               {
-                                       if (image_width == 256 && image_height == 128)
-                                       {
-                                               R_InitSky (data, 4);
-                                               Mem_Free(data);
-                                       }
-                                       else
-                                       {
-                                               Mem_Free(data);
-                                               Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
-                                               if (mtdata != NULL)
-                                                       R_InitSky (mtdata, 1);
-                                       }
-                               }
-                               else if (mtdata != NULL)
-                                       R_InitSky (mtdata, 1);
+                               // it is visible, return immediately with the news
+                               return true;
                        }
                }
-               else
+#else
+               if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
                {
-                       if (!Mod_LoadSkinFrame(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, false, true, true))
+                       if (node->plane)
+                       {
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
+                               continue;
+                       }
+                       else
                        {
-                               // did not find external texture, load it from the bsp or wad3
-                               if (loadmodel->ishlbsp)
+                               // leaf - check cluster bit
+                               int clusterindex = ((mleaf_t *)node)->clusterindex;
+                               if (CHECKPVSBIT(pvs, clusterindex))
                                {
-                                       // internal texture overrides wad
-                                       qbyte *pixels, *freepixels;
-                                       pixels = freepixels = NULL;
-                                       if (mtdata)
-                                               pixels = W_ConvertWAD3Texture(dmiptex);
-                                       if (pixels == NULL)
-                                               pixels = freepixels = W_GetTexture(tx->name);
-                                       if (pixels != NULL)
-                                       {
-                                               tx->width = image_width;
-                                               tx->height = image_height;
-                                               tx->skin.base = tx->skin.merged = R_LoadTexture2D(loadmodel->texturepool, tx->name, image_width, image_height, pixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
-                                       }
-                                       if (freepixels)
-                                               Mem_Free(freepixels);
+                                       // it is visible, return immediately with the news
+                                       return true;
                                }
-                               else if (mtdata) // texture included
-                                       Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, false, true, tx->name[0] != '*' && r_fullbrights.integer, mtdata, tx->width, tx->height);
                        }
                }
-               if (tx->skin.base == NULL)
-               {
-                       // no texture found
-                       tx->width = 16;
-                       tx->height = 16;
-                       tx->skin.base = r_notexture;
-               }
+#endif
+               // nothing to see here, try another path we didn't take earlier
+               if (nodestackindex == 0)
+                       break;
+               node = nodestack[--nodestackindex];
+       }
+       // it is not visible
+       return false;
+}
 
-               if (tx->name[0] == '*')
+static int Mod_Q1BSP_BoxTouchingLeafPVS(dp_model_t *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs)
+{
+       int nodestackindex = 0;
+       mnode_t *node, *nodestack[1024];
+       if (!model->brush.num_leafs)
+               return true;
+       node = model->brush.data_nodes;
+       for (;;)
+       {
+#if 1
+               if (node->plane)
                {
-                       // turb does not block movement
-                       tx->flags &= ~SURF_SOLIDCLIP;
-                       tx->flags |= SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
-                       // LordHavoc: some turbulent textures should be fullbright and solid
-                       if (!strncmp(tx->name,"*lava",5)
-                        || !strncmp(tx->name,"*teleport",9)
-                        || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
-                               tx->flags |= SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA;
+                       // node - recurse down the BSP tree
+                       int sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides < 3)
+                       {
+                               if (sides == 0)
+                                       return -1; // ERROR: NAN bounding box!
+                               // box is on one side of plane, take that path
+                               node = node->children[sides-1];
+                       }
                        else
-                               tx->flags |= SURF_WATERALPHA;
-                       tx->shader = &Cshader_water;
-               }
-               else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
-               {
-                       tx->flags |= SURF_DRAWSKY;
-                       tx->shader = &Cshader_sky;
+                       {
+                               // box crosses plane, take one path and remember the other
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
+                       }
+                       continue;
                }
                else
                {
-                       tx->flags |= SURF_LIGHTMAP;
-                       if (!tx->skin.fog)
-                               tx->flags |= SURF_SHADOWCAST | SURF_SHADOWLIGHT;
-                       tx->shader = &Cshader_wall_lightmap;
+                       // leaf - check cluster bit
+                       int clusterindex = ((mleaf_t *)node) - model->brush.data_leafs;
+                       if (CHECKPVSBIT(pvs, clusterindex))
+                       {
+                               // it is visible, return immediately with the news
+                               return true;
+                       }
                }
-
-               // start out with no animation
-               tx->currentframe = tx;
-       }
-
-       // sequence the animations
-       for (i = 0;i < m->nummiptex;i++)
-       {
-               tx = loadmodel->textures + i;
-               if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
-                       continue;
-               if (tx->anim_total[0] || tx->anim_total[1])
-                       continue;       // already sequenced
-
-               // find the number of frames in the animation
-               memset (anims, 0, sizeof(anims));
-               memset (altanims, 0, sizeof(altanims));
-
-               for (j = i;j < m->nummiptex;j++)
+#else
+               if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
                {
-                       tx2 = loadmodel->textures + j;
-                       if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2))
+                       if (node->plane)
+                       {
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
                                continue;
-
-                       num = tx2->name[1];
-                       if (num >= '0' && num <= '9')
-                               anims[num - '0'] = tx2;
-                       else if (num >= 'a' && num <= 'j')
-                               altanims[num - 'a'] = tx2;
+                       }
                        else
-                               Con_Printf ("Bad animating texture %s\n", tx->name);
-               }
-
-               max = altmax = 0;
-               for (j = 0;j < 10;j++)
-               {
-                       if (anims[j])
-                               max = j + 1;
-                       if (altanims[j])
-                               altmax = j + 1;
+                       {
+                               // leaf - check cluster bit
+                               int clusterindex = ((mleaf_t *)node) - model->brush.data_leafs;
+                               if (CHECKPVSBIT(pvs, clusterindex))
+                               {
+                                       // it is visible, return immediately with the news
+                                       return true;
+                               }
+                       }
                }
-               //Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
+#endif
+               // nothing to see here, try another path we didn't take earlier
+               if (nodestackindex == 0)
+                       break;
+               node = nodestack[--nodestackindex];
+       }
+       // it is not visible
+       return false;
+}
 
-               incomplete = false;
-               for (j = 0;j < max;j++)
+static int Mod_Q1BSP_BoxTouchingVisibleLeafs(dp_model_t *model, const unsigned char *visibleleafs, const vec3_t mins, const vec3_t maxs)
+{
+       int nodestackindex = 0;
+       mnode_t *node, *nodestack[1024];
+       if (!model->brush.num_leafs)
+               return true;
+       node = model->brush.data_nodes;
+       for (;;)
+       {
+#if 1
+               if (node->plane)
                {
-                       if (!anims[j])
+                       // node - recurse down the BSP tree
+                       int sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides < 3)
                        {
-                               Con_Printf ("Missing frame %i of %s\n", j, tx->name);
-                               incomplete = true;
+                               if (sides == 0)
+                                       return -1; // ERROR: NAN bounding box!
+                               // box is on one side of plane, take that path
+                               node = node->children[sides-1];
                        }
-               }
-               for (j = 0;j < altmax;j++)
-               {
-                       if (!altanims[j])
+                       else
                        {
-                               Con_Printf ("Missing altframe %i of %s\n", j, tx->name);
-                               incomplete = true;
+                               // box crosses plane, take one path and remember the other
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
                        }
-               }
-               if (incomplete)
                        continue;
-
-               if (altmax < 1)
-               {
-                       // if there is no alternate animation, duplicate the primary
-                       // animation into the alternate
-                       altmax = max;
-                       for (k = 0;k < 10;k++)
-                               altanims[k] = anims[k];
                }
-
-               // link together the primary animation
-               for (j = 0;j < max;j++)
+               else
                {
-                       tx2 = anims[j];
-                       tx2->animated = true;
-                       tx2->anim_total[0] = max;
-                       tx2->anim_total[1] = altmax;
-                       for (k = 0;k < 10;k++)
+                       // leaf - check if it is visible
+                       if (visibleleafs[(mleaf_t *)node - model->brush.data_leafs])
                        {
-                               tx2->anim_frames[0][k] = anims[k];
-                               tx2->anim_frames[1][k] = altanims[k];
+                               // it is visible, return immediately with the news
+                               return true;
                        }
                }
-
-               // if there really is an alternate anim...
-               if (anims[0] != altanims[0])
+#else
+               if (BoxesOverlap(mins, maxs, node->mins, node->maxs))
                {
-                       // link together the alternate animation
-                       for (j = 0;j < altmax;j++)
+                       if (node->plane)
                        {
-                               tx2 = altanims[j];
-                               tx2->animated = true;
-                               // the primary/alternate are reversed here
-                               tx2->anim_total[0] = altmax;
-                               tx2->anim_total[1] = max;
-                               for (k = 0;k < 10;k++)
+                               if (nodestackindex < 1024)
+                                       nodestack[nodestackindex++] = node->children[0];
+                               node = node->children[1];
+                               continue;
+                       }
+                       else
+                       {
+                               // leaf - check if it is visible
+                               if (visibleleafs[(mleaf_t *)node - model->brush.data_leafs])
                                {
-                                       tx2->anim_frames[0][k] = altanims[k];
-                                       tx2->anim_frames[1][k] = anims[k];
+                                       // it is visible, return immediately with the news
+                                       return true;
                                }
                        }
                }
+#endif
+               // nothing to see here, try another path we didn't take earlier
+               if (nodestackindex == 0)
+                       break;
+               node = nodestack[--nodestackindex];
        }
+       // it is not visible
+       return false;
 }
 
-/*
-=================
-Mod_LoadLighting
-=================
-*/
-static void Mod_LoadLighting (lump_t *l)
+typedef struct findnonsolidlocationinfo_s
 {
-       int i;
-       qbyte *in, *out, *data, d;
-       char litfilename[1024];
-       loadmodel->lightdata = NULL;
-       if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight
-       {
-               loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen);
-               memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
-       }
-       else // LordHavoc: bsp version 29 (normal white lighting)
+       vec3_t center;
+       vec3_t absmin, absmax;
+       vec_t radius;
+       vec3_t nudge;
+       vec_t bestdist;
+       dp_model_t *model;
+}
+findnonsolidlocationinfo_t;
+
+static void Mod_Q1BSP_FindNonSolidLocation_r_Triangle(findnonsolidlocationinfo_t *info, msurface_t *surface, int k)
+{
+       int i, *tri;
+       float dist, f, vert[3][3], edge[3][3], facenormal[3], edgenormal[3][3], point[3];
+
+       tri = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle) + k * 3;
+       VectorCopy((info->model->surfmesh.data_vertex3f + tri[0] * 3), vert[0]);
+       VectorCopy((info->model->surfmesh.data_vertex3f + tri[1] * 3), vert[1]);
+       VectorCopy((info->model->surfmesh.data_vertex3f + tri[2] * 3), vert[2]);
+       VectorSubtract(vert[1], vert[0], edge[0]);
+       VectorSubtract(vert[2], vert[1], edge[1]);
+       CrossProduct(edge[1], edge[0], facenormal);
+       if (facenormal[0] || facenormal[1] || facenormal[2])
        {
-               // LordHavoc: hope is not lost yet, check for a .lit file to load
-               strcpy(litfilename, loadmodel->name);
-               COM_StripExtension(litfilename, litfilename);
-               strcat(litfilename, ".lit");
-               data = (qbyte*) COM_LoadFile (litfilename, false);
-               if (data)
+               VectorNormalize(facenormal);
+               f = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
+               if (f <= info->bestdist && f >= -info->bestdist)
                {
-                       if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+                       VectorSubtract(vert[0], vert[2], edge[2]);
+                       VectorNormalize(edge[0]);
+                       VectorNormalize(edge[1]);
+                       VectorNormalize(edge[2]);
+                       CrossProduct(facenormal, edge[0], edgenormal[0]);
+                       CrossProduct(facenormal, edge[1], edgenormal[1]);
+                       CrossProduct(facenormal, edge[2], edgenormal[2]);
+                       // face distance
+                       if (DotProduct(info->center, edgenormal[0]) < DotProduct(vert[0], edgenormal[0])
+                                       && DotProduct(info->center, edgenormal[1]) < DotProduct(vert[1], edgenormal[1])
+                                       && DotProduct(info->center, edgenormal[2]) < DotProduct(vert[2], edgenormal[2]))
                        {
-                               i = LittleLong(((int *)data)[1]);
-                               if (i == 1)
+                               // we got lucky, the center is within the face
+                               dist = DotProduct(info->center, facenormal) - DotProduct(vert[0], facenormal);
+                               if (dist < 0)
                                {
-                                       Con_DPrintf("loaded %s\n", litfilename);
-                                       loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, loadsize - 8);
-                                       memcpy(loadmodel->lightdata, data + 8, loadsize - 8);
-                                       Mem_Free(data);
-                                       return;
+                                       dist = -dist;
+                                       if (info->bestdist > dist)
+                                       {
+                                               info->bestdist = dist;
+                                               VectorScale(facenormal, (info->radius - -dist), info->nudge);
+                                       }
                                }
                                else
                                {
-                                       Con_Printf("Unknown .lit file version (%d)\n", i);
-                                       Mem_Free(data);
+                                       if (info->bestdist > dist)
+                                       {
+                                               info->bestdist = dist;
+                                               VectorScale(facenormal, (info->radius - dist), info->nudge);
+                                       }
                                }
                        }
                        else
                        {
-                               if (loadsize == 8)
-                                       Con_Printf("Empty .lit file, ignoring\n");
-                               else
-                                       Con_Printf("Corrupt .lit file (old version?), ignoring\n");
-                               Mem_Free(data);
-                       }
-               }
-               // LordHavoc: oh well, expand the white lighting data
-               if (!l->filelen)
-                       return;
-               loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen*3);
-               in = loadmodel->lightdata + l->filelen*2; // place the file at the end, so it will not be overwritten until the very last write
-               out = loadmodel->lightdata;
-               memcpy (in, mod_base + l->fileofs, l->filelen);
-               for (i = 0;i < l->filelen;i++)
-               {
-                       d = *in++;
-                       *out++ = d;
-                       *out++ = d;
-                       *out++ = d;
-               }
-       }
-}
-
-void Mod_LoadLightList(void)
-{
-       int a, n, numlights;
-       char lightsfilename[1024], *s, *t, *lightsstring;
-       mlight_t *e;
-
-       strcpy(lightsfilename, loadmodel->name);
-       COM_StripExtension(lightsfilename, lightsfilename);
-       strcat(lightsfilename, ".lights");
-       s = lightsstring = (char *) COM_LoadFile (lightsfilename, false);
-       if (s)
-       {
-               numlights = 0;
-               while (*s)
-               {
-                       while (*s && *s != '\n')
-                               s++;
-                       if (!*s)
-                       {
-                               Mem_Free(lightsstring);
-                               Host_Error("lights file must end with a newline\n");
-                       }
-                       s++;
-                       numlights++;
-               }
-               loadmodel->lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
-               s = lightsstring;
-               n = 0;
-               while (*s && n < numlights)
-               {
-                       t = s;
-                       while (*s && *s != '\n')
-                               s++;
-                       if (!*s)
-                       {
-                               Mem_Free(lightsstring);
-                               Host_Error("misparsed lights file!\n");
-                       }
-                       e = loadmodel->lights + n;
-                       *s = 0;
-                       a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style);
-                       *s = '\n';
-                       if (a != 14)
-                       {
-                               Mem_Free(lightsstring);
-                               Host_Error("invalid lights file, found %d parameters on line %i, should be 14 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone distancebias style)\n", a, n + 1);
-                       }
-                       s++;
-                       n++;
-               }
-               if (*s)
-               {
-                       Mem_Free(lightsstring);
-                       Host_Error("misparsed lights file!\n");
-               }
-               loadmodel->numlights = numlights;
-               Mem_Free(lightsstring);
-       }
-}
-
-/*
-static int castshadowcount = 0;
-void Mod_ProcessLightList(void)
-{
-       int j, k, l, *mark, lnum;
-       mlight_t *e;
-       msurface_t *surf;
-       float dist;
-       mleaf_t *leaf;
-       qbyte *pvs;
-       vec3_t temp;
-       float *v, radius2;
-       for (lnum = 0, e = loadmodel->lights;lnum < loadmodel->numlights;lnum++, e++)
-       {
-               e->cullradius2 = DotProduct(e->light, e->light) / (e->falloff * e->falloff * 8192.0f * 8192.0f * 2.0f * 2.0f);// + 4096.0f;
-               if (e->cullradius2 > 4096.0f * 4096.0f)
-                       e->cullradius2 = 4096.0f * 4096.0f;
-               e->cullradius = e->lightradius = sqrt(e->cullradius2);
-               leaf = Mod_PointInLeaf(e->origin, loadmodel);
-               if (leaf->compressed_vis)
-                       pvs = Mod_DecompressVis (leaf->compressed_vis, loadmodel);
-               else
-                       pvs = mod_novis;
-               for (j = 0;j < loadmodel->numsurfaces;j++)
-                       loadmodel->surfacevisframes[j] = -1;
-               for (j = 0, leaf = loadmodel->leafs + 1;j < loadmodel->numleafs - 1;j++, leaf++)
-               {
-                       if (pvs[j >> 3] & (1 << (j & 7)))
-                       {
-                               for (k = 0, mark = leaf->firstmarksurface;k < leaf->nummarksurfaces;k++, mark++)
+                               // check which edge or vertex the center is nearest
+                               for (i = 0;i < 3;i++)
                                {
-                                       surf = loadmodel->surfaces + *mark;
-                                       if (surf->number != *mark)
-                                               Con_Printf("%d != %d\n", surf->number, *mark);
-                                       dist = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
-                                       if (surf->flags & SURF_PLANEBACK)
-                                               dist = -dist;
-                                       if (dist > 0 && dist < e->cullradius)
+                                       f = DotProduct(info->center, edge[i]);
+                                       if (f >= DotProduct(vert[0], edge[i])
+                                                       && f <= DotProduct(vert[1], edge[i]))
                                        {
-                                               temp[0] = bound(surf->poly_mins[0], e->origin[0], surf->poly_maxs[0]) - e->origin[0];
-                                               temp[1] = bound(surf->poly_mins[1], e->origin[1], surf->poly_maxs[1]) - e->origin[1];
-                                               temp[2] = bound(surf->poly_mins[2], e->origin[2], surf->poly_maxs[2]) - e->origin[2];
-                                               if (DotProduct(temp, temp) < lightradius2)
-                                                       loadmodel->surfacevisframes[*mark] = -2;
+                                               // 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++;
                                        }
-                               }
-                       }
-               }
-               // build list of light receiving surfaces
-               e->numsurfaces = 0;
-               for (j = 0;j < loadmodel->numsurfaces;j++)
-                       if (loadmodel->surfacevisframes[j] == -2)
-                               e->numsurfaces++;
-               e->surfaces = NULL;
-               if (e->numsurfaces > 0)
-               {
-                       e->surfaces = Mem_Alloc(loadmodel->mempool, sizeof(msurface_t *) * e->numsurfaces);
-                       e->numsurfaces = 0;
-                       for (j = 0;j < loadmodel->numsurfaces;j++)
-                               if (loadmodel->surfacevisframes[j] == -2)
-                                       e->surfaces[e->numsurfaces++] = loadmodel->surfaces + j;
-               }
-               // find bounding box and sphere of lit surfaces
-               // (these will be used for creating a shape to clip the light)
-               radius2 = 0;
-               for (j = 0;j < e->numsurfaces;j++)
-               {
-                       surf = e->surfaces[j];
-                       if (j == 0)
-                       {
-                               VectorCopy(surf->poly_verts, e->mins);
-                               VectorCopy(surf->poly_verts, e->maxs);
-                       }
-                       for (k = 0, v = surf->poly_verts;k < surf->poly_numverts;k++, v += 3)
-                       {
-                               if (e->mins[0] > v[0]) e->mins[0] = v[0];if (e->maxs[0] < v[0]) e->maxs[0] = v[0];
-                               if (e->mins[1] > v[1]) e->mins[1] = v[1];if (e->maxs[1] < v[1]) e->maxs[1] = v[1];
-                               if (e->mins[2] > v[2]) e->mins[2] = v[2];if (e->maxs[2] < v[2]) e->maxs[2] = v[2];
-                               VectorSubtract(v, e->origin, temp);
-                               dist = DotProduct(temp, temp);
-                               if (radius2 < dist)
-                                       radius2 = dist;
-                       }
-               }
-               if (e->cullradius2 > radius2)
-               {
-                       e->cullradius2 = radius2;
-                       e->cullradius = sqrt(e->cullradius2);
-               }
-               if (e->mins[0] < e->origin[0] - e->lightradius) e->mins[0] = e->origin[0] - e->lightradius;
-               if (e->maxs[0] > e->origin[0] + e->lightradius) e->maxs[0] = e->origin[0] + e->lightradius;
-               if (e->mins[1] < e->origin[1] - e->lightradius) e->mins[1] = e->origin[1] - e->lightradius;
-               if (e->maxs[1] > e->origin[1] + e->lightradius) e->maxs[1] = e->origin[1] + e->lightradius;
-               if (e->mins[2] < e->origin[2] - e->lightradius) e->mins[2] = e->origin[2] - e->lightradius;
-               if (e->maxs[2] > e->origin[2] + e->lightradius) e->maxs[2] = e->origin[2] + e->lightradius;
-               // clip shadow volumes against eachother to remove unnecessary
-               // polygons (and sections of polygons)
-               {
-                       //vec3_t polymins, polymaxs;
-                       int maxverts = 4;
-                       float *verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
-                       float f, *v0, *v1, projectdistance;
-
-                       e->shadowvolume = Mod_ShadowMesh_Begin(loadmodel->mempool, 1024);
-#if 0
-                       {
-                       vec3_t outermins, outermaxs, innermins, innermaxs;
-                       innermins[0] = e->mins[0] - 1;
-                       innermins[1] = e->mins[1] - 1;
-                       innermins[2] = e->mins[2] - 1;
-                       innermaxs[0] = e->maxs[0] + 1;
-                       innermaxs[1] = e->maxs[1] + 1;
-                       innermaxs[2] = e->maxs[2] + 1;
-                       outermins[0] = loadmodel->normalmins[0] - 1;
-                       outermins[1] = loadmodel->normalmins[1] - 1;
-                       outermins[2] = loadmodel->normalmins[2] - 1;
-                       outermaxs[0] = loadmodel->normalmaxs[0] + 1;
-                       outermaxs[1] = loadmodel->normalmaxs[1] + 1;
-                       outermaxs[2] = loadmodel->normalmaxs[2] + 1;
-                       // add bounding box around the whole shadow volume set,
-                       // facing inward to limit light area, with an outer bounding box
-                       // facing outward (this is needed by the shadow rendering method)
-                       // X major
-                       verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
-                       verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
-                       verts[ 6] = innermaxs[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
-                       verts[ 9] = innermaxs[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
-                       verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
-                       verts[ 6] = outermaxs[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
-                       verts[ 9] = outermaxs[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       // X minor
-                       verts[ 0] = innermins[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
-                       verts[ 3] = innermins[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
-                       verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
-                       verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       verts[ 0] = outermins[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
-                       verts[ 3] = outermins[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
-                       verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
-                       verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       // Y major
-                       verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
-                       verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
-                       verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
-                       verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       verts[ 0] = outermins[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
-                       verts[ 3] = outermins[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
-                       verts[ 6] = outermaxs[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
-                       verts[ 9] = outermaxs[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       // Y minor
-                       verts[ 0] = innermins[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
-                       verts[ 3] = innermins[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
-                       verts[ 6] = innermaxs[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
-                       verts[ 9] = innermaxs[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
-                       verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
-                       verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
-                       verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       // Z major
-                       verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
-                       verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermaxs[2];
-                       verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermaxs[2];
-                       verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
-                       verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermaxs[2];
-                       verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermaxs[2];
-                       verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       // Z minor
-                       verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermins[2];
-                       verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
-                       verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
-                       verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermins[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermins[2];
-                       verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
-                       verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
-                       verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermins[2];
-                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
-                       }
-#endif
-                       castshadowcount++;
-                       for (j = 0;j < e->numsurfaces;j++)
-                       {
-                               surf = e->surfaces[j];
-                               if (surf->flags & SURF_SHADOWCAST)
-                                       surf->castshadow = castshadowcount;
-                       }
-                       for (j = 0;j < e->numsurfaces;j++)
-                       {
-                               surf = e->surfaces[j];
-                               if (surf->castshadow != castshadowcount)
-                                       continue;
-                               f = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
-                               if (surf->flags & SURF_PLANEBACK)
-                                       f = -f;
-                               projectdistance = e->lightradius;
-                               if (maxverts < surf->poly_numverts)
-                               {
-                                       maxverts = surf->poly_numverts;
-                                       if (verts)
-                                               Mem_Free(verts);
-                                       verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
-                               }
-                               // copy the original polygon, for the front cap of the volume
-                               for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
-                                       VectorCopy(v0, v1);
-                               Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, surf->poly_numverts, verts);
-                               // project the original polygon, reversed, for the back cap of the volume
-                               for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
-                               {
-                                       VectorSubtract(v0, e->origin, temp);
-                                       VectorNormalize(temp);
-                                       VectorMA(v0, projectdistance, temp, v1);
-                               }
-                               Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, surf->poly_numverts, verts);
-                               // project the shadow volume sides
-                               for (l = surf->poly_numverts - 1, k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;l = k, k++, v0 = v1, v1 += 3)
-                               {
-                                       if (!surf->neighborsurfaces[l] || surf->neighborsurfaces[l]->castshadow != castshadowcount)
+                                       else
                                        {
-                                               VectorCopy(v1, &verts[0]);
-                                               VectorCopy(v0, &verts[3]);
-                                               VectorCopy(v0, &verts[6]);
-                                               VectorCopy(v1, &verts[9]);
-                                               VectorSubtract(&verts[6], e->origin, temp);
-                                               VectorNormalize(temp);
-                                               VectorMA(&verts[6], projectdistance, temp, &verts[6]);
-                                               VectorSubtract(&verts[9], e->origin, temp);
-                                               VectorNormalize(temp);
-                                               VectorMA(&verts[9], projectdistance, temp, &verts[9]);
-                                               Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                                               // 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);
+                                               }
                                        }
                                }
                        }
-                       // build the triangle mesh
-                       e->shadowvolume = Mod_ShadowMesh_Finish(loadmodel->mempool, e->shadowvolume);
-                       {
-                               shadowmesh_t *mesh;
-                               l = 0;
-                               for (mesh = e->shadowvolume;mesh;mesh = mesh->next)
-                                       l += mesh->numtriangles;
-                               Con_Printf("light %i shadow volume built containing %i triangles\n", lnum, l);
-                       }
                }
        }
 }
-*/
-
-
-/*
-=================
-Mod_LoadVisibility
-=================
-*/
-static void Mod_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);
-}
 
-// used only for HalfLife maps
-void Mod_ParseWadsFromEntityLump(const char *data)
+static void Mod_Q1BSP_FindNonSolidLocation_r_Leaf(findnonsolidlocationinfo_t *info, mleaf_t *leaf)
 {
-       char key[128], value[4096];
-       char wadname[128];
-       int i, j, k;
-       if (!data)
-               return;
-       if (!COM_ParseToken(&data))
-               return; // error
-       if (com_token[0] != '{')
-               return; // error
-       while (1)
+       int surfacenum, k, *mark;
+       msurface_t *surface;
+       for (surfacenum = 0, mark = leaf->firstleafsurface;surfacenum < leaf->numleafsurfaces;surfacenum++, mark++)
        {
-               if (!COM_ParseToken(&data))
-                       return; // error
-               if (com_token[0] == '}')
-                       break; // end of worldspawn
-               if (com_token[0] == '_')
-                       strcpy(key, com_token + 1);
-               else
-                       strcpy(key, com_token);
-               while (key[strlen(key)-1] == ' ') // remove trailing spaces
-                       key[strlen(key)-1] = 0;
-               if (!COM_ParseToken(&data))
-                       return; // error
-               strcpy(value, com_token);
-               if (!strcmp("wad", key)) // for HalfLife maps
+               surface = info->model->data_surfaces + *mark;
+               if (surface->texture->supercontents & SUPERCONTENTS_SOLID)
                {
-                       if (loadmodel->ishlbsp)
+                       if(surface->num_bboxstride)
                        {
-                               j = 0;
-                               for (i = 0;i < 4096;i++)
-                                       if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
-                                               break;
-                               if (value[i])
+                               int i, cnt, tri;
+                               cnt = (surface->num_triangles + surface->num_bboxstride - 1) / surface->num_bboxstride;
+                               for(i = 0; i < cnt; ++i)
                                {
-                                       for (;i < 4096;i++)
+                                       if(BoxesOverlap(surface->data_bbox6f + i * 6, surface->data_bbox6f + i * 6 + 3, info->absmin, info->absmax))
                                        {
-                                               // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
-                                               if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
-                                                       j = i+1;
-                                               else if (value[i] == ';' || value[i] == 0)
+                                               for(k = 0; k < surface->num_bboxstride; ++k)
                                                {
-                                                       k = value[i];
-                                                       value[i] = 0;
-                                                       strcpy(wadname, "textures/");
-                                                       strcat(wadname, &value[j]);
-                                                       W_LoadTextureWadFile (wadname, false);
-                                                       j = i+1;
-                                                       if (!k)
+                                                       tri = i * surface->num_bboxstride + k;
+                                                       if(tri >= surface->num_triangles)
                                                                break;
+                                                       Mod_Q1BSP_FindNonSolidLocation_r_Triangle(info, surface, tri);
                                                }
                                        }
                                }
                        }
+                       else
+                       {
+                               for (k = 0;k < surface->num_triangles;k++)
+                               {
+                                       Mod_Q1BSP_FindNonSolidLocation_r_Triangle(info, surface, k);
+                               }
+                       }
                }
        }
 }
 
-/*
-=================
-Mod_LoadEntities
-=================
-*/
-static void Mod_LoadEntities (lump_t *l)
+static void Mod_Q1BSP_FindNonSolidLocation_r(findnonsolidlocationinfo_t *info, mnode_t *node)
 {
-       loadmodel->entities = NULL;
-       if (!l->filelen)
-               return;
-       loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen);
-       memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
-       if (loadmodel->ishlbsp)
-               Mod_ParseWadsFromEntityLump(loadmodel->entities);
+       if (node->plane)
+       {
+               float f = PlaneDiff(info->center, node->plane);
+               if (f >= -info->bestdist)
+                       Mod_Q1BSP_FindNonSolidLocation_r(info, node->children[0]);
+               if (f <= info->bestdist)
+                       Mod_Q1BSP_FindNonSolidLocation_r(info, node->children[1]);
+       }
+       else
+       {
+               if (((mleaf_t *)node)->numleafsurfaces)
+                       Mod_Q1BSP_FindNonSolidLocation_r_Leaf(info, (mleaf_t *)node);
+       }
 }
 
-
-/*
-=================
-Mod_LoadVertexes
-=================
-*/
-static void Mod_LoadVertexes (lump_t *l)
+static void Mod_Q1BSP_FindNonSolidLocation(dp_model_t *model, const vec3_t in, vec3_t out, float radius)
 {
-       dvertex_t       *in;
-       mvertex_t       *out;
-       int                     i, count;
-
-       in = (void *)(mod_base + l->fileofs);
-       if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       count = l->filelen / sizeof(*in);
-       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
-
-       loadmodel->vertexes = out;
-       loadmodel->numvertexes = count;
-
-       for ( i=0 ; i<count ; i++, in++, out++)
+       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
        {
-               out->position[0] = LittleFloat (in->point[0]);
-               out->position[1] = LittleFloat (in->point[1]);
-               out->position[2] = LittleFloat (in->point[2]);
+               VectorClear(info.nudge);
+               info.bestdist = radius;
+               VectorCopy(info.center, info.absmin);
+               VectorCopy(info.center, info.absmax);
+               info.absmin[0] -= info.radius + 1;
+               info.absmin[1] -= info.radius + 1;
+               info.absmin[2] -= info.radius + 1;
+               info.absmax[0] += info.radius + 1;
+               info.absmax[1] += info.radius + 1;
+               info.absmax[2] += info.radius + 1;
+               Mod_Q1BSP_FindNonSolidLocation_r(&info, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode);
+               VectorAdd(info.center, info.nudge, info.center);
        }
+       while (info.bestdist < radius && ++i < 10);
+       VectorCopy(info.center, out);
 }
 
-/*
-=================
-Mod_LoadSubmodels
-=================
-*/
-static void Mod_LoadSubmodels (lump_t *l)
+int Mod_Q1BSP_SuperContentsFromNativeContents(dp_model_t *model, int nativecontents)
 {
-       dmodel_t        *in;
-       dmodel_t        *out;
-       int                     i, j, count;
-
-       in = (void *)(mod_base + l->fileofs);
-       if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       count = l->filelen / sizeof(*in);
-       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
-
-       loadmodel->submodels = out;
-       loadmodel->numsubmodels = count;
-
-       for ( i=0 ; i<count ; i++, in++, out++)
+       switch(nativecontents)
        {
-               for (j=0 ; j<3 ; j++)
-               {
-                       // spread the mins / maxs by a pixel
-                       out->mins[j] = LittleFloat (in->mins[j]) - 1;
-                       out->maxs[j] = LittleFloat (in->maxs[j]) + 1;
-                       out->origin[j] = LittleFloat (in->origin[j]);
-               }
-               for (j=0 ; j<MAX_MAP_HULLS ; j++)
-                       out->headnode[j] = LittleLong (in->headnode[j]);
-               out->visleafs = LittleLong (in->visleafs);
-               out->firstface = LittleLong (in->firstface);
-               out->numfaces = LittleLong (in->numfaces);
+               case CONTENTS_EMPTY:
+                       return 0;
+               case CONTENTS_SOLID:
+                       return SUPERCONTENTS_SOLID | SUPERCONTENTS_OPAQUE;
+               case CONTENTS_WATER:
+                       return SUPERCONTENTS_WATER;
+               case CONTENTS_SLIME:
+                       return SUPERCONTENTS_SLIME;
+               case CONTENTS_LAVA:
+                       return SUPERCONTENTS_LAVA | SUPERCONTENTS_NODROP;
+               case CONTENTS_SKY:
+                       return SUPERCONTENTS_SKY | SUPERCONTENTS_NODROP | SUPERCONTENTS_OPAQUE; // to match behaviour of Q3 maps, let sky count as opaque
        }
+       return 0;
 }
 
-/*
-=================
-Mod_LoadEdges
-=================
-*/
-static void Mod_LoadEdges (lump_t *l)
+int Mod_Q1BSP_NativeContentsFromSuperContents(dp_model_t *model, int supercontents)
 {
-       dedge_t *in;
-       medge_t *out;
-       int     i, count;
+       if (supercontents & (SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY))
+               return CONTENTS_SOLID;
+       if (supercontents & SUPERCONTENTS_SKY)
+               return CONTENTS_SKY;
+       if (supercontents & SUPERCONTENTS_LAVA)
+               return CONTENTS_LAVA;
+       if (supercontents & SUPERCONTENTS_SLIME)
+               return CONTENTS_SLIME;
+       if (supercontents & SUPERCONTENTS_WATER)
+               return CONTENTS_WATER;
+       return CONTENTS_EMPTY;
+}
 
-       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));
+typedef struct RecursiveHullCheckTraceInfo_s
+{
+       // the hull we're tracing through
+       const hull_t *hull;
 
-       loadmodel->edges = out;
-       loadmodel->numedges = count;
+       // the trace structure to fill in
+       trace_t *trace;
 
-       for ( i=0 ; i<count ; i++, in++, out++)
-       {
-               out->v[0] = (unsigned short)LittleShort(in->v[0]);
-               out->v[1] = (unsigned short)LittleShort(in->v[1]);
-       }
+       // start, end, and end - start (in model space)
+       double start[3];
+       double end[3];
+       double dist[3];
 }
+RecursiveHullCheckTraceInfo_t;
 
-/*
-=================
-Mod_LoadTexinfo
-=================
-*/
-static void Mod_LoadTexinfo (lump_t *l)
-{
-       texinfo_t *in;
-       mtexinfo_t *out;
-       int i, j, k, count, miptex;
+// 1/32 epsilon to keep floating point happy
+#define DIST_EPSILON (0.03125)
 
-       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));
+#define HULLCHECKSTATE_EMPTY 0
+#define HULLCHECKSTATE_SOLID 1
+#define HULLCHECKSTATE_DONE 2
 
-       loadmodel->texinfo = out;
-       loadmodel->numtexinfo = count;
+extern cvar_t collision_prefernudgedfraction;
+static int Mod_Q1BSP_RecursiveHullCheck(RecursiveHullCheckTraceInfo_t *t, int num, double p1f, double p2f, double p1[3], double p2[3])
+{
+       // status variables, these don't need to be saved on the stack when
+       // recursing...  but are because this should be thread-safe
+       // (note: tracing against a bbox is not thread-safe, yet)
+       int ret;
+       mplane_t *plane;
+       double t1, t2;
+
+       // variables that need to be stored on the stack when recursing
+       mclipnode_t *node;
+       int side;
+       double midf, mid[3];
 
-       for (i = 0;i < count;i++, in++, out++)
+       // LordHavoc: a goto!  everyone flee in terror... :)
+loc0:
+       // check for empty
+       if (num < 0)
        {
-               for (k = 0;k < 2;k++)
-                       for (j = 0;j < 4;j++)
-                               out->vecs[k][j] = LittleFloat (in->vecs[k][j]);
-
-               miptex = LittleLong (in->miptex);
-               out->flags = LittleLong (in->flags);
-
-               out->texture = NULL;
-               if (loadmodel->textures)
+               num = Mod_Q1BSP_SuperContentsFromNativeContents(NULL, num);
+               if (!t->trace->startfound)
                {
-                       if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures)
-                               Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
-                       else
-                               out->texture = loadmodel->textures + miptex;
+                       t->trace->startfound = true;
+                       t->trace->startsupercontents |= num;
                }
-               if (out->flags & TEX_SPECIAL)
+               if (num & SUPERCONTENTS_LIQUIDSMASK)
+                       t->trace->inwater = true;
+               if (num == 0)
+                       t->trace->inopen = true;
+               if (num & SUPERCONTENTS_SOLID)
+                       t->trace->hittexture = &mod_q1bsp_texture_solid;
+               else if (num & SUPERCONTENTS_SKY)
+                       t->trace->hittexture = &mod_q1bsp_texture_sky;
+               else if (num & SUPERCONTENTS_LAVA)
+                       t->trace->hittexture = &mod_q1bsp_texture_lava;
+               else if (num & SUPERCONTENTS_SLIME)
+                       t->trace->hittexture = &mod_q1bsp_texture_slime;
+               else
+                       t->trace->hittexture = &mod_q1bsp_texture_water;
+               t->trace->hitq3surfaceflags = t->trace->hittexture->surfaceflags;
+               t->trace->hitsupercontents = num;
+               if (num & t->trace->hitsupercontentsmask)
                {
-                       // if texture chosen is NULL or the shader needs a lightmap,
-                       // force to notexture water shader
-                       if (out->texture == NULL || out->texture->shader->flags & SHADERFLAGS_NEEDLIGHTMAP)
-                               out->texture = loadmodel->textures + (loadmodel->numtextures - 1);
+                       // if the first leaf is solid, set startsolid
+                       if (t->trace->allsolid)
+                               t->trace->startsolid = true;
+#if COLLISIONPARANOID >= 3
+                       Con_Print("S");
+#endif
+                       return HULLCHECKSTATE_SOLID;
                }
                else
                {
-                       // if texture chosen is NULL, force to notexture
-                       if (out->texture == NULL)
-                               out->texture = loadmodel->textures + (loadmodel->numtextures - 2);
+                       t->trace->allsolid = false;
+#if COLLISIONPARANOID >= 3
+                       Con_Print("E");
+#endif
+                       return HULLCHECKSTATE_EMPTY;
                }
        }
-}
 
-void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
-{
-       int             i, j;
-       float   *v;
+       // find the point distances
+       node = t->hull->clipnodes + num;
 
-       mins[0] = mins[1] = mins[2] = 9999;
-       maxs[0] = maxs[1] = maxs[2] = -9999;
-       v = verts;
-       for (i = 0;i < numverts;i++)
+       plane = t->hull->planes + node->planenum;
+       if (plane->type < 3)
        {
-               for (j = 0;j < 3;j++, v++)
+               t1 = p1[plane->type] - plane->dist;
+               t2 = p2[plane->type] - plane->dist;
+       }
+       else
+       {
+               t1 = DotProduct (plane->normal, p1) - plane->dist;
+               t2 = DotProduct (plane->normal, p2) - plane->dist;
+       }
+
+       if (t1 < 0)
+       {
+               if (t2 < 0)
                {
-                       if (*v < mins[j])
-                               mins[j] = *v;
-                       if (*v > maxs[j])
-                               maxs[j] = *v;
+#if COLLISIONPARANOID >= 3
+                       Con_Print("<");
+#endif
+                       num = node->children[1];
+                       goto loc0;
                }
+               side = 1;
+       }
+       else
+       {
+               if (t2 >= 0)
+               {
+#if COLLISIONPARANOID >= 3
+                       Con_Print(">");
+#endif
+                       num = node->children[0];
+                       goto loc0;
+               }
+               side = 0;
        }
-}
 
-#if 0
-#define MAX_SUBDIVPOLYTRIANGLES 4096
-#define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3)
+       // the line intersects, find intersection point
+       // LordHavoc: this uses the original trace for maximum accuracy
+#if COLLISIONPARANOID >= 3
+       Con_Print("M");
+#endif
+       if (plane->type < 3)
+       {
+               t1 = t->start[plane->type] - plane->dist;
+               t2 = t->end[plane->type] - plane->dist;
+       }
+       else
+       {
+               t1 = DotProduct (plane->normal, t->start) - plane->dist;
+               t2 = DotProduct (plane->normal, t->end) - plane->dist;
+       }
 
-static int subdivpolyverts, subdivpolytriangles;
-static int subdivpolyindex[MAX_SUBDIVPOLYTRIANGLES][3];
-static float subdivpolyvert[MAX_SUBDIVPOLYVERTS][3];
+       midf = t1 / (t1 - t2);
+       midf = bound(p1f, midf, p2f);
+       VectorMA(t->start, midf, t->dist, mid);
 
-static int subdivpolylookupvert(vec3_t v)
-{
-       int i;
-       for (i = 0;i < subdivpolyverts;i++)
-               if (subdivpolyvert[i][0] == v[0]
-                && subdivpolyvert[i][1] == v[1]
-                && subdivpolyvert[i][2] == v[2])
-                       return i;
-       if (subdivpolyverts >= MAX_SUBDIVPOLYVERTS)
-               Host_Error("SubDividePolygon: ran out of vertices in buffer, please increase your r_subdivide_size");
-       VectorCopy(v, subdivpolyvert[subdivpolyverts]);
-       return subdivpolyverts++;
-}
-
-static void SubdividePolygon (int numverts, float *verts)
-{
-       int             i, i1, i2, i3, f, b, c, p;
-       vec3_t  mins, maxs, front[256], back[256];
-       float   m, *pv, *cv, dist[256], frac;
-
-       if (numverts > 250)
-               Host_Error ("SubdividePolygon: ran out of verts in buffer");
+       // recurse both sides, front side first
+       ret = Mod_Q1BSP_RecursiveHullCheck(t, node->children[side], p1f, midf, p1, mid);
+       // if this side is not empty, return what it is (solid or done)
+       if (ret != HULLCHECKSTATE_EMPTY)
+               return ret;
 
-       BoundPoly (numverts, verts, mins, maxs);
+       ret = Mod_Q1BSP_RecursiveHullCheck(t, node->children[side ^ 1], midf, p2f, mid, p2);
+       // if other side is not solid, return what it is (empty or done)
+       if (ret != HULLCHECKSTATE_SOLID)
+               return ret;
 
-       for (i = 0;i < 3;i++)
+       // front is air and back is solid, this is the impact point...
+       if (side)
        {
-               m = (mins[i] + maxs[i]) * 0.5;
-               m = r_subdivide_size.value * floor (m/r_subdivide_size.value + 0.5);
-               if (maxs[i] - m < 8)
-                       continue;
-               if (m - mins[i] < 8)
-                       continue;
-
-               // cut it
-               for (cv = verts, c = 0;c < numverts;c++, cv += 3)
-                       dist[c] = cv[i] - m;
-
-               f = b = 0;
-               for (p = numverts - 1, c = 0, pv = verts + p * 3, cv = verts;c < numverts;p = c, c++, pv = cv, cv += 3)
-               {
-                       if (dist[p] >= 0)
-                       {
-                               VectorCopy (pv, front[f]);
-                               f++;
-                       }
-                       if (dist[p] <= 0)
-                       {
-                               VectorCopy (pv, back[b]);
-                               b++;
-                       }
-                       if (dist[p] == 0 || dist[c] == 0)
-                               continue;
-                       if ( (dist[p] > 0) != (dist[c] > 0) )
-                       {
-                               // clip point
-                               frac = dist[p] / (dist[p] - dist[c]);
-                               front[f][0] = back[b][0] = pv[0] + frac * (cv[0] - pv[0]);
-                               front[f][1] = back[b][1] = pv[1] + frac * (cv[1] - pv[1]);
-                               front[f][2] = back[b][2] = pv[2] + frac * (cv[2] - pv[2]);
-                               f++;
-                               b++;
-                       }
-               }
-
-               SubdividePolygon (f, front[0]);
-               SubdividePolygon (b, back[0]);
-               return;
+               t->trace->plane.dist = -plane->dist;
+               VectorNegate (plane->normal, t->trace->plane.normal);
        }
-
-       i1 = subdivpolylookupvert(verts);
-       i2 = subdivpolylookupvert(verts + 3);
-       for (i = 2;i < numverts;i++)
+       else
        {
-               if (subdivpolytriangles >= MAX_SUBDIVPOLYTRIANGLES)
-               {
-                       Con_Printf("SubdividePolygon: ran out of triangles in buffer, please increase your r_subdivide_size\n");
-                       return;
-               }
-
-               i3 = subdivpolylookupvert(verts + i * 3);
-               subdivpolyindex[subdivpolytriangles][0] = i1;
-               subdivpolyindex[subdivpolytriangles][1] = i2;
-               subdivpolyindex[subdivpolytriangles][2] = i3;
-               i2 = i3;
-               subdivpolytriangles++;
+               t->trace->plane.dist = plane->dist;
+               VectorCopy (plane->normal, t->trace->plane.normal);
        }
-}
 
-/*
-================
-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)
-{
-       int i, j;
-       surfvertex_t *v;
-       surfmesh_t *mesh;
+       // calculate the true fraction
+       t1 = DotProduct(t->trace->plane.normal, t->start) - t->trace->plane.dist;
+       t2 = DotProduct(t->trace->plane.normal, t->end) - t->trace->plane.dist;
+       midf = t1 / (t1 - t2);
+       t->trace->realfraction = bound(0, midf, 1);
 
-       subdivpolytriangles = 0;
-       subdivpolyverts = 0;
-       SubdividePolygon (surf->poly_numverts, surf->poly_verts);
-       if (subdivpolytriangles < 1)
-               Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
+       // calculate the return fraction which is nudged off the surface a bit
+       midf = (t1 - DIST_EPSILON) / (t1 - t2);
+       t->trace->fraction = bound(0, midf, 1);
 
-       surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
-       mesh->numverts = subdivpolyverts;
-       mesh->numtriangles = subdivpolytriangles;
-       mesh->vertex = (surfvertex_t *)(mesh + 1);
-       mesh->index = (int *)(mesh->vertex + mesh->numverts);
-       memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+       if (collision_prefernudgedfraction.integer)
+               t->trace->realfraction = t->trace->fraction;
 
-       for (i = 0;i < mesh->numtriangles;i++)
-               for (j = 0;j < 3;j++)
-                       mesh->index[i*3+j] = subdivpolyindex[i][j];
+#if COLLISIONPARANOID >= 3
+       Con_Print("D");
+#endif
+       return HULLCHECKSTATE_DONE;
+}
 
-       for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
+//#if COLLISIONPARANOID < 2
+static int Mod_Q1BSP_RecursiveHullCheckPoint(RecursiveHullCheckTraceInfo_t *t, int num)
+{
+       mplane_t *plane;
+       mclipnode_t *nodes = t->hull->clipnodes;
+       mplane_t *planes = t->hull->planes;
+       vec3_t point;
+       VectorCopy(t->start, point);
+       while (num >= 0)
        {
-               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]);
+               plane = planes + nodes[num].planenum;
+               num = nodes[num].children[(plane->type < 3 ? point[plane->type] : DotProduct(plane->normal, point)) < plane->dist];
+       }
+       num = Mod_Q1BSP_SuperContentsFromNativeContents(NULL, num);
+       t->trace->startsupercontents |= num;
+       if (num & SUPERCONTENTS_LIQUIDSMASK)
+               t->trace->inwater = true;
+       if (num == 0)
+               t->trace->inopen = true;
+       if (num & t->trace->hitsupercontentsmask)
+       {
+               t->trace->allsolid = t->trace->startsolid = true;
+               return HULLCHECKSTATE_SOLID;
+       }
+       else
+       {
+               t->trace->allsolid = t->trace->startsolid = false;
+               return HULLCHECKSTATE_EMPTY;
        }
 }
-#endif
+//#endif
 
-surfmesh_t *Mod_AllocSurfMesh(int numverts, int numtriangles)
+static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask)
 {
-       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->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;
-       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)
+       // this function currently only supports same size start and end
+       double boxsize[3];
+       RecursiveHullCheckTraceInfo_t rhc;
+
+       memset(&rhc, 0, sizeof(rhc));
+       memset(trace, 0, sizeof(trace_t));
+       rhc.trace = trace;
+       rhc.trace->hitsupercontentsmask = hitsupercontentsmask;
+       rhc.trace->fraction = 1;
+       rhc.trace->realfraction = 1;
+       rhc.trace->allsolid = true;
+       VectorSubtract(boxmaxs, boxmins, boxsize);
+       if (boxsize[0] < 3)
+               rhc.hull = &model->brushq1.hulls[0]; // 0x0x0
+       else if (model->brush.ishlbsp)
        {
-               surf->lightmaptexturestride = 0;
-               surf->lightmaptexture = NULL;
-               uscale = 0;
-               vscale = 0;
-               ubase = 0;
-               vbase = 0;
+               // LordHavoc: this has to have a minor tolerance (the .1) because of
+               // minor float precision errors from the box being transformed around
+               if (boxsize[0] < 32.1)
+               {
+                       if (boxsize[2] < 54) // pick the nearest of 36 or 72
+                               rhc.hull = &model->brushq1.hulls[3]; // 32x32x36
+                       else
+                               rhc.hull = &model->brushq1.hulls[1]; // 32x32x72
+               }
+               else
+                       rhc.hull = &model->brushq1.hulls[2]; // 64x64x64
        }
        else
        {
-               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);
-               }
+               // LordHavoc: this has to have a minor tolerance (the .1) because of
+               // minor float precision errors from the box being transformed around
+               if (boxsize[0] < 32.1)
+                       rhc.hull = &model->brushq1.hulls[1]; // 32x32x56
                else
-               {
-                       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);
+                       rhc.hull = &model->brushq1.hulls[2]; // 64x64x88
        }
-
-       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
-
-       index = mesh->index;
-       for (i = 0;i < mesh->numtriangles;i++)
+       VectorMAMAM(1, start, 1, boxmins, -1, rhc.hull->clip_mins, rhc.start);
+       VectorMAMAM(1, end, 1, boxmins, -1, rhc.hull->clip_mins, rhc.end);
+       VectorSubtract(rhc.end, rhc.start, rhc.dist);
+#if COLLISIONPARANOID >= 2
+       Con_Printf("t(%f %f %f,%f %f %f,%i %f %f %f)", rhc.start[0], rhc.start[1], rhc.start[2], rhc.end[0], rhc.end[1], rhc.end[2], rhc.hull - model->brushq1.hulls, rhc.hull->clip_mins[0], rhc.hull->clip_mins[1], rhc.hull->clip_mins[2]);
+       Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
        {
-               *index++ = 0;
-               *index++ = i + 1;
-               *index++ = i + 2;
+
+               double test[3];
+               trace_t testtrace;
+               VectorLerp(rhc.start, rhc.trace->fraction, rhc.end, test);
+               memset(&testtrace, 0, sizeof(trace_t));
+               rhc.trace = &testtrace;
+               rhc.trace->hitsupercontentsmask = hitsupercontentsmask;
+               rhc.trace->fraction = 1;
+               rhc.trace->realfraction = 1;
+               rhc.trace->allsolid = true;
+               VectorCopy(test, rhc.start);
+               VectorCopy(test, rhc.end);
+               VectorClear(rhc.dist);
+               Mod_Q1BSP_RecursiveHullCheckPoint(&rhc, rhc.hull->firstclipnode);
+               //Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, test, test);
+               if (!trace->startsolid && testtrace.startsolid)
+                       Con_Printf(" - ended in solid!\n");
        }
-       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
+       Con_Print("\n");
+#else
+       if (VectorLength2(rhc.dist))
+               Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
+       else
+               Mod_Q1BSP_RecursiveHullCheckPoint(&rhc, rhc.hull->firstclipnode);
+#endif
+}
 
-       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)
+static int Mod_Q1BSP_PointSuperContents(struct model_s *model, int frame, const vec3_t point)
+{
+       int num = model->brushq1.hulls[0].firstclipnode;
+       mplane_t *plane;
+       mclipnode_t *nodes = model->brushq1.hulls[0].clipnodes;
+       mplane_t *planes = model->brushq1.hulls[0].planes;
+       while (num >= 0)
        {
-               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);
+               plane = planes + nodes[num].planenum;
+               num = nodes[num].children[(plane->type < 3 ? point[plane->type] : DotProduct(plane->normal, point)) < plane->dist];
        }
-       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
+       return Mod_Q1BSP_SuperContentsFromNativeContents(NULL, num);
 }
 
-void Mod_GenerateVertexMesh (msurface_t *surf)
+void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask, int boxsupercontents, int boxq3surfaceflags, texture_t *boxtexture)
 {
-       int i, *index;
-       float *in, s, t, normal[3];
-       surfmesh_t *mesh;
+#if 1
+       colbrushf_t cbox;
+       colplanef_t cbox_planes[6];
+       cbox.supercontents = boxsupercontents;
+       cbox.numplanes = 6;
+       cbox.numpoints = 0;
+       cbox.numtriangles = 0;
+       cbox.planes = cbox_planes;
+       cbox.points = NULL;
+       cbox.elements = NULL;
+       cbox.markframe = 0;
+       cbox.mins[0] = 0;
+       cbox.mins[1] = 0;
+       cbox.mins[2] = 0;
+       cbox.maxs[0] = 0;
+       cbox.maxs[1] = 0;
+       cbox.maxs[2] = 0;
+       cbox_planes[0].normal[0] =  1;cbox_planes[0].normal[1] =  0;cbox_planes[0].normal[2] =  0;cbox_planes[0].dist = cmaxs[0] - mins[0];
+       cbox_planes[1].normal[0] = -1;cbox_planes[1].normal[1] =  0;cbox_planes[1].normal[2] =  0;cbox_planes[1].dist = maxs[0] - cmins[0];
+       cbox_planes[2].normal[0] =  0;cbox_planes[2].normal[1] =  1;cbox_planes[2].normal[2] =  0;cbox_planes[2].dist = cmaxs[1] - mins[1];
+       cbox_planes[3].normal[0] =  0;cbox_planes[3].normal[1] = -1;cbox_planes[3].normal[2] =  0;cbox_planes[3].dist = maxs[1] - cmins[1];
+       cbox_planes[4].normal[0] =  0;cbox_planes[4].normal[1] =  0;cbox_planes[4].normal[2] =  1;cbox_planes[4].dist = cmaxs[2] - mins[2];
+       cbox_planes[5].normal[0] =  0;cbox_planes[5].normal[1] =  0;cbox_planes[5].normal[2] = -1;cbox_planes[5].dist = maxs[2] - cmins[2];
+       cbox_planes[0].q3surfaceflags = boxq3surfaceflags;cbox_planes[0].texture = boxtexture;
+       cbox_planes[1].q3surfaceflags = boxq3surfaceflags;cbox_planes[1].texture = boxtexture;
+       cbox_planes[2].q3surfaceflags = boxq3surfaceflags;cbox_planes[2].texture = boxtexture;
+       cbox_planes[3].q3surfaceflags = boxq3surfaceflags;cbox_planes[3].texture = boxtexture;
+       cbox_planes[4].q3surfaceflags = boxq3surfaceflags;cbox_planes[4].texture = boxtexture;
+       cbox_planes[5].q3surfaceflags = boxq3surfaceflags;cbox_planes[5].texture = boxtexture;
+       memset(trace, 0, sizeof(trace_t));
+       trace->hitsupercontentsmask = hitsupercontentsmask;
+       trace->fraction = 1;
+       trace->realfraction = 1;
+       Collision_TraceLineBrushFloat(trace, start, end, &cbox, &cbox);
+#else
+       RecursiveHullCheckTraceInfo_t rhc;
+       static hull_t box_hull;
+       static mclipnode_t box_clipnodes[6];
+       static mplane_t box_planes[6];
+       // fill in a default trace
+       memset(&rhc, 0, sizeof(rhc));
+       memset(trace, 0, sizeof(trace_t));
+       //To keep everything totally uniform, bounding boxes are turned into small
+       //BSP trees instead of being compared directly.
+       // create a temp hull from bounding box sizes
+       box_planes[0].dist = cmaxs[0] - mins[0];
+       box_planes[1].dist = cmins[0] - maxs[0];
+       box_planes[2].dist = cmaxs[1] - mins[1];
+       box_planes[3].dist = cmins[1] - maxs[1];
+       box_planes[4].dist = cmaxs[2] - mins[2];
+       box_planes[5].dist = cmins[2] - maxs[2];
+#if COLLISIONPARANOID >= 3
+       Con_Printf("box_planes %f:%f %f:%f %f:%f\ncbox %f %f %f:%f %f %f\nbox %f %f %f:%f %f %f\n", box_planes[0].dist, box_planes[1].dist, box_planes[2].dist, box_planes[3].dist, box_planes[4].dist, box_planes[5].dist, cmins[0], cmins[1], cmins[2], cmaxs[0], cmaxs[1], cmaxs[2], mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
+#endif
 
-       surf->lightmaptexturestride = 0;
-       surf->lightmaptexture = NULL;
+       if (box_hull.clipnodes == NULL)
+       {
+               int i, side;
 
-       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
+               //Set up the planes and clipnodes so that the six floats of a bounding box
+               //can just be stored out and get a proper hull_t structure.
 
-       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);
+               box_hull.clipnodes = box_clipnodes;
+               box_hull.planes = box_planes;
+               box_hull.firstclipnode = 0;
+               box_hull.lastclipnode = 5;
 
-       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);
+               for (i = 0;i < 6;i++)
+               {
+                       box_clipnodes[i].planenum = i;
+
+                       side = i&1;
+
+                       box_clipnodes[i].children[side] = CONTENTS_EMPTY;
+                       if (i != 5)
+                               box_clipnodes[i].children[side^1] = i + 1;
+                       else
+                               box_clipnodes[i].children[side^1] = CONTENTS_SOLID;
+
+                       box_planes[i].type = i>>1;
+                       box_planes[i].normal[i>>1] = 1;
+               }
        }
-       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
+
+       // trace a line through the generated clipping hull
+       //rhc.boxsupercontents = boxsupercontents;
+       rhc.hull = &box_hull;
+       rhc.trace = trace;
+       rhc.trace->hitsupercontentsmask = hitsupercontentsmask;
+       rhc.trace->fraction = 1;
+       rhc.trace->realfraction = 1;
+       rhc.trace->allsolid = true;
+       VectorCopy(start, rhc.start);
+       VectorCopy(end, rhc.end);
+       VectorSubtract(rhc.end, rhc.start, rhc.dist);
+       Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
+       //VectorMA(rhc.start, rhc.trace->fraction, rhc.dist, rhc.trace->endpos);
+       if (rhc.trace->startsupercontents)
+               rhc.trace->startsupercontents = boxsupercontents;
+#endif
 }
 
-void Mod_GenerateSurfacePolygon (msurface_t *surf, int firstedge, int numedges)
+static int Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(mnode_t *node, double p1[3], double p2[3])
 {
-       int i, lindex, j;
-       float *vec, *vert, mins[3], maxs[3], val, *v;
-       mtexinfo_t *tex;
+       double t1, t2;
+       double midf, mid[3];
+       int ret, side;
 
-       // convert edges back to a normal polygon
-       surf->poly_numverts = numedges;
-       vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * numedges);
-       for (i = 0;i < numedges;i++)
+       // check for empty
+       while (node->plane)
        {
-               lindex = loadmodel->surfedges[firstedge + i];
-               if (lindex > 0)
-                       vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position;
+               // find the point distances
+               mplane_t *plane = node->plane;
+               if (plane->type < 3)
+               {
+                       t1 = p1[plane->type] - plane->dist;
+                       t2 = p2[plane->type] - plane->dist;
+               }
                else
-                       vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
-               VectorCopy (vec, vert);
-               vert += 3;
-       }
-
-       // calculate polygon bounding box and center
-       vert = surf->poly_verts;
-       VectorCopy(vert, mins);
-       VectorCopy(vert, maxs);
-       vert += 3;
-       for (i = 1;i < surf->poly_numverts;i++, vert += 3)
-       {
-               if (mins[0] > vert[0]) mins[0] = vert[0];if (maxs[0] < vert[0]) maxs[0] = vert[0];
-               if (mins[1] > vert[1]) mins[1] = vert[1];if (maxs[1] < vert[1]) maxs[1] = vert[1];
-               if (mins[2] > vert[2]) mins[2] = vert[2];if (maxs[2] < vert[2]) maxs[2] = vert[2];
-       }
-       VectorCopy(mins, surf->poly_mins);
-       VectorCopy(maxs, surf->poly_maxs);
-       surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
-       surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
-       surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
-
-       // generate surface extents information
-       tex = surf->texinfo;
-       mins[0] = maxs[0] = DotProduct(surf->poly_verts, tex->vecs[0]) + tex->vecs[0][3];
-       mins[1] = maxs[1] = DotProduct(surf->poly_verts, tex->vecs[1]) + tex->vecs[1][3];
-       for (i = 1, v = surf->poly_verts + 3;i < surf->poly_numverts;i++, v += 3)
-       {
-               for (j = 0;j < 2;j++)
                {
-                       val = DotProduct(v, tex->vecs[j]) + tex->vecs[j][3];
-                       if (mins[j] > val)
-                               mins[j] = val;
-                       if (maxs[j] < val)
-                               maxs[j] = val;
+                       t1 = DotProduct (plane->normal, p1) - plane->dist;
+                       t2 = DotProduct (plane->normal, p2) - plane->dist;
                }
+
+               if (t1 < 0)
+               {
+                       if (t2 < 0)
+                       {
+                               node = node->children[1];
+                               continue;
+                       }
+                       side = 1;
+               }
+               else
+               {
+                       if (t2 >= 0)
+                       {
+                               node = node->children[0];
+                               continue;
+                       }
+                       side = 0;
+               }
+
+               midf = t1 / (t1 - t2);
+               VectorLerp(p1, midf, p2, mid);
+
+               // recurse both sides, front side first
+               // return 2 if empty is followed by solid (hit something)
+               // do not return 2 if both are solid or both empty,
+               // or if start is solid and end is empty
+               // as these degenerate cases usually indicate the eye is in solid and
+               // should see the target point anyway
+               ret = Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(node->children[side    ], p1, mid);
+               if (ret != 0)
+                       return ret;
+               ret = Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(node->children[side ^ 1], mid, p2);
+               if (ret != 1)
+                       return ret;
+               return 2;
        }
-       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];
-       }
+       return ((mleaf_t *)node)->clusterindex < 0;
 }
 
-/*
-=================
-Mod_LoadFaces
-=================
-*/
-static void Mod_LoadFaces (lump_t *l)
+static qboolean Mod_Q1BSP_TraceLineOfSight(struct model_s *model, const vec3_t start, const vec3_t end)
 {
-       dface_t *in;
-       msurface_t      *out;
-       int i, count, surfnum, planenum, ssize, tsize, firstedge, numedges;
+       // this function currently only supports same size start and end
+       double tracestart[3], traceend[3];
+       VectorCopy(start, tracestart);
+       VectorCopy(end, traceend);
+       return Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(model->brush.data_nodes, tracestart, traceend) != 2;
+}
 
-       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));
+static int Mod_Q1BSP_LightPoint_RecursiveBSPNode(dp_model_t *model, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const mnode_t *node, float x, float y, float startz, float endz)
+{
+       int side;
+       float front, back;
+       float mid, distz = endz - startz;
 
-       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));
+loc0:
+       if (!node->plane)
+               return false;           // didn't hit anything
 
-       for (surfnum = 0;surfnum < count;surfnum++, in++, out++)
+       switch (node->plane->type)
        {
-               out->number = surfnum;
-               // FIXME: validate edges, texinfo, etc?
-               firstedge = LittleLong(in->firstedge);
-               numedges = LittleShort(in->numedges);
-               if ((unsigned int) firstedge + (unsigned int) numedges > (unsigned int) loadmodel->numsurfedges)
-                       Host_Error("Mod_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", firstedge, numedges, loadmodel->numsurfedges);
+       case PLANE_X:
+               node = node->children[x < node->plane->dist];
+               goto loc0;
+       case PLANE_Y:
+               node = node->children[y < node->plane->dist];
+               goto loc0;
+       case PLANE_Z:
+               side = startz < node->plane->dist;
+               if ((endz < node->plane->dist) == side)
+               {
+                       node = node->children[side];
+                       goto loc0;
+               }
+               // found an intersection
+               mid = node->plane->dist;
+               break;
+       default:
+               back = front = x * node->plane->normal[0] + y * node->plane->normal[1];
+               front += startz * node->plane->normal[2];
+               back += endz * node->plane->normal[2];
+               side = front < node->plane->dist;
+               if ((back < node->plane->dist) == side)
+               {
+                       node = node->children[side];
+                       goto loc0;
+               }
+               // found an intersection
+               mid = startz + distz * (front - node->plane->dist) / (front - back);
+               break;
+       }
 
-               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;
+       // go down front side
+       if (node->children[side]->plane && Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, node->children[side], x, y, startz, mid))
+               return true;    // hit something
+       else
+       {
+               // check for impact on this node
+               if (node->numsurfaces)
+               {
+                       int i, dsi, dti, lmwidth, lmheight;
+                       float ds, dt;
+                       msurface_t *surface;
+                       unsigned char *lightmap;
+                       int maps, line3, size3;
+                       float dsfrac;
+                       float dtfrac;
+                       float scale, w, w00, w01, w10, w11;
+
+                       surface = model->data_surfaces + node->firstsurface;
+                       for (i = 0;i < node->numsurfaces;i++, surface++)
+                       {
+                               if (!(surface->texture->basematerialflags & MATERIALFLAG_WALL) || !surface->lightmapinfo->samples)
+                                       continue;       // no lightmaps
 
-               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);
+                               // location we want to sample in the lightmap
+                               ds = ((x * surface->lightmapinfo->texinfo->vecs[0][0] + y * surface->lightmapinfo->texinfo->vecs[0][1] + mid * surface->lightmapinfo->texinfo->vecs[0][2] + surface->lightmapinfo->texinfo->vecs[0][3]) - surface->lightmapinfo->texturemins[0]) * 0.0625f;
+                               dt = ((x * surface->lightmapinfo->texinfo->vecs[1][0] + y * surface->lightmapinfo->texinfo->vecs[1][1] + mid * surface->lightmapinfo->texinfo->vecs[1][2] + surface->lightmapinfo->texinfo->vecs[1][3]) - surface->lightmapinfo->texturemins[1]) * 0.0625f;
 
-               if (LittleShort(in->side))
-                       out->flags |= SURF_PLANEBACK;
+                               // check the bounds
+                               dsi = (int)ds;
+                               dti = (int)dt;
+                               lmwidth = ((surface->lightmapinfo->extents[0]>>4)+1);
+                               lmheight = ((surface->lightmapinfo->extents[1]>>4)+1);
 
-               out->plane = loadmodel->planes + planenum;
+                               // is it in bounds?
+                               if (dsi >= 0 && dsi < lmwidth-1 && dti >= 0 && dti < lmheight-1)
+                               {
+                                       // calculate bilinear interpolation factors
+                                       // and also multiply by fixedpoint conversion factors
+                                       dsfrac = ds - dsi;
+                                       dtfrac = dt - dti;
+                                       w00 = (1 - dsfrac) * (1 - dtfrac) * (1.0f / 32768.0f);
+                                       w01 = (    dsfrac) * (1 - dtfrac) * (1.0f / 32768.0f);
+                                       w10 = (1 - dsfrac) * (    dtfrac) * (1.0f / 32768.0f);
+                                       w11 = (    dsfrac) * (    dtfrac) * (1.0f / 32768.0f);
+
+                                       // values for pointer math
+                                       line3 = lmwidth * 3; // LordHavoc: *3 for colored lighting
+                                       size3 = lmwidth * lmheight * 3; // LordHavoc: *3 for colored lighting
+
+                                       // look up the pixel
+                                       lightmap = surface->lightmapinfo->samples + dti * line3 + dsi*3; // LordHavoc: *3 for colored lighting
+
+                                       // bilinear filter each lightmap style, and sum them
+                                       for (maps = 0;maps < MAXLIGHTMAPS && surface->lightmapinfo->styles[maps] != 255;maps++)
+                                       {
+                                               scale = r_refdef.scene.lightstylevalue[surface->lightmapinfo->styles[maps]];
+                                               w = w00 * scale;VectorMA(ambientcolor, w, lightmap            , ambientcolor);
+                                               w = w01 * scale;VectorMA(ambientcolor, w, lightmap + 3        , ambientcolor);
+                                               w = w10 * scale;VectorMA(ambientcolor, w, lightmap + line3    , ambientcolor);
+                                               w = w11 * scale;VectorMA(ambientcolor, w, lightmap + line3 + 3, ambientcolor);
+                                               lightmap += size3;
+                                       }
 
-               // clear lightmap (filled in later)
-               out->lightmaptexture = NULL;
+                                       return true; // success
+                               }
+                       }
+               }
 
-               // force lightmap upload on first time seeing the surface
-               out->cached_dlight = true;
+               // go down back side
+               node = node->children[side ^ 1];
+               startz = mid;
+               distz = endz - startz;
+               goto loc0;
+       }
+}
 
-               Mod_GenerateSurfacePolygon(out, firstedge, numedges);
+void Mod_Q1BSP_LightPoint(dp_model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
+{
+       // pretend lighting is coming down from above (due to lack of a lightgrid to know primary lighting direction)
+       VectorSet(diffusenormal, 0, 0, 1);
 
-               ssize = (out->extents[0] >> 4) + 1;
-               tsize = (out->extents[1] >> 4) + 1;
+       if (!model->brushq1.lightdata)
+       {
+               VectorSet(ambientcolor, 1, 1, 1);
+               VectorSet(diffusecolor, 0, 0, 0);
+               return;
+       }
 
-               // lighting info
-               for (i = 0;i < MAXLIGHTMAPS;i++)
-                       out->styles[i] = in->styles[i];
-               i = LittleLong(in->lightofs);
-               if (i == -1)
-                       out->samples = NULL;
-               else if (loadmodel->ishlbsp) // LordHavoc: HalfLife map (bsp version 30)
-                       out->samples = loadmodel->lightdata + i;
-               else // LordHavoc: white lighting (bsp version 29)
-                       out->samples = loadmodel->lightdata + (i * 3);
+       Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2] + 0.125, p[2] - 65536);
+}
 
-               if (out->texinfo->texture->shader == &Cshader_wall_lightmap)
+static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char *inend, unsigned char *out, unsigned char *outend)
+{
+       int c;
+       unsigned char *outstart = out;
+       while (out < outend)
+       {
+               if (in == inend)
                {
-                       if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256))
-                               Host_Error ("Bad surface extents");
-                       Mod_GenerateWallMesh (out, false);
-                       // stainmap for permanent marks on walls
-                       out->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
-                       // clear to white
-                       memset(out->stainsamples, 255, ssize * tsize * 3);
+                       Con_Printf("Mod_Q1BSP_DecompressVis: input underrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, (int)(out - outstart), (int)(outend - outstart));
+                       return;
                }
+               c = *in++;
+               if (c)
+                       *out++ = c;
                else
-                       Mod_GenerateVertexMesh (out);
+               {
+                       if (in == inend)
+                       {
+                               Con_Printf("Mod_Q1BSP_DecompressVis: input underrun (during zero-run) on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, (int)(out - outstart), (int)(outend - outstart));
+                               return;
+                       }
+                       for (c = *in++;c > 0;c--)
+                       {
+                               if (out == outend)
+                               {
+                                       Con_Printf("Mod_Q1BSP_DecompressVis: output overrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, (int)(out - outstart), (int)(outend - outstart));
+                                       return;
+                               }
+                               *out++ = 0;
+                       }
+               }
        }
 }
 
 /*
-=================
-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);
-}
+=============
+R_Q1BSP_LoadSplitSky
 
-/*
-=================
-Mod_LoadNodes
-=================
+A sky texture is 256*128, with the right side being a masked overlay
+==============
 */
-static void Mod_LoadNodes (lump_t *l)
+void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesperpixel)
 {
-       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_LoadBmodel: funny lump size in %s",loadmodel->name);
-       count = l->filelen / sizeof(*in);
-       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+       int i, j;
+       unsigned solidpixels[128*128], alphapixels[128*128];
 
-       loadmodel->nodes = out;
-       loadmodel->numnodes = count;
+       // allocate a texture pool if we need it
+       if (loadmodel->texturepool == NULL && cls.state != ca_dedicated)
+               loadmodel->texturepool = R_AllocTexturePool();
 
-       for ( i=0 ; i<count ; i++, in++, out++)
+       if (bytesperpixel == 4)
        {
-               for (j=0 ; j<3 ; j++)
+               for (i = 0;i < 128;i++)
                {
-                       out->mins[j] = LittleShort (in->mins[j]);
-                       out->maxs[j] = LittleShort (in->maxs[j]);
+                       for (j = 0;j < 128;j++)
+                       {
+                               solidpixels[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
+                               alphapixels[(i*128) + j] = ((unsigned *)src)[i*256+j];
+                       }
                }
-
-               p = LittleLong(in->planenum);
-               out->plane = loadmodel->planes + p;
-
-               out->firstsurface = LittleShort (in->firstface);
-               out->numsurfaces = LittleShort (in->numfaces);
-
-               for (j=0 ; j<2 ; j++)
+       }
+       else
+       {
+               // make an average value for the back to avoid
+               // a fringe on the top level
+               int p, r, g, b;
+               union
                {
-                       p = LittleShort (in->children[j]);
-                       if (p >= 0)
-                               out->children[j] = loadmodel->nodes + p;
-                       else
-                               out->children[j] = (mnode_t *)(loadmodel->leafs + (-1 - p));
+                       unsigned int i;
+                       unsigned char b[4];
+               }
+               bgra;
+               r = g = b = 0;
+               for (i = 0;i < 128;i++)
+               {
+                       for (j = 0;j < 128;j++)
+                       {
+                               p = src[i*256 + j + 128];
+                               r += palette_rgb[p][0];
+                               g += palette_rgb[p][1];
+                               b += palette_rgb[p][2];
+                       }
+               }
+               bgra.b[2] = r/(128*128);
+               bgra.b[1] = g/(128*128);
+               bgra.b[0] = b/(128*128);
+               bgra.b[3] = 0;
+               for (i = 0;i < 128;i++)
+               {
+                       for (j = 0;j < 128;j++)
+                       {
+                               solidpixels[(i*128) + j] = palette_bgra_complete[src[i*256 + j + 128]];
+                               p = src[i*256 + j];
+                               alphapixels[(i*128) + j] = p ? palette_bgra_complete[p] : bgra.i;
+                       }
                }
        }
 
-       Mod_SetParent (loadmodel->nodes, NULL); // sets nodes and leafs
+       loadmodel->brush.solidskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_solidtexture", 128, 128, (unsigned char *) solidpixels, TEXTYPE_BGRA, TEXF_PRECACHE, NULL);
+       loadmodel->brush.alphaskytexture = R_LoadTexture2D(loadmodel->texturepool, "sky_alphatexture", 128, 128, (unsigned char *) alphapixels, TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
 
-/*
-=================
-Mod_LoadLeafs
-=================
-*/
-static void Mod_LoadLeafs (lump_t *l)
+static void Mod_Q1BSP_LoadTextures(lump_t *l)
 {
-       dleaf_t         *in;
-       mleaf_t         *out;
-       int                     i, j, count, p;
+       int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
+       skinframe_t *skinframe;
+       miptex_t *dmiptex;
+       texture_t *tx, *tx2, *anims[10], *altanims[10];
+       dmiptexlump_t *m;
+       unsigned char *data, *mtdata;
+       const char *s;
+       char mapname[MAX_QPATH], name[MAX_QPATH];
+       unsigned char zero[4];
 
-       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));
+       memset(zero, 0, sizeof(zero));
 
-       loadmodel->leafs = out;
-       loadmodel->numleafs = count;
+       loadmodel->data_textures = NULL;
 
-       for ( i=0 ; i<count ; i++, in++, out++)
+       // add two slots for notexture walls and notexture liquids
+       if (l->filelen)
        {
-               for (j=0 ; j<3 ; j++)
-               {
-                       out->mins[j] = LittleShort (in->mins[j]);
-                       out->maxs[j] = LittleShort (in->maxs[j]);
-               }
-
-               p = LittleLong(in->contents);
-               out->contents = p;
-
-               out->firstmarksurface = loadmodel->marksurfaces +
-                       LittleShort(in->firstmarksurface);
-               out->nummarksurfaces = LittleShort(in->nummarksurfaces);
-
-               p = LittleLong(in->visofs);
-               if (p == -1)
-                       out->compressed_vis = NULL;
-               else
-                       out->compressed_vis = loadmodel->visdata + p;
+               m = (dmiptexlump_t *)(mod_base + l->fileofs);
+               m->nummiptex = LittleLong (m->nummiptex);
+               loadmodel->num_textures = m->nummiptex + 2;
+               loadmodel->num_texturesperskin = loadmodel->num_textures;
+       }
+       else
+       {
+               m = NULL;
+               loadmodel->num_textures = 2;
+               loadmodel->num_texturesperskin = loadmodel->num_textures;
+       }
 
-               for (j=0 ; j<4 ; j++)
-                       out->ambient_sound_level[j] = in->ambient_level[j];
+       loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_textures * sizeof(texture_t));
+
+       // fill out all slots with notexture
+       if (cls.state != ca_dedicated)
+               skinframe = R_SkinFrame_LoadMissing();
+       else
+               skinframe = NULL;
+       for (i = 0, tx = loadmodel->data_textures;i < loadmodel->num_textures;i++, tx++)
+       {
+               strlcpy(tx->name, "NO TEXTURE FOUND", sizeof(tx->name));
+               tx->width = 16;
+               tx->height = 16;
+               if (cls.state != ca_dedicated)
+               {
+                       tx->numskinframes = 1;
+                       tx->skinframerate = 1;
+                       tx->skinframes[0] = skinframe;
+                       tx->currentskinframe = tx->skinframes[0];
+               }
+               tx->basematerialflags = MATERIALFLAG_WALL;
+               if (i == loadmodel->num_textures - 1)
+               {
+                       tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW;
+                       tx->supercontents = mod_q1bsp_texture_water.supercontents;
+                       tx->surfaceflags = mod_q1bsp_texture_water.surfaceflags;
+               }
+               else
+               {
+                       tx->supercontents = mod_q1bsp_texture_solid.supercontents;
+                       tx->surfaceflags = mod_q1bsp_texture_solid.surfaceflags;
+               }
+               tx->currentframe = tx;
+
+               // clear water settings
+               tx->reflectmin = 0;
+               tx->reflectmax = 1;
+               tx->refractfactor = 1;
+               Vector4Set(tx->refractcolor4f, 1, 1, 1, 1);
+               tx->reflectfactor = 1;
+               Vector4Set(tx->reflectcolor4f, 1, 1, 1, 1);
+               tx->r_water_wateralpha = 1;
+       }
+
+       if (!m)
+       {
+               Con_Printf("%s: no miptex lump to load textures from\n", loadmodel->name);
+               return;
+       }
+
+       s = loadmodel->name;
+       if (!strncasecmp(s, "maps/", 5))
+               s += 5;
+       FS_StripExtension(s, mapname, sizeof(mapname));
+
+       // just to work around bounds checking when debugging with it (array index out of bounds error thing)
+       dofs = m->dataofs;
+       // LordHavoc: mostly rewritten map texture loader
+       for (i = 0;i < m->nummiptex;i++)
+       {
+               dofs[i] = LittleLong(dofs[i]);
+               if (r_nosurftextures.integer)
+                       continue;
+               if (dofs[i] == -1)
+               {
+                       Con_DPrintf("%s: miptex #%i missing\n", loadmodel->name, i);
+                       continue;
+               }
+               dmiptex = (miptex_t *)((unsigned char *)m + dofs[i]);
+
+               // copy name, but only up to 16 characters
+               // (the output buffer can hold more than this, but the input buffer is
+               //  only 16)
+               for (j = 0;j < 16 && dmiptex->name[j];j++)
+                       name[j] = dmiptex->name[j];
+               name[j] = 0;
+
+               if (!name[0])
+               {
+                       dpsnprintf(name, sizeof(name), "unnamed%i", i);
+                       Con_DPrintf("%s: warning: renaming unnamed texture to %s\n", loadmodel->name, name);
+               }
+
+               mtwidth = LittleLong(dmiptex->width);
+               mtheight = LittleLong(dmiptex->height);
+               mtdata = NULL;
+               j = LittleLong(dmiptex->offsets[0]);
+               if (j)
+               {
+                       // texture included
+                       if (j < 40 || j + mtwidth * mtheight > l->filelen)
+                       {
+                               Con_Printf("%s: Texture \"%s\" is corrupt or incomplete\n", loadmodel->name, dmiptex->name);
+                               continue;
+                       }
+                       mtdata = (unsigned char *)dmiptex + j;
+               }
+
+               if ((mtwidth & 15) || (mtheight & 15))
+                       Con_DPrintf("%s: warning: texture \"%s\" is not 16 aligned\n", loadmodel->name, dmiptex->name);
+
+               // LordHavoc: force all names to lowercase
+               for (j = 0;name[j];j++)
+                       if (name[j] >= 'A' && name[j] <= 'Z')
+                               name[j] += 'a' - 'A';
+
+               if (dmiptex->name[0] && Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, name, false, false, 0))
+                       continue;
+
+               tx = loadmodel->data_textures + i;
+               strlcpy(tx->name, name, sizeof(tx->name));
+               tx->width = mtwidth;
+               tx->height = mtheight;
+
+               if (tx->name[0] == '*')
+               {
+                       if (!strncmp(tx->name, "*lava", 5))
+                       {
+                               tx->supercontents = mod_q1bsp_texture_lava.supercontents;
+                               tx->surfaceflags = mod_q1bsp_texture_lava.surfaceflags;
+                       }
+                       else if (!strncmp(tx->name, "*slime", 6))
+                       {
+                               tx->supercontents = mod_q1bsp_texture_slime.supercontents;
+                               tx->surfaceflags = mod_q1bsp_texture_slime.surfaceflags;
+                       }
+                       else
+                       {
+                               tx->supercontents = mod_q1bsp_texture_water.supercontents;
+                               tx->surfaceflags = mod_q1bsp_texture_water.surfaceflags;
+                       }
+               }
+               else if (!strncmp(tx->name, "sky", 3))
+               {
+                       tx->supercontents = mod_q1bsp_texture_sky.supercontents;
+                       tx->surfaceflags = mod_q1bsp_texture_sky.surfaceflags;
+               }
+               else
+               {
+                       tx->supercontents = mod_q1bsp_texture_solid.supercontents;
+                       tx->surfaceflags = mod_q1bsp_texture_solid.surfaceflags;
+               }
+
+               if (cls.state != ca_dedicated)
+               {
+                       // LordHavoc: HL sky textures are entirely different than quake
+                       if (!loadmodel->brush.ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
+                       {
+                               data = loadimagepixelsbgra(tx->name, false, false);
+                               if (data && image_width == 256 && image_height == 128)
+                               {
+                                       R_Q1BSP_LoadSplitSky(data, image_width, image_height, 4);
+                                       Mem_Free(data);
+                               }
+                               else if (mtdata != NULL)
+                                       R_Q1BSP_LoadSplitSky(mtdata, mtwidth, mtheight, 1);
+                       }
+                       else
+                       {
+                               skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
+                               if (!skinframe)
+                                       skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false);
+                               if (!skinframe)
+                               {
+                                       // did not find external texture, load it from the bsp or wad3
+                                       if (loadmodel->brush.ishlbsp)
+                                       {
+                                               // internal texture overrides wad
+                                               unsigned char *pixels, *freepixels;
+                                               pixels = freepixels = NULL;
+                                               if (mtdata)
+                                                       pixels = W_ConvertWAD3TextureBGRA(dmiptex);
+                                               if (pixels == NULL)
+                                                       pixels = freepixels = W_GetTextureBGRA(tx->name);
+                                               if (pixels != NULL)
+                                               {
+                                                       tx->width = image_width;
+                                                       tx->height = image_height;
+                                                       skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), pixels, image_width, image_height);
+                                               }
+                                               if (freepixels)
+                                                       Mem_Free(freepixels);
+                                       }
+                                       else if (mtdata) // texture included
+                                               skinframe = R_SkinFrame_LoadInternalQuake(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false, r_fullbrights.integer, mtdata, tx->width, tx->height);
+                               }
+                               // if skinframe is still NULL the "missing" texture will be used
+                               if (skinframe)
+                                       tx->skinframes[0] = skinframe;
+                       }
+
+                       tx->basematerialflags = MATERIALFLAG_WALL;
+                       if (tx->name[0] == '*')
+                       {
+                               // LordHavoc: some turbulent textures should not be affected by wateralpha
+                               if (!strncmp(tx->name, "*glassmirror", 12)) // Tenebrae
+                               {
+                                       // replace the texture with transparent black
+                                       Vector4Set(zero, 128, 128, 128, 128);
+                                       tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_PRECACHE | TEXF_ALPHA, zero, 1, 1);
+                                       tx->basematerialflags |= MATERIALFLAG_NOSHADOW | MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_REFLECTION;
+                               }
+                               else if (!strncmp(tx->name,"*lava",5)
+                                || !strncmp(tx->name,"*teleport",9)
+                                || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
+                                       tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW;
+                               else
+                                       tx->basematerialflags |= MATERIALFLAG_WATERSCROLL | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW | MATERIALFLAG_WATERALPHA | MATERIALFLAG_WATERSHADER;
+                               if (tx->skinframes[0] && tx->skinframes[0]->fog)
+                                       tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+                       }
+                       else if (!strncmp(tx->name, "mirror", 6)) // Tenebrae
+                       {
+                               // replace the texture with black
+                               tx->skinframes[0] = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_PRECACHE, zero, 1, 1);
+                               tx->basematerialflags |= MATERIALFLAG_REFLECTION;
+                       }
+                       else if (!strncmp(tx->name, "sky", 3))
+                               tx->basematerialflags = MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW;
+                       else if (!strcmp(tx->name, "caulk"))
+                               tx->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
+                       else if (tx->skinframes[0] && tx->skinframes[0]->fog)
+                               tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+
+                       // start out with no animation
+                       tx->currentframe = tx;
+                       tx->currentskinframe = tx->skinframes[0];
+               }
+       }
+
+       // sequence the animations
+       for (i = 0;i < m->nummiptex;i++)
+       {
+               tx = loadmodel->data_textures + i;
+               if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
+                       continue;
+               if (tx->anim_total[0] || tx->anim_total[1])
+                       continue;       // already sequenced
+
+               // find the number of frames in the animation
+               memset(anims, 0, sizeof(anims));
+               memset(altanims, 0, sizeof(altanims));
+
+               for (j = i;j < m->nummiptex;j++)
+               {
+                       tx2 = loadmodel->data_textures + j;
+                       if (!tx2 || tx2->name[0] != '+' || strcmp(tx2->name+2, tx->name+2))
+                               continue;
+
+                       num = tx2->name[1];
+                       if (num >= '0' && num <= '9')
+                               anims[num - '0'] = tx2;
+                       else if (num >= 'a' && num <= 'j')
+                               altanims[num - 'a'] = tx2;
+                       else
+                               Con_Printf("Bad animating texture %s\n", tx->name);
+               }
+
+               max = altmax = 0;
+               for (j = 0;j < 10;j++)
+               {
+                       if (anims[j])
+                               max = j + 1;
+                       if (altanims[j])
+                               altmax = j + 1;
+               }
+               //Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
+
+               incomplete = false;
+               for (j = 0;j < max;j++)
+               {
+                       if (!anims[j])
+                       {
+                               Con_Printf("Missing frame %i of %s\n", j, tx->name);
+                               incomplete = true;
+                       }
+               }
+               for (j = 0;j < altmax;j++)
+               {
+                       if (!altanims[j])
+                       {
+                               Con_Printf("Missing altframe %i of %s\n", j, tx->name);
+                               incomplete = true;
+                       }
+               }
+               if (incomplete)
+                       continue;
+
+               if (altmax < 1)
+               {
+                       // if there is no alternate animation, duplicate the primary
+                       // animation into the alternate
+                       altmax = max;
+                       for (k = 0;k < 10;k++)
+                               altanims[k] = anims[k];
+               }
+
+               // link together the primary animation
+               for (j = 0;j < max;j++)
+               {
+                       tx2 = anims[j];
+                       tx2->animated = true;
+                       tx2->anim_total[0] = max;
+                       tx2->anim_total[1] = altmax;
+                       for (k = 0;k < 10;k++)
+                       {
+                               tx2->anim_frames[0][k] = anims[k];
+                               tx2->anim_frames[1][k] = altanims[k];
+                       }
+               }
+
+               // if there really is an alternate anim...
+               if (anims[0] != altanims[0])
+               {
+                       // link together the alternate animation
+                       for (j = 0;j < altmax;j++)
+                       {
+                               tx2 = altanims[j];
+                               tx2->animated = true;
+                               // the primary/alternate are reversed here
+                               tx2->anim_total[0] = altmax;
+                               tx2->anim_total[1] = max;
+                               for (k = 0;k < 10;k++)
+                               {
+                                       tx2->anim_frames[0][k] = altanims[k];
+                                       tx2->anim_frames[1][k] = anims[k];
+                               }
+                       }
+               }
+       }
+}
+
+static void Mod_Q1BSP_LoadLighting(lump_t *l)
+{
+       int i;
+       unsigned char *in, *out, *data, d;
+       char litfilename[MAX_QPATH];
+       char dlitfilename[MAX_QPATH];
+       fs_offset_t filesize;
+       if (loadmodel->brush.ishlbsp) // LordHavoc: load the colored lighting data straight
+       {
+               loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen);
+               for (i=0; i<l->filelen; i++)
+                       loadmodel->brushq1.lightdata[i] = mod_base[l->fileofs+i] >>= 1;
+       }
+       else // LordHavoc: bsp version 29 (normal white lighting)
+       {
+               // LordHavoc: hope is not lost yet, check for a .lit file to load
+               strlcpy (litfilename, loadmodel->name, sizeof (litfilename));
+               FS_StripExtension (litfilename, litfilename, sizeof (litfilename));
+               strlcpy (dlitfilename, litfilename, sizeof (dlitfilename));
+               strlcat (litfilename, ".lit", sizeof (litfilename));
+               strlcat (dlitfilename, ".dlit", sizeof (dlitfilename));
+               data = (unsigned char*) FS_LoadFile(litfilename, tempmempool, false, &filesize);
+               if (data)
+               {
+                       if (filesize == (fs_offset_t)(8 + l->filelen * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+                       {
+                               i = LittleLong(((int *)data)[1]);
+                               if (i == 1)
+                               {
+                                       if (developer_loading.integer)
+                                               Con_Printf("loaded %s\n", litfilename);
+                                       loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, filesize - 8);
+                                       memcpy(loadmodel->brushq1.lightdata, data + 8, filesize - 8);
+                                       Mem_Free(data);
+                                       data = (unsigned char*) FS_LoadFile(dlitfilename, tempmempool, false, &filesize);
+                                       if (data)
+                                       {
+                                               if (filesize == (fs_offset_t)(8 + l->filelen * 3) && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+                                               {
+                                                       i = LittleLong(((int *)data)[1]);
+                                                       if (i == 1)
+                                                       {
+                                                               if (developer_loading.integer)
+                                                                       Con_Printf("loaded %s\n", dlitfilename);
+                                                               loadmodel->brushq1.nmaplightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, filesize - 8);
+                                                               memcpy(loadmodel->brushq1.nmaplightdata, data + 8, filesize - 8);
+                                                               loadmodel->brushq3.deluxemapping_modelspace = false;
+                                                               loadmodel->brushq3.deluxemapping = true;
+                                                       }
+                                               }
+                                               Mem_Free(data);
+                                               data = NULL;
+                                       }
+                                       return;
+                               }
+                               else
+                                       Con_Printf("Unknown .lit file version (%d)\n", i);
+                       }
+                       else if (filesize == 8)
+                               Con_Print("Empty .lit file, ignoring\n");
+                       else
+                               Con_Printf("Corrupt .lit file (file size %i bytes, should be %i bytes), ignoring\n", (int) filesize, (int) (8 + l->filelen * 3));
+                       if (data)
+                       {
+                               Mem_Free(data);
+                               data = NULL;
+                       }
+               }
+               // LordHavoc: oh well, expand the white lighting data
+               if (!l->filelen)
+                       return;
+               loadmodel->brushq1.lightdata = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen*3);
+               in = mod_base + l->fileofs;
+               out = loadmodel->brushq1.lightdata;
+               for (i = 0;i < l->filelen;i++)
+               {
+                       d = *in++;
+                       *out++ = d;
+                       *out++ = d;
+                       *out++ = d;
+               }
+       }
+}
+
+static void Mod_Q1BSP_LoadVisibility(lump_t *l)
+{
+       loadmodel->brushq1.num_compressedpvs = 0;
+       loadmodel->brushq1.data_compressedpvs = NULL;
+       if (!l->filelen)
+               return;
+       loadmodel->brushq1.num_compressedpvs = l->filelen;
+       loadmodel->brushq1.data_compressedpvs = (unsigned char *)Mem_Alloc(loadmodel->mempool, l->filelen);
+       memcpy(loadmodel->brushq1.data_compressedpvs, mod_base + l->fileofs, l->filelen);
+}
+
+// used only for HalfLife maps
+static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data)
+{
+       char key[128], value[4096];
+       int i, j, k;
+       if (!data)
+               return;
+       if (!COM_ParseToken_Simple(&data, false, false))
+               return; // error
+       if (com_token[0] != '{')
+               return; // error
+       while (1)
+       {
+               if (!COM_ParseToken_Simple(&data, false, false))
+                       return; // error
+               if (com_token[0] == '}')
+                       break; // end of worldspawn
+               if (com_token[0] == '_')
+                       strlcpy(key, com_token + 1, sizeof(key));
+               else
+                       strlcpy(key, com_token, sizeof(key));
+               while (key[strlen(key)-1] == ' ') // remove trailing spaces
+                       key[strlen(key)-1] = 0;
+               if (!COM_ParseToken_Simple(&data, false, false))
+                       return; // error
+               dpsnprintf(value, sizeof(value), "%s", com_token);
+               if (!strcmp("wad", key)) // for HalfLife maps
+               {
+                       if (loadmodel->brush.ishlbsp)
+                       {
+                               j = 0;
+                               for (i = 0;i < (int)sizeof(value);i++)
+                                       if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
+                                               break;
+                               if (value[i])
+                               {
+                                       for (;i < (int)sizeof(value);i++)
+                                       {
+                                               // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
+                                               if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
+                                                       j = i+1;
+                                               else if (value[i] == ';' || value[i] == 0)
+                                               {
+                                                       k = value[i];
+                                                       value[i] = 0;
+                                                       W_LoadTextureWadFile(&value[j], false);
+                                                       j = i+1;
+                                                       if (!k)
+                                                               break;
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+}
+
+static void Mod_Q1BSP_LoadEntities(lump_t *l)
+{
+       loadmodel->brush.entities = NULL;
+       if (!l->filelen)
+               return;
+       loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1);
+       memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen);
+       loadmodel->brush.entities[l->filelen] = 0;
+       if (loadmodel->brush.ishlbsp)
+               Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->brush.entities);
+}
+
+
+static void Mod_Q1BSP_LoadVertexes(lump_t *l)
+{
+       dvertex_t       *in;
+       mvertex_t       *out;
+       int                     i, count;
+
+       in = (dvertex_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadVertexes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mvertex_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+
+       loadmodel->brushq1.vertexes = out;
+       loadmodel->brushq1.numvertexes = count;
+
+       for ( i=0 ; i<count ; i++, in++, out++)
+       {
+               out->position[0] = LittleFloat(in->point[0]);
+               out->position[1] = LittleFloat(in->point[1]);
+               out->position[2] = LittleFloat(in->point[2]);
+       }
+}
+
+// The following two functions should be removed and MSG_* or SZ_* function sets adjusted so they
+// can be used for this
+// REMOVEME
+int SB_ReadInt (unsigned char **buffer)
+{
+       int     i;
+       i = ((*buffer)[0]) + 256*((*buffer)[1]) + 65536*((*buffer)[2]) + 16777216*((*buffer)[3]);
+       (*buffer) += 4;
+       return i;
+}
+
+// REMOVEME
+float SB_ReadFloat (unsigned char **buffer)
+{
+       union
+       {
+               int             i;
+               float   f;
+       } u;
+
+       u.i = SB_ReadInt (buffer);
+       return u.f;
+}
+
+static void Mod_Q1BSP_LoadSubmodels(lump_t *l, hullinfo_t *hullinfo)
+{
+       unsigned char           *index;
+       dmodel_t        *out;
+       int                     i, j, count;
+
+       index = (unsigned char *)(mod_base + l->fileofs);
+       if (l->filelen % (48+4*hullinfo->filehulls))
+               Host_Error ("Mod_Q1BSP_LoadSubmodels: funny lump size in %s", loadmodel->name);
+
+       count = l->filelen / (48+4*hullinfo->filehulls);
+       out = (dmodel_t *)Mem_Alloc (loadmodel->mempool, count*sizeof(*out));
+
+       loadmodel->brushq1.submodels = out;
+       loadmodel->brush.numsubmodels = count;
+
+       for (i = 0; i < count; i++, out++)
+       {
+       // spread out the mins / maxs by a pixel
+               out->mins[0] = SB_ReadFloat (&index) - 1;
+               out->mins[1] = SB_ReadFloat (&index) - 1;
+               out->mins[2] = SB_ReadFloat (&index) - 1;
+               out->maxs[0] = SB_ReadFloat (&index) + 1;
+               out->maxs[1] = SB_ReadFloat (&index) + 1;
+               out->maxs[2] = SB_ReadFloat (&index) + 1;
+               out->origin[0] = SB_ReadFloat (&index);
+               out->origin[1] = SB_ReadFloat (&index);
+               out->origin[2] = SB_ReadFloat (&index);
+               for (j = 0; j < hullinfo->filehulls; j++)
+                       out->headnode[j] = SB_ReadInt (&index);
+               out->visleafs = SB_ReadInt (&index);
+               out->firstface = SB_ReadInt (&index);
+               out->numfaces = SB_ReadInt (&index);
+       }
+}
+
+static void Mod_Q1BSP_LoadEdges(lump_t *l)
+{
+       dedge_t *in;
+       medge_t *out;
+       int     i, count;
+
+       in = (dedge_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadEdges: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (medge_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+       loadmodel->brushq1.edges = out;
+       loadmodel->brushq1.numedges = count;
+
+       for ( i=0 ; i<count ; i++, in++, out++)
+       {
+               out->v[0] = (unsigned short)LittleShort(in->v[0]);
+               out->v[1] = (unsigned short)LittleShort(in->v[1]);
+               if (out->v[0] >= loadmodel->brushq1.numvertexes || out->v[1] >= loadmodel->brushq1.numvertexes)
+               {
+                       Con_Printf("Mod_Q1BSP_LoadEdges: %s has invalid vertex indices in edge %i (vertices %i %i >= numvertices %i)\n", loadmodel->name, i, out->v[0], out->v[1], loadmodel->brushq1.numvertexes);
+                       out->v[0] = 0;
+                       out->v[1] = 0;
+               }
+       }
+}
+
+static void Mod_Q1BSP_LoadTexinfo(lump_t *l)
+{
+       texinfo_t *in;
+       mtexinfo_t *out;
+       int i, j, k, count, miptex;
+
+       in = (texinfo_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadTexinfo: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mtexinfo_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+       loadmodel->brushq1.texinfo = out;
+       loadmodel->brushq1.numtexinfo = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               for (k = 0;k < 2;k++)
+                       for (j = 0;j < 4;j++)
+                               out->vecs[k][j] = LittleFloat(in->vecs[k][j]);
+
+               miptex = LittleLong(in->miptex);
+               out->flags = LittleLong(in->flags);
+
+               out->texture = NULL;
+               if (loadmodel->data_textures)
+               {
+                       if ((unsigned int) miptex >= (unsigned int) loadmodel->num_textures)
+                               Con_Printf("error in model \"%s\": invalid miptex index %i(of %i)\n", loadmodel->name, miptex, loadmodel->num_textures);
+                       else
+                               out->texture = loadmodel->data_textures + miptex;
+               }
+               if (out->flags & TEX_SPECIAL)
+               {
+                       // if texture chosen is NULL or the shader needs a lightmap,
+                       // force to notexture water shader
+                       if (out->texture == NULL)
+                               out->texture = loadmodel->data_textures + (loadmodel->num_textures - 1);
+               }
+               else
+               {
+                       // if texture chosen is NULL, force to notexture
+                       if (out->texture == NULL)
+                               out->texture = loadmodel->data_textures + (loadmodel->num_textures - 2);
+               }
+       }
+}
+
+#if 0
+void BoundPoly(int numverts, float *verts, vec3_t mins, vec3_t maxs)
+{
+       int             i, j;
+       float   *v;
+
+       mins[0] = mins[1] = mins[2] = 9999;
+       maxs[0] = maxs[1] = maxs[2] = -9999;
+       v = verts;
+       for (i = 0;i < numverts;i++)
+       {
+               for (j = 0;j < 3;j++, v++)
+               {
+                       if (*v < mins[j])
+                               mins[j] = *v;
+                       if (*v > maxs[j])
+                               maxs[j] = *v;
+               }
+       }
+}
+
+#define MAX_SUBDIVPOLYTRIANGLES 4096
+#define MAX_SUBDIVPOLYVERTS(MAX_SUBDIVPOLYTRIANGLES * 3)
+
+static int subdivpolyverts, subdivpolytriangles;
+static int subdivpolyindex[MAX_SUBDIVPOLYTRIANGLES][3];
+static float subdivpolyvert[MAX_SUBDIVPOLYVERTS][3];
+
+static int subdivpolylookupvert(vec3_t v)
+{
+       int i;
+       for (i = 0;i < subdivpolyverts;i++)
+               if (subdivpolyvert[i][0] == v[0]
+                && subdivpolyvert[i][1] == v[1]
+                && subdivpolyvert[i][2] == v[2])
+                       return i;
+       if (subdivpolyverts >= MAX_SUBDIVPOLYVERTS)
+               Host_Error("SubDividePolygon: ran out of vertices in buffer, please increase your r_subdivide_size");
+       VectorCopy(v, subdivpolyvert[subdivpolyverts]);
+       return subdivpolyverts++;
+}
+
+static void SubdividePolygon(int numverts, float *verts)
+{
+       int             i, i1, i2, i3, f, b, c, p;
+       vec3_t  mins, maxs, front[256], back[256];
+       float   m, *pv, *cv, dist[256], frac;
+
+       if (numverts > 250)
+               Host_Error("SubdividePolygon: ran out of verts in buffer");
+
+       BoundPoly(numverts, verts, mins, maxs);
+
+       for (i = 0;i < 3;i++)
+       {
+               m = (mins[i] + maxs[i]) * 0.5;
+               m = r_subdivide_size.value * floor(m/r_subdivide_size.value + 0.5);
+               if (maxs[i] - m < 8)
+                       continue;
+               if (m - mins[i] < 8)
+                       continue;
+
+               // cut it
+               for (cv = verts, c = 0;c < numverts;c++, cv += 3)
+                       dist[c] = cv[i] - m;
+
+               f = b = 0;
+               for (p = numverts - 1, c = 0, pv = verts + p * 3, cv = verts;c < numverts;p = c, c++, pv = cv, cv += 3)
+               {
+                       if (dist[p] >= 0)
+                       {
+                               VectorCopy(pv, front[f]);
+                               f++;
+                       }
+                       if (dist[p] <= 0)
+                       {
+                               VectorCopy(pv, back[b]);
+                               b++;
+                       }
+                       if (dist[p] == 0 || dist[c] == 0)
+                               continue;
+                       if ((dist[p] > 0) != (dist[c] > 0) )
+                       {
+                               // clip point
+                               frac = dist[p] / (dist[p] - dist[c]);
+                               front[f][0] = back[b][0] = pv[0] + frac * (cv[0] - pv[0]);
+                               front[f][1] = back[b][1] = pv[1] + frac * (cv[1] - pv[1]);
+                               front[f][2] = back[b][2] = pv[2] + frac * (cv[2] - pv[2]);
+                               f++;
+                               b++;
+                       }
+               }
+
+               SubdividePolygon(f, front[0]);
+               SubdividePolygon(b, back[0]);
+               return;
+       }
+
+       i1 = subdivpolylookupvert(verts);
+       i2 = subdivpolylookupvert(verts + 3);
+       for (i = 2;i < numverts;i++)
+       {
+               if (subdivpolytriangles >= MAX_SUBDIVPOLYTRIANGLES)
+               {
+                       Con_Print("SubdividePolygon: ran out of triangles in buffer, please increase your r_subdivide_size\n");
+                       return;
+               }
+
+               i3 = subdivpolylookupvert(verts + i * 3);
+               subdivpolyindex[subdivpolytriangles][0] = i1;
+               subdivpolyindex[subdivpolytriangles][1] = i2;
+               subdivpolyindex[subdivpolytriangles][2] = i3;
+               i2 = i3;
+               subdivpolytriangles++;
+       }
+}
+
+//Breaks a polygon up along axial 64 unit
+//boundaries so that turbulent and sky warps
+//can be done reasonably.
+static void Mod_Q1BSP_GenerateWarpMesh(msurface_t *surface)
+{
+       int i, j;
+       surfvertex_t *v;
+       surfmesh_t *mesh;
+
+       subdivpolytriangles = 0;
+       subdivpolyverts = 0;
+       SubdividePolygon(surface->num_vertices, (surface->mesh->data_vertex3f + 3 * surface->num_firstvertex));
+       if (subdivpolytriangles < 1)
+               Host_Error("Mod_Q1BSP_GenerateWarpMesh: no triangles?");
+
+       surface->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
+       mesh->num_vertices = subdivpolyverts;
+       mesh->num_triangles = subdivpolytriangles;
+       mesh->vertex = (surfvertex_t *)(mesh + 1);
+       mesh->index = (int *)(mesh->vertex + mesh->num_vertices);
+       memset(mesh->vertex, 0, mesh->num_vertices * sizeof(surfvertex_t));
+
+       for (i = 0;i < mesh->num_triangles;i++)
+               for (j = 0;j < 3;j++)
+                       mesh->index[i*3+j] = subdivpolyindex[i][j];
+
+       for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
+       {
+               VectorCopy(subdivpolyvert[i], v->v);
+               v->st[0] = DotProduct(v->v, surface->lightmapinfo->texinfo->vecs[0]);
+               v->st[1] = DotProduct(v->v, surface->lightmapinfo->texinfo->vecs[1]);
+       }
+}
+#endif
+
+/* Maximum size of a single LM */
+#define MAX_SINGLE_LM_SIZE    256
+
+struct alloc_lm_row
+{
+       int rowY;
+       int currentX;
+};
+
+struct alloc_lm_state
+{
+       int currentY;
+       struct alloc_lm_row rows[MAX_SINGLE_LM_SIZE];
+};
+
+static void init_alloc_lm_state (struct alloc_lm_state* state)
+{
+       int r;
+
+       state->currentY = 0;
+       for (r = 0; r < MAX_SINGLE_LM_SIZE; r++)
+       {
+         state->rows[r].currentX = 0;
+         state->rows[r].rowY = -1;
+       }
+}
+
+static qboolean Mod_Q1BSP_AllocLightmapBlock(struct alloc_lm_state* state, int totalwidth, int totalheight, int blockwidth, int blockheight, int *outx, int *outy)
+{
+       struct alloc_lm_row* row;
+       int r;
+
+       row = &(state->rows[blockheight]);
+       if ((row->rowY < 0) || (row->currentX + blockwidth > totalwidth))
+       {
+               if (state->currentY + blockheight <= totalheight)
+               {
+                       row->rowY = state->currentY;
+                       row->currentX = 0;
+                       state->currentY += blockheight;
+               }
+               else
+               {
+                       /* See if we can stuff the block into a higher row */
+                       row = NULL;
+                       for (r = blockheight; r < MAX_SINGLE_LM_SIZE; r++)
+                       {
+                               if ((state->rows[r].rowY >= 0)
+                                 && (state->rows[r].currentX + blockwidth <= totalwidth))
+                               {
+                                       row = &(state->rows[r]);
+                                       break;
+                               }
+                       }
+                       if (row == NULL) return false;
+               }
+       }
+       *outy = row->rowY;
+       *outx = row->currentX;
+       row->currentX += blockwidth;
+
+       return true;
+}
+
+extern cvar_t gl_max_size;
+static void Mod_Q1BSP_LoadFaces(lump_t *l)
+{
+       dface_t *in;
+       msurface_t *surface;
+       int i, j, count, surfacenum, planenum, smax, tmax, ssize, tsize, firstedge, numedges, totalverts, totaltris, lightmapnumber, lightmapsize, totallightmapsamples;
+       float texmins[2], texmaxs[2], val;
+       rtexture_t *lightmaptexture, *deluxemaptexture;
+
+       in = (dface_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadFaces: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       loadmodel->data_surfaces = (msurface_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_t));
+       loadmodel->data_surfaces_lightmapinfo = (msurface_lightmapinfo_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(msurface_lightmapinfo_t));
+
+       loadmodel->num_surfaces = count;
+
+       loadmodel->brushq1.lightmapupdateflags = (unsigned char *)Mem_Alloc(loadmodel->mempool, count*sizeof(unsigned char));
+
+       totalverts = 0;
+       totaltris = 0;
+       for (surfacenum = 0, in = (dface_t *)(mod_base + l->fileofs);surfacenum < count;surfacenum++, in++)
+       {
+               numedges = (unsigned short)LittleShort(in->numedges);
+               totalverts += numedges;
+               totaltris += numedges - 2;
+       }
+
+       Mod_AllocSurfMesh(loadmodel->mempool, totalverts, totaltris, true, false, false);
+
+       lightmaptexture = NULL;
+       deluxemaptexture = r_texture_blanknormalmap;
+       lightmapnumber = 1;
+       lightmapsize = max(256, gl_max_size.integer);
+       totallightmapsamples = 0;
+
+       totalverts = 0;
+       totaltris = 0;
+       for (surfacenum = 0, in = (dface_t *)(mod_base + l->fileofs), surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, in++, surface++)
+       {
+               surface->lightmapinfo = loadmodel->data_surfaces_lightmapinfo + surfacenum;
+
+               // FIXME: validate edges, texinfo, etc?
+               firstedge = LittleLong(in->firstedge);
+               numedges = (unsigned short)LittleShort(in->numedges);
+               if ((unsigned int) firstedge > (unsigned int) loadmodel->brushq1.numsurfedges || (unsigned int) numedges > (unsigned int) loadmodel->brushq1.numsurfedges || (unsigned int) firstedge + (unsigned int) numedges > (unsigned int) loadmodel->brushq1.numsurfedges)
+                       Host_Error("Mod_Q1BSP_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)", firstedge, numedges, loadmodel->brushq1.numsurfedges);
+               i = (unsigned short)LittleShort(in->texinfo);
+               if ((unsigned int) i >= (unsigned int) loadmodel->brushq1.numtexinfo)
+                       Host_Error("Mod_Q1BSP_LoadFaces: invalid texinfo index %i(model has %i texinfos)", i, loadmodel->brushq1.numtexinfo);
+               surface->lightmapinfo->texinfo = loadmodel->brushq1.texinfo + i;
+               surface->texture = surface->lightmapinfo->texinfo->texture;
+
+               planenum = (unsigned short)LittleShort(in->planenum);
+               if ((unsigned int) planenum >= (unsigned int) loadmodel->brush.num_planes)
+                       Host_Error("Mod_Q1BSP_LoadFaces: invalid plane index %i (model has %i planes)", planenum, loadmodel->brush.num_planes);
+
+               //surface->flags = surface->texture->flags;
+               //if (LittleShort(in->side))
+               //      surface->flags |= SURF_PLANEBACK;
+               //surface->plane = loadmodel->brush.data_planes + planenum;
+
+               surface->num_firstvertex = totalverts;
+               surface->num_vertices = numedges;
+               surface->num_firsttriangle = totaltris;
+               surface->num_triangles = numedges - 2;
+               totalverts += numedges;
+               totaltris += numedges - 2;
+
+               // convert edges back to a normal polygon
+               for (i = 0;i < surface->num_vertices;i++)
+               {
+                       int lindex = loadmodel->brushq1.surfedges[firstedge + i];
+                       float s, t;
+                       if (lindex > 0)
+                               VectorCopy(loadmodel->brushq1.vertexes[loadmodel->brushq1.edges[lindex].v[0]].position, (loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3);
+                       else
+                               VectorCopy(loadmodel->brushq1.vertexes[loadmodel->brushq1.edges[-lindex].v[1]].position, (loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3);
+                       s = DotProduct(((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3];
+                       t = DotProduct(((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3];
+                       (loadmodel->surfmesh.data_texcoordtexture2f + 2 * surface->num_firstvertex)[i * 2 + 0] = s / surface->texture->width;
+                       (loadmodel->surfmesh.data_texcoordtexture2f + 2 * surface->num_firstvertex)[i * 2 + 1] = t / surface->texture->height;
+                       (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 0] = 0;
+                       (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 1] = 0;
+                       (loadmodel->surfmesh.data_lightmapoffsets + surface->num_firstvertex)[i] = 0;
+               }
+
+               for (i = 0;i < surface->num_triangles;i++)
+               {
+                       (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 0] = 0 + surface->num_firstvertex;
+                       (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 1] = i + 1 + surface->num_firstvertex;
+                       (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle)[i * 3 + 2] = i + 2 + surface->num_firstvertex;
+               }
+
+               // compile additional data about the surface geometry
+               Mod_BuildNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, loadmodel->surfmesh.data_vertex3f, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle), loadmodel->surfmesh.data_normal3f, true);
+               Mod_BuildTextureVectorsFromNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle), loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true);
+               BoxFromPoints(surface->mins, surface->maxs, surface->num_vertices, (loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex));
+
+               // generate surface extents information
+               texmins[0] = texmaxs[0] = DotProduct((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex), surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3];
+               texmins[1] = texmaxs[1] = DotProduct((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex), surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3];
+               for (i = 1;i < surface->num_vertices;i++)
+               {
+                       for (j = 0;j < 2;j++)
+                       {
+                               val = DotProduct((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3, surface->lightmapinfo->texinfo->vecs[j]) + surface->lightmapinfo->texinfo->vecs[j][3];
+                               texmins[j] = min(texmins[j], val);
+                               texmaxs[j] = max(texmaxs[j], val);
+                       }
+               }
+               for (i = 0;i < 2;i++)
+               {
+                       surface->lightmapinfo->texturemins[i] = (int) floor(texmins[i] / 16.0) * 16;
+                       surface->lightmapinfo->extents[i] = (int) ceil(texmaxs[i] / 16.0) * 16 - surface->lightmapinfo->texturemins[i];
+               }
+
+               smax = surface->lightmapinfo->extents[0] >> 4;
+               tmax = surface->lightmapinfo->extents[1] >> 4;
+               ssize = (surface->lightmapinfo->extents[0] >> 4) + 1;
+               tsize = (surface->lightmapinfo->extents[1] >> 4) + 1;
+
+               // lighting info
+               for (i = 0;i < MAXLIGHTMAPS;i++)
+                       surface->lightmapinfo->styles[i] = in->styles[i];
+               surface->lightmaptexture = NULL;
+               surface->deluxemaptexture = r_texture_blanknormalmap;
+               i = LittleLong(in->lightofs);
+               if (i == -1)
+               {
+                       surface->lightmapinfo->samples = NULL;
+#if 0
+                       // give non-lightmapped water a 1x white lightmap
+                       if (surface->texture->name[0] == '*' && (surface->lightmapinfo->texinfo->flags & TEX_SPECIAL) && ssize <= 256 && tsize <= 256)
+                       {
+                               surface->lightmapinfo->samples = (unsigned char *)Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
+                               surface->lightmapinfo->styles[0] = 0;
+                               memset(surface->lightmapinfo->samples, 128, ssize * tsize * 3);
+                       }
+#endif
+               }
+               else if (loadmodel->brush.ishlbsp) // LordHavoc: HalfLife map (bsp version 30)
+                       surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + i;
+               else // LordHavoc: white lighting (bsp version 29)
+               {
+                       surface->lightmapinfo->samples = loadmodel->brushq1.lightdata + (i * 3);
+                       if (loadmodel->brushq1.nmaplightdata)
+                               surface->lightmapinfo->nmapsamples = loadmodel->brushq1.nmaplightdata + (i * 3);
+               }
+
+               // check if we should apply a lightmap to this
+               if (!(surface->lightmapinfo->texinfo->flags & TEX_SPECIAL) || surface->lightmapinfo->samples)
+               {
+                       if (ssize > 256 || tsize > 256)
+                               Host_Error("Bad surface extents");
+
+                       if (lightmapsize < ssize)
+                               lightmapsize = ssize;
+                       if (lightmapsize < tsize)
+                               lightmapsize = tsize;
+
+                       totallightmapsamples += ssize*tsize;
+
+                       // force lightmap upload on first time seeing the surface
+                       //
+                       // additionally this is used by the later code to see if a
+                       // lightmap is needed on this surface (rather than duplicating the
+                       // logic above)
+                       loadmodel->brushq1.lightmapupdateflags[surfacenum] = true;
+               }
+       }
+
+       // small maps (such as ammo boxes especially) don't need big lightmap
+       // textures, so this code tries to guess a good size based on
+       // totallightmapsamples (size of the lightmaps lump basically), as well as
+       // trying to max out the gl_max_size if there is a lot of lightmap data to
+       // store
+       // additionally, never choose a lightmapsize that is smaller than the
+       // largest surface encountered (as it would fail)
+       i = lightmapsize;
+       for (lightmapsize = 64; (lightmapsize < i) && (lightmapsize < gl_max_size.integer) && (totallightmapsamples > lightmapsize*lightmapsize); lightmapsize*=2)
+               ;
+
+       // now that we've decided the lightmap texture size, we can do the rest
+       if (cls.state != ca_dedicated)
+       {
+               int stainmapsize = 0;
+               struct alloc_lm_state allocState;
+
+               for (surfacenum = 0, surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, surface++)
+               {
+                       int i, iu, iv, lightmapx = 0, lightmapy = 0;
+                       float u, v, ubase, vbase, uscale, vscale;
+
+                       if (!loadmodel->brushq1.lightmapupdateflags[surfacenum])
+                               continue;
+
+                       smax = surface->lightmapinfo->extents[0] >> 4;
+                       tmax = surface->lightmapinfo->extents[1] >> 4;
+                       ssize = (surface->lightmapinfo->extents[0] >> 4) + 1;
+                       tsize = (surface->lightmapinfo->extents[1] >> 4) + 1;
+                       stainmapsize += ssize * tsize * 3;
+
+                       if (!lightmaptexture || !Mod_Q1BSP_AllocLightmapBlock(&allocState, lightmapsize, lightmapsize, ssize, tsize, &lightmapx, &lightmapy))
+                       {
+                               // allocate a texture pool if we need it
+                               if (loadmodel->texturepool == NULL)
+                                       loadmodel->texturepool = R_AllocTexturePool();
+                               // could not find room, make a new lightmap
+                               lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+                               if (loadmodel->brushq1.nmaplightdata)
+                                       deluxemaptexture = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%i", lightmapnumber), lightmapsize, lightmapsize, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
+                               lightmapnumber++;
+                               init_alloc_lm_state (&allocState);
+                               Mod_Q1BSP_AllocLightmapBlock(&allocState, lightmapsize, lightmapsize, ssize, tsize, &lightmapx, &lightmapy);
+                       }
+                       surface->lightmaptexture = lightmaptexture;
+                       surface->deluxemaptexture = deluxemaptexture;
+                       surface->lightmapinfo->lightmaporigin[0] = lightmapx;
+                       surface->lightmapinfo->lightmaporigin[1] = lightmapy;
+
+                       uscale = 1.0f / (float)lightmapsize;
+                       vscale = 1.0f / (float)lightmapsize;
+                       ubase = lightmapx * uscale;
+                       vbase = lightmapy * vscale;
+
+                       for (i = 0;i < surface->num_vertices;i++)
+                       {
+                               u = ((DotProduct(((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3]) + 8 - surface->lightmapinfo->texturemins[0]) * (1.0 / 16.0);
+                               v = ((DotProduct(((loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex) + i * 3), surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3]) + 8 - surface->lightmapinfo->texturemins[1]) * (1.0 / 16.0);
+                               (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 0] = u * uscale + ubase;
+                               (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * surface->num_firstvertex)[i * 2 + 1] = v * vscale + vbase;
+                               // LordHavoc: calc lightmap data offset for vertex lighting to use
+                               iu = (int) u;
+                               iv = (int) v;
+                               (loadmodel->surfmesh.data_lightmapoffsets + surface->num_firstvertex)[i] = (bound(0, iv, tmax) * ssize + bound(0, iu, smax)) * 3;
+                       }
+               }
+
+               if (cl_stainmaps.integer)
+               {
+                       // allocate stainmaps for permanent marks on walls and clear white
+                       unsigned char *stainsamples = NULL;
+                       stainsamples = (unsigned char *)Mem_Alloc(loadmodel->mempool, stainmapsize);
+                       memset(stainsamples, 255, stainmapsize);
+                       // assign pointers
+                       for (surfacenum = 0, surface = loadmodel->data_surfaces;surfacenum < count;surfacenum++, surface++)
+                       {
+                               if (!loadmodel->brushq1.lightmapupdateflags[surfacenum])
+                                       continue;
+                               ssize = (surface->lightmapinfo->extents[0] >> 4) + 1;
+                               tsize = (surface->lightmapinfo->extents[1] >> 4) + 1;
+                               surface->lightmapinfo->stainsamples = stainsamples;
+                               stainsamples += ssize * tsize * 3;
+                       }
+               }
+       }
+
+       // generate ushort elements array if possible
+       if (loadmodel->surfmesh.data_element3s)
+               for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+                       loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+}
+
+static void Mod_Q1BSP_LoadNodes_RecursiveSetParent(mnode_t *node, mnode_t *parent)
+{
+       //if (node->parent)
+       //      Host_Error("Mod_Q1BSP_LoadNodes_RecursiveSetParent: runaway recursion");
+       node->parent = parent;
+       if (node->plane)
+       {
+               // this is a node, recurse to children
+               Mod_Q1BSP_LoadNodes_RecursiveSetParent(node->children[0], node);
+               Mod_Q1BSP_LoadNodes_RecursiveSetParent(node->children[1], node);
+               // combine supercontents of children
+               node->combinedsupercontents = node->children[0]->combinedsupercontents | node->children[1]->combinedsupercontents;
+       }
+       else
+       {
+               int j;
+               mleaf_t *leaf = (mleaf_t *)node;
+               // if this is a leaf, calculate supercontents mask from all collidable
+               // primitives in the leaf (brushes and collision surfaces)
+               // also flag if the leaf contains any collision surfaces
+               leaf->combinedsupercontents = 0;
+               // combine the supercontents values of all brushes in this leaf
+               for (j = 0;j < leaf->numleafbrushes;j++)
+                       leaf->combinedsupercontents |= loadmodel->brush.data_brushes[leaf->firstleafbrush[j]].texture->supercontents;
+               // check if this leaf contains any collision surfaces (q3 patches)
+               for (j = 0;j < leaf->numleafsurfaces;j++)
+               {
+                       msurface_t *surface = loadmodel->data_surfaces + leaf->firstleafsurface[j];
+                       if (surface->num_collisiontriangles)
+                       {
+                               leaf->containscollisionsurfaces = true;
+                               leaf->combinedsupercontents |= surface->texture->supercontents;
+                       }
+               }
+       }
+}
+
+static void Mod_Q1BSP_LoadNodes(lump_t *l)
+{
+       int                     i, j, count, p;
+       dnode_t         *in;
+       mnode_t         *out;
+
+       in = (dnode_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadNodes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mnode_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+
+       loadmodel->brush.data_nodes = out;
+       loadmodel->brush.num_nodes = count;
+
+       for ( i=0 ; i<count ; i++, in++, out++)
+       {
+               for (j=0 ; j<3 ; j++)
+               {
+                       out->mins[j] = LittleShort(in->mins[j]);
+                       out->maxs[j] = LittleShort(in->maxs[j]);
+               }
+
+               p = LittleLong(in->planenum);
+               out->plane = loadmodel->brush.data_planes + p;
+
+               out->firstsurface = (unsigned short)LittleShort(in->firstface);
+               out->numsurfaces = (unsigned short)LittleShort(in->numfaces);
+
+               for (j=0 ; j<2 ; j++)
+               {
+                       // LordHavoc: this code supports broken bsp files produced by
+                       // arguire qbsp which can produce more than 32768 nodes, any value
+                       // below count is assumed to be a node number, any other value is
+                       // assumed to be a leaf number
+                       p = (unsigned short)LittleShort(in->children[j]);
+                       if (p < count)
+                       {
+                               if (p < loadmodel->brush.num_nodes)
+                                       out->children[j] = loadmodel->brush.data_nodes + p;
+                               else
+                               {
+                                       Con_Printf("Mod_Q1BSP_LoadNodes: invalid node index %i (file has only %i nodes)\n", p, loadmodel->brush.num_nodes);
+                                       // map it to the solid leaf
+                                       out->children[j] = (mnode_t *)loadmodel->brush.data_leafs;
+                               }
+                       }
+                       else
+                       {
+                               // note this uses 65535 intentionally, -1 is leaf 0
+                               p = 65535 - p;
+                               if (p < loadmodel->brush.num_leafs)
+                                       out->children[j] = (mnode_t *)(loadmodel->brush.data_leafs + p);
+                               else
+                               {
+                                       Con_Printf("Mod_Q1BSP_LoadNodes: invalid leaf index %i (file has only %i leafs)\n", p, loadmodel->brush.num_leafs);
+                                       // map it to the solid leaf
+                                       out->children[j] = (mnode_t *)loadmodel->brush.data_leafs;
+                               }
+                       }
+               }
+       }
+
+       Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL);      // sets nodes and leafs
+}
+
+static void Mod_Q1BSP_LoadLeafs(lump_t *l)
+{
+       dleaf_t *in;
+       mleaf_t *out;
+       int i, j, count, p;
+
+       in = (dleaf_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadLeafs: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mleaf_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+
+       loadmodel->brush.data_leafs = out;
+       loadmodel->brush.num_leafs = count;
+       // get visleafs from the submodel data
+       loadmodel->brush.num_pvsclusters = loadmodel->brushq1.submodels[0].visleafs;
+       loadmodel->brush.num_pvsclusterbytes = (loadmodel->brush.num_pvsclusters+7)>>3;
+       loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes);
+       memset(loadmodel->brush.data_pvsclusters, 0xFF, loadmodel->brush.num_pvsclusters * loadmodel->brush.num_pvsclusterbytes);
+
+       for ( i=0 ; i<count ; i++, in++, out++)
+       {
+               for (j=0 ; j<3 ; j++)
+               {
+                       out->mins[j] = LittleShort(in->mins[j]);
+                       out->maxs[j] = LittleShort(in->maxs[j]);
+               }
+
+               // FIXME: this function could really benefit from some error checking
+
+               out->contents = LittleLong(in->contents);
+
+               out->firstleafsurface = loadmodel->brush.data_leafsurfaces + (unsigned short)LittleShort(in->firstmarksurface);
+               out->numleafsurfaces = (unsigned short)LittleShort(in->nummarksurfaces);
+               if ((unsigned short)LittleShort(in->firstmarksurface) + out->numleafsurfaces > loadmodel->brush.num_leafsurfaces)
+               {
+                       Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", (int)(out->firstleafsurface - loadmodel->brush.data_leafsurfaces), (int)(out->firstleafsurface + out->numleafsurfaces - loadmodel->brush.data_leafsurfaces), 0, loadmodel->brush.num_leafsurfaces);
+                       out->firstleafsurface = NULL;
+                       out->numleafsurfaces = 0;
+               }
+
+               out->clusterindex = i - 1;
+               if (out->clusterindex >= loadmodel->brush.num_pvsclusters)
+                       out->clusterindex = -1;
+
+               p = LittleLong(in->visofs);
+               // ignore visofs errors on leaf 0 (solid)
+               if (p >= 0 && out->clusterindex >= 0)
+               {
+                       if (p >= loadmodel->brushq1.num_compressedpvs)
+                               Con_Print("Mod_Q1BSP_LoadLeafs: invalid visofs\n");
+                       else
+                               Mod_Q1BSP_DecompressVis(loadmodel->brushq1.data_compressedpvs + p, loadmodel->brushq1.data_compressedpvs + loadmodel->brushq1.num_compressedpvs, loadmodel->brush.data_pvsclusters + out->clusterindex * loadmodel->brush.num_pvsclusterbytes, loadmodel->brush.data_pvsclusters + (out->clusterindex + 1) * loadmodel->brush.num_pvsclusterbytes);
+               }
+
+               for (j = 0;j < 4;j++)
+                       out->ambient_sound_level[j] = in->ambient_level[j];
 
                // FIXME: Insert caustics here
        }
 }
 
+qboolean Mod_Q1BSP_CheckWaterAlphaSupport(void)
+{
+       int i, j;
+       mleaf_t *leaf;
+       const unsigned char *pvs;
+       // if there's no vis data, assume supported (because everything is visible all the time)
+       if (!loadmodel->brush.data_pvsclusters)
+               return true;
+       // check all liquid leafs to see if they can see into empty leafs, if any
+       // can we can assume this map supports r_wateralpha
+       for (i = 0, leaf = loadmodel->brush.data_leafs;i < loadmodel->brush.num_leafs;i++, leaf++)
+       {
+               if ((leaf->contents == CONTENTS_WATER || leaf->contents == CONTENTS_SLIME) && leaf->clusterindex >= 0)
+               {
+                       pvs = loadmodel->brush.data_pvsclusters + leaf->clusterindex * loadmodel->brush.num_pvsclusterbytes;
+                       for (j = 0;j < loadmodel->brush.num_leafs;j++)
+                               if (CHECKPVSBIT(pvs, loadmodel->brush.data_leafs[j].clusterindex) && loadmodel->brush.data_leafs[j].contents == CONTENTS_EMPTY)
+                                       return true;
+               }
+       }
+       return false;
+}
+
+static void Mod_Q1BSP_LoadClipnodes(lump_t *l, hullinfo_t *hullinfo)
+{
+       dclipnode_t *in;
+       mclipnode_t *out;
+       int                     i, count;
+       hull_t          *hull;
+
+       in = (dclipnode_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadClipnodes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mclipnode_t *)Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+
+       loadmodel->brushq1.clipnodes = out;
+       loadmodel->brushq1.numclipnodes = count;
+
+       for (i = 1; i < MAX_MAP_HULLS; i++)
+       {
+               hull = &loadmodel->brushq1.hulls[i];
+               hull->clipnodes = out;
+               hull->firstclipnode = 0;
+               hull->lastclipnode = count-1;
+               hull->planes = loadmodel->brush.data_planes;
+               hull->clip_mins[0] = hullinfo->hullsizes[i][0][0];
+               hull->clip_mins[1] = hullinfo->hullsizes[i][0][1];
+               hull->clip_mins[2] = hullinfo->hullsizes[i][0][2];
+               hull->clip_maxs[0] = hullinfo->hullsizes[i][1][0];
+               hull->clip_maxs[1] = hullinfo->hullsizes[i][1][1];
+               hull->clip_maxs[2] = hullinfo->hullsizes[i][1][2];
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
+       }
+
+       for (i=0 ; i<count ; i++, out++, in++)
+       {
+               out->planenum = LittleLong(in->planenum);
+               // LordHavoc: this code supports arguire qbsp's broken clipnodes indices (more than 32768 clipnodes), values above count are assumed to be contents values
+               out->children[0] = (unsigned short)LittleShort(in->children[0]);
+               out->children[1] = (unsigned short)LittleShort(in->children[1]);
+               if (out->children[0] >= count)
+                       out->children[0] -= 65536;
+               if (out->children[1] >= count)
+                       out->children[1] -= 65536;
+               if (out->planenum < 0 || out->planenum >= loadmodel->brush.num_planes)
+                       Host_Error("Corrupt clipping hull(out of range planenum)");
+       }
+}
+
+//Duplicate the drawing hull structure as a clipping hull
+static void Mod_Q1BSP_MakeHull0(void)
+{
+       mnode_t         *in;
+       mclipnode_t *out;
+       int                     i;
+       hull_t          *hull;
+
+       hull = &loadmodel->brushq1.hulls[0];
+
+       in = loadmodel->brush.data_nodes;
+       out = (mclipnode_t *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_nodes * sizeof(*out));
+
+       hull->clipnodes = out;
+       hull->firstclipnode = 0;
+       hull->lastclipnode = loadmodel->brush.num_nodes - 1;
+       hull->planes = loadmodel->brush.data_planes;
+
+       for (i = 0;i < loadmodel->brush.num_nodes;i++, out++, in++)
+       {
+               out->planenum = in->plane - loadmodel->brush.data_planes;
+               out->children[0] = in->children[0]->plane ? in->children[0] - loadmodel->brush.data_nodes : ((mleaf_t *)in->children[0])->contents;
+               out->children[1] = in->children[1]->plane ? in->children[1] - loadmodel->brush.data_nodes : ((mleaf_t *)in->children[1])->contents;
+       }
+}
+
+static void Mod_Q1BSP_LoadLeaffaces(lump_t *l)
+{
+       int i, j;
+       short *in;
+
+       in = (short *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadLeaffaces: funny lump size in %s",loadmodel->name);
+       loadmodel->brush.num_leafsurfaces = l->filelen / sizeof(*in);
+       loadmodel->brush.data_leafsurfaces = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_leafsurfaces * sizeof(int));
+
+       for (i = 0;i < loadmodel->brush.num_leafsurfaces;i++)
+       {
+               j = (unsigned short) LittleShort(in[i]);
+               if (j >= loadmodel->num_surfaces)
+                       Host_Error("Mod_Q1BSP_LoadLeaffaces: bad surface number");
+               loadmodel->brush.data_leafsurfaces[i] = j;
+       }
+}
+
+static void Mod_Q1BSP_LoadSurfedges(lump_t *l)
+{
+       int             i;
+       int             *in;
+
+       in = (int *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadSurfedges: funny lump size in %s",loadmodel->name);
+       loadmodel->brushq1.numsurfedges = l->filelen / sizeof(*in);
+       loadmodel->brushq1.surfedges = (int *)Mem_Alloc(loadmodel->mempool, loadmodel->brushq1.numsurfedges * sizeof(int));
+
+       for (i = 0;i < loadmodel->brushq1.numsurfedges;i++)
+               loadmodel->brushq1.surfedges[i] = LittleLong(in[i]);
+}
+
+
+static void Mod_Q1BSP_LoadPlanes(lump_t *l)
+{
+       int                     i;
+       mplane_t        *out;
+       dplane_t        *in;
+
+       in = (dplane_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q1BSP_LoadPlanes: funny lump size in %s", loadmodel->name);
+
+       loadmodel->brush.num_planes = l->filelen / sizeof(*in);
+       loadmodel->brush.data_planes = out = (mplane_t *)Mem_Alloc(loadmodel->mempool, loadmodel->brush.num_planes * sizeof(*out));
+
+       for (i = 0;i < loadmodel->brush.num_planes;i++, in++, out++)
+       {
+               out->normal[0] = LittleFloat(in->normal[0]);
+               out->normal[1] = LittleFloat(in->normal[1]);
+               out->normal[2] = LittleFloat(in->normal[2]);
+               out->dist = LittleFloat(in->dist);
+
+               PlaneClassify(out);
+       }
+}
+
+static void Mod_Q1BSP_LoadMapBrushes(void)
+{
+#if 0
+// unfinished
+       int submodel, numbrushes;
+       qboolean firstbrush;
+       char *text, *maptext;
+       char mapfilename[MAX_QPATH];
+       FS_StripExtension (loadmodel->name, mapfilename, sizeof (mapfilename));
+       strlcat (mapfilename, ".map", sizeof (mapfilename));
+       maptext = (unsigned char*) FS_LoadFile(mapfilename, tempmempool, false, NULL);
+       if (!maptext)
+               return;
+       text = maptext;
+       if (!COM_ParseToken_Simple(&data, false, false))
+               return; // error
+       submodel = 0;
+       for (;;)
+       {
+               if (!COM_ParseToken_Simple(&data, false, false))
+                       break;
+               if (com_token[0] != '{')
+                       return; // error
+               // entity
+               firstbrush = true;
+               numbrushes = 0;
+               maxbrushes = 256;
+               brushes = Mem_Alloc(loadmodel->mempool, maxbrushes * sizeof(mbrush_t));
+               for (;;)
+               {
+                       if (!COM_ParseToken_Simple(&data, false, false))
+                               return; // error
+                       if (com_token[0] == '}')
+                               break; // end of entity
+                       if (com_token[0] == '{')
+                       {
+                               // brush
+                               if (firstbrush)
+                               {
+                                       if (submodel)
+                                       {
+                                               if (submodel > loadmodel->brush.numsubmodels)
+                                               {
+                                                       Con_Printf("Mod_Q1BSP_LoadMapBrushes: .map has more submodels than .bsp!\n");
+                                                       model = NULL;
+                                               }
+                                               else
+                                                       model = loadmodel->brush.submodels[submodel];
+                                       }
+                                       else
+                                               model = loadmodel;
+                               }
+                               for (;;)
+                               {
+                                       if (!COM_ParseToken_Simple(&data, false, false))
+                                               return; // error
+                                       if (com_token[0] == '}')
+                                               break; // end of brush
+                                       // each brush face should be this format:
+                                       // ( x y z ) ( x y z ) ( x y z ) texture scroll_s scroll_t rotateangle scale_s scale_t
+                                       // FIXME: support hl .map format
+                                       for (pointnum = 0;pointnum < 3;pointnum++)
+                                       {
+                                               COM_ParseToken_Simple(&data, false, false);
+                                               for (componentnum = 0;componentnum < 3;componentnum++)
+                                               {
+                                                       COM_ParseToken_Simple(&data, false, false);
+                                                       point[pointnum][componentnum] = atof(com_token);
+                                               }
+                                               COM_ParseToken_Simple(&data, false, false);
+                                       }
+                                       COM_ParseToken_Simple(&data, false, false);
+                                       strlcpy(facetexture, com_token, sizeof(facetexture));
+                                       COM_ParseToken_Simple(&data, false, false);
+                                       //scroll_s = atof(com_token);
+                                       COM_ParseToken_Simple(&data, false, false);
+                                       //scroll_t = atof(com_token);
+                                       COM_ParseToken_Simple(&data, false, false);
+                                       //rotate = atof(com_token);
+                                       COM_ParseToken_Simple(&data, false, false);
+                                       //scale_s = atof(com_token);
+                                       COM_ParseToken_Simple(&data, false, false);
+                                       //scale_t = atof(com_token);
+                                       TriangleNormal(point[0], point[1], point[2], planenormal);
+                                       VectorNormalizeDouble(planenormal);
+                                       planedist = DotProduct(point[0], planenormal);
+                                       //ChooseTexturePlane(planenormal, texturevector[0], texturevector[1]);
+                               }
+                               continue;
+                       }
+               }
+       }
+#endif
+}
+
+
+#define MAX_PORTALPOINTS 64
+
+typedef struct portal_s
+{
+       mplane_t plane;
+       mnode_t *nodes[2];              // [0] = front side of plane
+       struct portal_s *next[2];
+       int numpoints;
+       double points[3*MAX_PORTALPOINTS];
+       struct portal_s *chain; // all portals are linked into a list
+}
+portal_t;
+
+static portal_t *portalchain;
+
+/*
+===========
+AllocPortal
+===========
+*/
+static portal_t *AllocPortal(void)
+{
+       portal_t *p;
+       p = (portal_t *)Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
+       p->chain = portalchain;
+       portalchain = p;
+       return p;
+}
+
+static void FreePortal(portal_t *p)
+{
+       Mem_Free(p);
+}
+
+static void Mod_Q1BSP_RecursiveRecalcNodeBBox(mnode_t *node)
+{
+       // process only nodes (leafs already had their box calculated)
+       if (!node->plane)
+               return;
+
+       // calculate children first
+       Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[0]);
+       Mod_Q1BSP_RecursiveRecalcNodeBBox(node->children[1]);
+
+       // make combined bounding box from children
+       node->mins[0] = min(node->children[0]->mins[0], node->children[1]->mins[0]);
+       node->mins[1] = min(node->children[0]->mins[1], node->children[1]->mins[1]);
+       node->mins[2] = min(node->children[0]->mins[2], node->children[1]->mins[2]);
+       node->maxs[0] = max(node->children[0]->maxs[0], node->children[1]->maxs[0]);
+       node->maxs[1] = max(node->children[0]->maxs[1], node->children[1]->maxs[1]);
+       node->maxs[2] = max(node->children[0]->maxs[2], node->children[1]->maxs[2]);
+}
+
+static void Mod_Q1BSP_FinalizePortals(void)
+{
+       int i, j, numportals, numpoints;
+       portal_t *p, *pnext;
+       mportal_t *portal;
+       mvertex_t *point;
+       mleaf_t *leaf, *endleaf;
+
+       // tally up portal and point counts and recalculate bounding boxes for all
+       // leafs (because qbsp is very sloppy)
+       leaf = loadmodel->brush.data_leafs;
+       endleaf = leaf + loadmodel->brush.num_leafs;
+       for (;leaf < endleaf;leaf++)
+       {
+               VectorSet(leaf->mins,  2000000000,  2000000000,  2000000000);
+               VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
+       }
+       p = portalchain;
+       numportals = 0;
+       numpoints = 0;
+       while (p)
+       {
+               // note: this check must match the one below or it will usually corrupt memory
+               // the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
+               if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1] && ((mleaf_t *)p->nodes[0])->clusterindex >= 0 && ((mleaf_t *)p->nodes[1])->clusterindex >= 0)
+               {
+                       numportals += 2;
+                       numpoints += p->numpoints * 2;
+               }
+               p = p->chain;
+       }
+       loadmodel->brush.data_portals = (mportal_t *)Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
+       loadmodel->brush.num_portals = numportals;
+       loadmodel->brush.data_portalpoints = (mvertex_t *)((unsigned char *) loadmodel->brush.data_portals + numportals * sizeof(mportal_t));
+       loadmodel->brush.num_portalpoints = numpoints;
+       // clear all leaf portal chains
+       for (i = 0;i < loadmodel->brush.num_leafs;i++)
+               loadmodel->brush.data_leafs[i].portals = NULL;
+       // process all portals in the global portal chain, while freeing them
+       portal = loadmodel->brush.data_portals;
+       point = loadmodel->brush.data_portalpoints;
+       p = portalchain;
+       portalchain = NULL;
+       while (p)
+       {
+               pnext = p->chain;
+
+               if (p->numpoints >= 3 && p->nodes[0] != p->nodes[1])
+               {
+                       // note: this check must match the one above or it will usually corrupt memory
+                       // the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
+                       if (((mleaf_t *)p->nodes[0])->clusterindex >= 0 && ((mleaf_t *)p->nodes[1])->clusterindex >= 0)
+                       {
+                               // first make the back to front portal(forward portal)
+                               portal->points = point;
+                               portal->numpoints = p->numpoints;
+                               portal->plane.dist = p->plane.dist;
+                               VectorCopy(p->plane.normal, portal->plane.normal);
+                               portal->here = (mleaf_t *)p->nodes[1];
+                               portal->past = (mleaf_t *)p->nodes[0];
+                               // copy points
+                               for (j = 0;j < portal->numpoints;j++)
+                               {
+                                       VectorCopy(p->points + j*3, point->position);
+                                       point++;
+                               }
+                               BoxFromPoints(portal->mins, portal->maxs, portal->numpoints, portal->points->position);
+                               PlaneClassify(&portal->plane);
+
+                               // link into leaf's portal chain
+                               portal->next = portal->here->portals;
+                               portal->here->portals = portal;
+
+                               // advance to next portal
+                               portal++;
+
+                               // then make the front to back portal(backward portal)
+                               portal->points = point;
+                               portal->numpoints = p->numpoints;
+                               portal->plane.dist = -p->plane.dist;
+                               VectorNegate(p->plane.normal, portal->plane.normal);
+                               portal->here = (mleaf_t *)p->nodes[0];
+                               portal->past = (mleaf_t *)p->nodes[1];
+                               // copy points
+                               for (j = portal->numpoints - 1;j >= 0;j--)
+                               {
+                                       VectorCopy(p->points + j*3, point->position);
+                                       point++;
+                               }
+                               BoxFromPoints(portal->mins, portal->maxs, portal->numpoints, portal->points->position);
+                               PlaneClassify(&portal->plane);
+
+                               // link into leaf's portal chain
+                               portal->next = portal->here->portals;
+                               portal->here->portals = portal;
+
+                               // advance to next portal
+                               portal++;
+                       }
+                       // add the portal's polygon points to the leaf bounding boxes
+                       for (i = 0;i < 2;i++)
+                       {
+                               leaf = (mleaf_t *)p->nodes[i];
+                               for (j = 0;j < p->numpoints;j++)
+                               {
+                                       if (leaf->mins[0] > p->points[j*3+0]) leaf->mins[0] = p->points[j*3+0];
+                                       if (leaf->mins[1] > p->points[j*3+1]) leaf->mins[1] = p->points[j*3+1];
+                                       if (leaf->mins[2] > p->points[j*3+2]) leaf->mins[2] = p->points[j*3+2];
+                                       if (leaf->maxs[0] < p->points[j*3+0]) leaf->maxs[0] = p->points[j*3+0];
+                                       if (leaf->maxs[1] < p->points[j*3+1]) leaf->maxs[1] = p->points[j*3+1];
+                                       if (leaf->maxs[2] < p->points[j*3+2]) leaf->maxs[2] = p->points[j*3+2];
+                               }
+                       }
+               }
+               FreePortal(p);
+               p = pnext;
+       }
+       // now recalculate the node bounding boxes from the leafs
+       Mod_Q1BSP_RecursiveRecalcNodeBBox(loadmodel->brush.data_nodes);
+}
+
+/*
+=============
+AddPortalToNodes
+=============
+*/
+static void AddPortalToNodes(portal_t *p, mnode_t *front, mnode_t *back)
+{
+       if (!front)
+               Host_Error("AddPortalToNodes: NULL front node");
+       if (!back)
+               Host_Error("AddPortalToNodes: NULL back node");
+       if (p->nodes[0] || p->nodes[1])
+               Host_Error("AddPortalToNodes: already included");
+       // note: front == back is handled gracefully, because leaf 0 is the shared solid leaf, it can often have portals with the same leaf on both sides
+
+       p->nodes[0] = front;
+       p->next[0] = (portal_t *)front->portals;
+       front->portals = (mportal_t *)p;
+
+       p->nodes[1] = back;
+       p->next[1] = (portal_t *)back->portals;
+       back->portals = (mportal_t *)p;
+}
+
+/*
+=============
+RemovePortalFromNode
+=============
+*/
+static void RemovePortalFromNodes(portal_t *portal)
+{
+       int i;
+       mnode_t *node;
+       void **portalpointer;
+       portal_t *t;
+       for (i = 0;i < 2;i++)
+       {
+               node = portal->nodes[i];
+
+               portalpointer = (void **) &node->portals;
+               while (1)
+               {
+                       t = (portal_t *)*portalpointer;
+                       if (!t)
+                               Host_Error("RemovePortalFromNodes: portal not in leaf");
+
+                       if (t == portal)
+                       {
+                               if (portal->nodes[0] == node)
+                               {
+                                       *portalpointer = portal->next[0];
+                                       portal->nodes[0] = NULL;
+                               }
+                               else if (portal->nodes[1] == node)
+                               {
+                                       *portalpointer = portal->next[1];
+                                       portal->nodes[1] = NULL;
+                               }
+                               else
+                                       Host_Error("RemovePortalFromNodes: portal not bounding leaf");
+                               break;
+                       }
+
+                       if (t->nodes[0] == node)
+                               portalpointer = (void **) &t->next[0];
+                       else if (t->nodes[1] == node)
+                               portalpointer = (void **) &t->next[1];
+                       else
+                               Host_Error("RemovePortalFromNodes: portal not bounding leaf");
+               }
+       }
+}
+
+#define PORTAL_DIST_EPSILON (1.0 / 32.0)
+static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node)
+{
+       int i, side;
+       mnode_t *front, *back, *other_node;
+       mplane_t clipplane, *plane;
+       portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
+       int numfrontpoints, numbackpoints;
+       double frontpoints[3*MAX_PORTALPOINTS], backpoints[3*MAX_PORTALPOINTS];
+
+       // if a leaf, we're done
+       if (!node->plane)
+               return;
+
+       plane = node->plane;
+
+       front = node->children[0];
+       back = node->children[1];
+       if (front == back)
+               Host_Error("Mod_Q1BSP_RecursiveNodePortals: corrupt node hierarchy");
+
+       // create the new portal by generating a polygon for the node plane,
+       // and clipping it by all of the other portals(which came from nodes above this one)
+       nodeportal = AllocPortal();
+       nodeportal->plane = *plane;
+
+       // TODO: calculate node bounding boxes during recursion and calculate a maximum plane size accordingly to improve precision (as most maps do not need 1 billion unit plane polygons)
+       PolygonD_QuadForPlane(nodeportal->points, nodeportal->plane.normal[0], nodeportal->plane.normal[1], nodeportal->plane.normal[2], nodeportal->plane.dist, 1024.0*1024.0*1024.0);
+       nodeportal->numpoints = 4;
+       side = 0;       // shut up compiler warning
+       for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
+       {
+               clipplane = portal->plane;
+               if (portal->nodes[0] == portal->nodes[1])
+                       Host_Error("Mod_Q1BSP_RecursiveNodePortals: portal has same node on both sides(1)");
+               if (portal->nodes[0] == node)
+                       side = 0;
+               else if (portal->nodes[1] == node)
+               {
+                       clipplane.dist = -clipplane.dist;
+                       VectorNegate(clipplane.normal, clipplane.normal);
+                       side = 1;
+               }
+               else
+                       Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
+
+               for (i = 0;i < nodeportal->numpoints*3;i++)
+                       frontpoints[i] = nodeportal->points[i];
+               PolygonD_Divide(nodeportal->numpoints, frontpoints, clipplane.normal[0], clipplane.normal[1], clipplane.normal[2], clipplane.dist, PORTAL_DIST_EPSILON, MAX_PORTALPOINTS, nodeportal->points, &nodeportal->numpoints, 0, NULL, NULL, NULL);
+               if (nodeportal->numpoints <= 0 || nodeportal->numpoints >= MAX_PORTALPOINTS)
+                       break;
+       }
+
+       if (nodeportal->numpoints < 3)
+       {
+               Con_Print("Mod_Q1BSP_RecursiveNodePortals: WARNING: new portal was clipped away\n");
+               nodeportal->numpoints = 0;
+       }
+       else if (nodeportal->numpoints >= MAX_PORTALPOINTS)
+       {
+               Con_Print("Mod_Q1BSP_RecursiveNodePortals: WARNING: new portal has too many points\n");
+               nodeportal->numpoints = 0;
+       }
+
+       AddPortalToNodes(nodeportal, front, back);
+
+       // split the portals of this node along this node's plane and assign them to the children of this node
+       // (migrating the portals downward through the tree)
+       for (portal = (portal_t *)node->portals;portal;portal = nextportal)
+       {
+               if (portal->nodes[0] == portal->nodes[1])
+                       Host_Error("Mod_Q1BSP_RecursiveNodePortals: portal has same node on both sides(2)");
+               if (portal->nodes[0] == node)
+                       side = 0;
+               else if (portal->nodes[1] == node)
+                       side = 1;
+               else
+                       Host_Error("Mod_Q1BSP_RecursiveNodePortals: mislinked portal");
+               nextportal = portal->next[side];
+               if (!portal->numpoints)
+                       continue;
+
+               other_node = portal->nodes[!side];
+               RemovePortalFromNodes(portal);
+
+               // cut the portal into two portals, one on each side of the node plane
+               PolygonD_Divide(portal->numpoints, portal->points, plane->normal[0], plane->normal[1], plane->normal[2], plane->dist, PORTAL_DIST_EPSILON, MAX_PORTALPOINTS, frontpoints, &numfrontpoints, MAX_PORTALPOINTS, backpoints, &numbackpoints, NULL);
+
+               if (!numfrontpoints)
+               {
+                       if (side == 0)
+                               AddPortalToNodes(portal, back, other_node);
+                       else
+                               AddPortalToNodes(portal, other_node, back);
+                       continue;
+               }
+               if (!numbackpoints)
+               {
+                       if (side == 0)
+                               AddPortalToNodes(portal, front, other_node);
+                       else
+                               AddPortalToNodes(portal, other_node, front);
+                       continue;
+               }
+
+               // the portal is split
+               splitportal = AllocPortal();
+               temp = splitportal->chain;
+               *splitportal = *portal;
+               splitportal->chain = temp;
+               for (i = 0;i < numbackpoints*3;i++)
+                       splitportal->points[i] = backpoints[i];
+               splitportal->numpoints = numbackpoints;
+               for (i = 0;i < numfrontpoints*3;i++)
+                       portal->points[i] = frontpoints[i];
+               portal->numpoints = numfrontpoints;
+
+               if (side == 0)
+               {
+                       AddPortalToNodes(portal, front, other_node);
+                       AddPortalToNodes(splitportal, back, other_node);
+               }
+               else
+               {
+                       AddPortalToNodes(portal, other_node, front);
+                       AddPortalToNodes(splitportal, other_node, back);
+               }
+       }
+
+       Mod_Q1BSP_RecursiveNodePortals(front);
+       Mod_Q1BSP_RecursiveNodePortals(back);
+}
+
+static void Mod_Q1BSP_MakePortals(void)
+{
+       portalchain = NULL;
+       Mod_Q1BSP_RecursiveNodePortals(loadmodel->brush.data_nodes);
+       Mod_Q1BSP_FinalizePortals();
+}
+
+//Returns PVS data for a given point
+//(note: can return NULL)
+static unsigned char *Mod_Q1BSP_GetPVS(dp_model_t *model, const vec3_t p)
+{
+       mnode_t *node;
+       node = model->brush.data_nodes;
+       while (node->plane)
+               node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct(p,node->plane->normal)) < node->plane->dist];
+       if (((mleaf_t *)node)->clusterindex >= 0)
+               return model->brush.data_pvsclusters + ((mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
+       else
+               return NULL;
+}
+
+static void Mod_Q1BSP_FatPVS_RecursiveBSPNode(dp_model_t *model, const vec3_t org, vec_t radius, unsigned char *pvsbuffer, int pvsbytes, mnode_t *node)
+{
+       while (node->plane)
+       {
+               float d = PlaneDiff(org, node->plane);
+               if (d > radius)
+                       node = node->children[0];
+               else if (d < -radius)
+                       node = node->children[1];
+               else
+               {
+                       // go down both sides
+                       Mod_Q1BSP_FatPVS_RecursiveBSPNode(model, org, radius, pvsbuffer, pvsbytes, node->children[0]);
+                       node = node->children[1];
+               }
+       }
+       // if this leaf is in a cluster, accumulate the pvs bits
+       if (((mleaf_t *)node)->clusterindex >= 0)
+       {
+               int i;
+               unsigned char *pvs = model->brush.data_pvsclusters + ((mleaf_t *)node)->clusterindex * model->brush.num_pvsclusterbytes;
+               for (i = 0;i < pvsbytes;i++)
+                       pvsbuffer[i] |= pvs[i];
+       }
+}
+
+//Calculates a PVS that is the inclusive or of all leafs within radius pixels
+//of the given point.
+static int Mod_Q1BSP_FatPVS(dp_model_t *model, const vec3_t org, vec_t radius, unsigned char *pvsbuffer, int pvsbufferlength, qboolean merge)
+{
+       int bytes = model->brush.num_pvsclusterbytes;
+       bytes = min(bytes, pvsbufferlength);
+       if (r_novis.integer || !model->brush.num_pvsclusters || !Mod_Q1BSP_GetPVS(model, org))
+       {
+               memset(pvsbuffer, 0xFF, bytes);
+               return bytes;
+       }
+       if (!merge)
+               memset(pvsbuffer, 0, bytes);
+       Mod_Q1BSP_FatPVS_RecursiveBSPNode(model, org, radius, pvsbuffer, bytes, model->brush.data_nodes);
+       return bytes;
+}
+
+static void Mod_Q1BSP_RoundUpToHullSize(dp_model_t *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs)
+{
+       vec3_t size;
+       const hull_t *hull;
+
+       VectorSubtract(inmaxs, inmins, size);
+       if (cmodel->brush.ishlbsp)
+       {
+               if (size[0] < 3)
+                       hull = &cmodel->brushq1.hulls[0]; // 0x0x0
+               else if (size[0] <= 32)
+               {
+                       if (size[2] < 54) // pick the nearest of 36 or 72
+                               hull = &cmodel->brushq1.hulls[3]; // 32x32x36
+                       else
+                               hull = &cmodel->brushq1.hulls[1]; // 32x32x72
+               }
+               else
+                       hull = &cmodel->brushq1.hulls[2]; // 64x64x64
+       }
+       else
+       {
+               if (size[0] < 3)
+                       hull = &cmodel->brushq1.hulls[0]; // 0x0x0
+               else if (size[0] <= 32)
+                       hull = &cmodel->brushq1.hulls[1]; // 32x32x56
+               else
+                       hull = &cmodel->brushq1.hulls[2]; // 64x64x88
+       }
+       VectorCopy(inmins, outmins);
+       VectorAdd(inmins, hull->clip_size, outmaxs);
+}
+
+void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       int i, j, k;
+       dheader_t *header;
+       dmodel_t *bm;
+       mempool_t *mainmempool;
+       float dist, modelyawradius, modelradius;
+       msurface_t *surface;
+       int numshadowmeshtriangles;
+       hullinfo_t hullinfo;
+       int totalstylesurfaces, totalstyles, stylecounts[256], remapstyles[256];
+       model_brush_lightstyleinfo_t styleinfo[256];
+       unsigned char *datapointer;
+
+       mod->modeldatatypestring = "Q1BSP";
+
+       mod->type = mod_brushq1;
+
+       header = (dheader_t *)buffer;
+
+       i = LittleLong(header->version);
+       if (i != BSPVERSION && i != 30)
+               Host_Error("Mod_Q1BSP_Load: %s has wrong version number(%i should be %i(Quake) or 30(HalfLife)", mod->name, i, BSPVERSION);
+       mod->brush.ishlbsp = i == 30;
+
+// fill in hull info
+       VectorClear (hullinfo.hullsizes[0][0]);
+       VectorClear (hullinfo.hullsizes[0][1]);
+       if (mod->brush.ishlbsp)
+       {
+               mod->modeldatatypestring = "HLBSP";
+
+               hullinfo.filehulls = 4;
+               VectorSet (hullinfo.hullsizes[1][0], -16, -16, -36);
+               VectorSet (hullinfo.hullsizes[1][1], 16, 16, 36);
+               VectorSet (hullinfo.hullsizes[2][0], -32, -32, -32);
+               VectorSet (hullinfo.hullsizes[2][1], 32, 32, 32);
+               VectorSet (hullinfo.hullsizes[3][0], -16, -16, -18);
+               VectorSet (hullinfo.hullsizes[3][1], 16, 16, 18);
+       }
+       else
+       {
+               hullinfo.filehulls = 4;
+               VectorSet (hullinfo.hullsizes[1][0], -16, -16, -24);
+               VectorSet (hullinfo.hullsizes[1][1], 16, 16, 32);
+               VectorSet (hullinfo.hullsizes[2][0], -32, -32, -24);
+               VectorSet (hullinfo.hullsizes[2][1], 32, 32, 64);
+       }
+
+// read lumps
+       mod_base = (unsigned char*)buffer;
+       for (i = 0; i < HEADER_LUMPS; i++)
+       {
+               header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs);
+               header->lumps[i].filelen = LittleLong(header->lumps[i].filelen);
+       }
+
+       mod->soundfromcenter = true;
+       mod->TraceBox = Mod_Q1BSP_TraceBox;
+       mod->PointSuperContents = Mod_Q1BSP_PointSuperContents;
+       mod->brush.TraceLineOfSight = Mod_Q1BSP_TraceLineOfSight;
+       mod->brush.SuperContentsFromNativeContents = Mod_Q1BSP_SuperContentsFromNativeContents;
+       mod->brush.NativeContentsFromSuperContents = Mod_Q1BSP_NativeContentsFromSuperContents;
+       mod->brush.GetPVS = Mod_Q1BSP_GetPVS;
+       mod->brush.FatPVS = Mod_Q1BSP_FatPVS;
+       mod->brush.BoxTouchingPVS = Mod_Q1BSP_BoxTouchingPVS;
+       mod->brush.BoxTouchingLeafPVS = Mod_Q1BSP_BoxTouchingLeafPVS;
+       mod->brush.BoxTouchingVisibleLeafs = Mod_Q1BSP_BoxTouchingVisibleLeafs;
+       mod->brush.FindBoxClusters = Mod_Q1BSP_FindBoxClusters;
+       mod->brush.LightPoint = Mod_Q1BSP_LightPoint;
+       mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
+       mod->brush.AmbientSoundLevelsForPoint = Mod_Q1BSP_AmbientSoundLevelsForPoint;
+       mod->brush.RoundUpToHullSize = Mod_Q1BSP_RoundUpToHullSize;
+       mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf;
+       mod->Draw = R_Q1BSP_Draw;
+       mod->DrawDepth = R_Q1BSP_DrawDepth;
+       mod->DrawDebug = R_Q1BSP_DrawDebug;
+       mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+       mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
+       mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+       mod->DrawLight = R_Q1BSP_DrawLight;
+
+// load into heap
+
+       mod->brush.qw_md4sum = 0;
+       mod->brush.qw_md4sum2 = 0;
+       for (i = 0;i < HEADER_LUMPS;i++)
+       {
+               if (i == LUMP_ENTITIES)
+                       continue;
+               mod->brush.qw_md4sum ^= LittleLong(Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen));
+               if (i == LUMP_VISIBILITY || i == LUMP_LEAFS || i == LUMP_NODES)
+                       continue;
+               mod->brush.qw_md4sum2 ^= LittleLong(Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen));
+       }
+
+       Mod_Q1BSP_LoadEntities(&header->lumps[LUMP_ENTITIES]);
+       Mod_Q1BSP_LoadVertexes(&header->lumps[LUMP_VERTEXES]);
+       Mod_Q1BSP_LoadEdges(&header->lumps[LUMP_EDGES]);
+       Mod_Q1BSP_LoadSurfedges(&header->lumps[LUMP_SURFEDGES]);
+       Mod_Q1BSP_LoadTextures(&header->lumps[LUMP_TEXTURES]);
+       Mod_Q1BSP_LoadLighting(&header->lumps[LUMP_LIGHTING]);
+       Mod_Q1BSP_LoadPlanes(&header->lumps[LUMP_PLANES]);
+       Mod_Q1BSP_LoadTexinfo(&header->lumps[LUMP_TEXINFO]);
+       Mod_Q1BSP_LoadFaces(&header->lumps[LUMP_FACES]);
+       Mod_Q1BSP_LoadLeaffaces(&header->lumps[LUMP_MARKSURFACES]);
+       Mod_Q1BSP_LoadVisibility(&header->lumps[LUMP_VISIBILITY]);
+       // load submodels before leafs because they contain the number of vis leafs
+       Mod_Q1BSP_LoadSubmodels(&header->lumps[LUMP_MODELS], &hullinfo);
+       Mod_Q1BSP_LoadLeafs(&header->lumps[LUMP_LEAFS]);
+       Mod_Q1BSP_LoadNodes(&header->lumps[LUMP_NODES]);
+       Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES], &hullinfo);
+
+       // check if the map supports transparent water rendering
+       loadmodel->brush.supportwateralpha = Mod_Q1BSP_CheckWaterAlphaSupport();
+
+       if (mod->brushq1.data_compressedpvs)
+               Mem_Free(mod->brushq1.data_compressedpvs);
+       mod->brushq1.data_compressedpvs = NULL;
+       mod->brushq1.num_compressedpvs = 0;
+
+       Mod_Q1BSP_MakeHull0();
+       Mod_Q1BSP_MakePortals();
+
+       mod->numframes = 2;             // regular and alternate animation
+       mod->numskins = 1;
+
+       mainmempool = mod->mempool;
+
+       // make a single combined shadow mesh to allow optimized shadow volume creation
+       numshadowmeshtriangles = 0;
+       for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
+       {
+               surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
+               numshadowmeshtriangles += surface->num_triangles;
+       }
+       loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
+       for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
+               Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, loadmodel->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
+       loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true, false);
+       Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles);
+
+       if (loadmodel->brush.numsubmodels)
+               loadmodel->brush.submodels = (dp_model_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brush.numsubmodels * sizeof(dp_model_t *));
+
+       // LordHavoc: to clear the fog around the original quake submodel code, I
+       // will explain:
+       // first of all, some background info on the submodels:
+       // model 0 is the map model (the world, named maps/e1m1.bsp for example)
+       // model 1 and higher are submodels (doors and the like, named *1, *2, etc)
+       // now the weird for loop itself:
+       // the loop functions in an odd way, on each iteration it sets up the
+       // current 'mod' model (which despite the confusing code IS the model of
+       // the number i), at the end of the loop it duplicates the model to become
+       // the next submodel, and loops back to set up the new submodel.
+
+       // LordHavoc: now the explanation of my sane way (which works identically):
+       // set up the world model, then on each submodel copy from the world model
+       // and set up the submodel with the respective model info.
+       totalstylesurfaces = 0;
+       totalstyles = 0;
+       for (i = 0;i < mod->brush.numsubmodels;i++)
+       {
+               memset(stylecounts, 0, sizeof(stylecounts));
+               for (k = 0;k < mod->brushq1.submodels[i].numfaces;k++)
+               {
+                       surface = mod->data_surfaces + mod->brushq1.submodels[i].firstface + k;
+                       for (j = 0;j < MAXLIGHTMAPS;j++)
+                               stylecounts[surface->lightmapinfo->styles[j]]++;
+               }
+               for (k = 0;k < 255;k++)
+               {
+                       totalstyles++;
+                       if (stylecounts[k])
+                               totalstylesurfaces += stylecounts[k];
+               }
+       }
+       datapointer = (unsigned char *)Mem_Alloc(mod->mempool, mod->num_surfaces * sizeof(int) + totalstyles * sizeof(model_brush_lightstyleinfo_t) + totalstylesurfaces * sizeof(int *));
+       for (i = 0;i < mod->brush.numsubmodels;i++)
+       {
+               // LordHavoc: this code was originally at the end of this loop, but
+               // has been transformed to something more readable at the start here.
+
+               if (i > 0)
+               {
+                       char name[10];
+                       // duplicate the basic information
+                       dpsnprintf(name, sizeof(name), "*%i", i);
+                       mod = Mod_FindName(name, loadmodel->name);
+                       // copy the base model to this one
+                       *mod = *loadmodel;
+                       // rename the clone back to its proper name
+                       strlcpy(mod->name, name, sizeof(mod->name));
+                       mod->brush.parentmodel = loadmodel;
+                       // textures and memory belong to the main model
+                       mod->texturepool = NULL;
+                       mod->mempool = NULL;
+                       mod->brush.TraceLineOfSight = NULL;
+                       mod->brush.GetPVS = NULL;
+                       mod->brush.FatPVS = NULL;
+                       mod->brush.BoxTouchingPVS = NULL;
+                       mod->brush.BoxTouchingLeafPVS = NULL;
+                       mod->brush.BoxTouchingVisibleLeafs = NULL;
+                       mod->brush.FindBoxClusters = NULL;
+                       mod->brush.LightPoint = NULL;
+                       mod->brush.AmbientSoundLevelsForPoint = NULL;
+               }
+
+               mod->brush.submodel = i;
+
+               if (loadmodel->brush.submodels)
+                       loadmodel->brush.submodels[i] = mod;
+
+               bm = &mod->brushq1.submodels[i];
+
+               mod->brushq1.hulls[0].firstclipnode = bm->headnode[0];
+               for (j=1 ; j<MAX_MAP_HULLS ; j++)
+               {
+                       mod->brushq1.hulls[j].firstclipnode = bm->headnode[j];
+                       mod->brushq1.hulls[j].lastclipnode = mod->brushq1.numclipnodes - 1;
+               }
+
+               mod->firstmodelsurface = bm->firstface;
+               mod->nummodelsurfaces = bm->numfaces;
+
+               // make the model surface list (used by shadowing/lighting)
+               mod->sortedmodelsurfaces = (int *)datapointer;datapointer += mod->nummodelsurfaces * sizeof(int);
+               Mod_MakeSortedSurfaces(mod);
+
+               // copy the submodel bounds, then enlarge the yaw and rotated bounds according to radius
+               // (previously this code measured the radius of the vertices of surfaces in the submodel, but that broke submodels that contain only CLIP brushes, which do not produce surfaces)
+               VectorCopy(bm->mins, mod->normalmins);
+               VectorCopy(bm->maxs, mod->normalmaxs);
+               dist = max(fabs(mod->normalmins[0]), fabs(mod->normalmaxs[0]));
+               modelyawradius = max(fabs(mod->normalmins[1]), fabs(mod->normalmaxs[1]));
+               modelyawradius = dist*dist+modelyawradius*modelyawradius;
+               modelradius = max(fabs(mod->normalmins[2]), fabs(mod->normalmaxs[2]));
+               modelradius = modelyawradius + modelradius * modelradius;
+               modelyawradius = sqrt(modelyawradius);
+               modelradius = sqrt(modelradius);
+               mod->yawmins[0] = mod->yawmins[1] = -modelyawradius;
+               mod->yawmins[2] = mod->normalmins[2];
+               mod->yawmaxs[0] = mod->yawmaxs[1] =  modelyawradius;
+               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;
+
+               // this gets altered below if sky or water is used
+               mod->DrawSky = NULL;
+               mod->DrawAddWaterPlanes = NULL;
+
+               // scan surfaces for sky and water and flag the submodel as possessing these features or not
+               // build lightstyle lists for quick marking of dirty lightmaps when lightstyles flicker
+               if (mod->nummodelsurfaces)
+               {
+                       for (j = 0, surface = &mod->data_surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surface++)
+                               if (surface->texture->basematerialflags & MATERIALFLAG_SKY)
+                                       break;
+                       if (j < mod->nummodelsurfaces)
+                               mod->DrawSky = R_Q1BSP_DrawSky;
+
+                       for (j = 0, surface = &mod->data_surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surface++)
+                               if (surface->texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION))
+                                       break;
+                       if (j < mod->nummodelsurfaces)
+                               mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;
+
+                       // build lightstyle update chains
+                       // (used to rapidly mark lightmapupdateflags on many surfaces
+                       // when d_lightstylevalue changes)
+                       memset(stylecounts, 0, sizeof(stylecounts));
+                       for (k = 0;k < mod->nummodelsurfaces;k++)
+                       {
+                               surface = mod->data_surfaces + mod->firstmodelsurface + k;
+                               for (j = 0;j < MAXLIGHTMAPS;j++)
+                                       stylecounts[surface->lightmapinfo->styles[j]]++;
+                       }
+                       mod->brushq1.num_lightstyles = 0;
+                       for (k = 0;k < 255;k++)
+                       {
+                               if (stylecounts[k])
+                               {
+                                       styleinfo[mod->brushq1.num_lightstyles].style = k;
+                                       styleinfo[mod->brushq1.num_lightstyles].value = 0;
+                                       styleinfo[mod->brushq1.num_lightstyles].numsurfaces = 0;
+                                       styleinfo[mod->brushq1.num_lightstyles].surfacelist = (int *)datapointer;datapointer += stylecounts[k] * sizeof(int);
+                                       remapstyles[k] = mod->brushq1.num_lightstyles;
+                                       mod->brushq1.num_lightstyles++;
+                               }
+                       }
+                       for (k = 0;k < mod->nummodelsurfaces;k++)
+                       {
+                               surface = mod->data_surfaces + mod->firstmodelsurface + k;
+                               for (j = 0;j < MAXLIGHTMAPS;j++)
+                               {
+                                       if (surface->lightmapinfo->styles[j] != 255)
+                                       {
+                                               int r = remapstyles[surface->lightmapinfo->styles[j]];
+                                               styleinfo[r].surfacelist[styleinfo[r].numsurfaces++] = mod->firstmodelsurface + k;
+                                       }
+                               }
+                       }
+                       mod->brushq1.data_lightstyleinfo = (model_brush_lightstyleinfo_t *)datapointer;datapointer += mod->brushq1.num_lightstyles * sizeof(model_brush_lightstyleinfo_t);
+                       memcpy(mod->brushq1.data_lightstyleinfo, styleinfo, mod->brushq1.num_lightstyles * sizeof(model_brush_lightstyleinfo_t));
+               }
+               else
+               {
+                       // LordHavoc: empty submodel(lacrima.bsp has such a glitch)
+                       Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadmodel->name);
+               }
+               //mod->brushq1.num_visleafs = bm->visleafs;
+       }
+
+       Mod_Q1BSP_LoadMapBrushes();
+
+       //Mod_Q1BSP_ProcessLightList();
+
+       if (developer.integer >= 10)
+               Con_Printf("Some stats for q1bsp model \"%s\": %i faces, %i nodes, %i leafs, %i visleafs, %i visleafportals\n", loadmodel->name, loadmodel->num_surfaces, loadmodel->brush.num_nodes, loadmodel->brush.num_leafs, mod->brush.num_pvsclusters, loadmodel->brush.num_portals);
+}
+
+static void Mod_Q2BSP_LoadEntities(lump_t *l)
+{
+}
+
+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)
+{
 /*
-=================
-Mod_LoadClipnodes
-=================
+       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_LoadClipnodes (lump_t *l)
+}
+
+static void Mod_Q2BSP_LoadEdges(lump_t *l)
 {
-       dclipnode_t *in, *out;
-       int                     i, count;
-       hull_t          *hull;
+/*
+       d_t *in;
+       m_t *out;
+       int i, count;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
+               Host_Error("Mod_Q2BSP_LoadEdges: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
+       out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       loadmodel->clipnodes = out;
-       loadmodel->numclipnodes = count;
+       loadmodel-> = out;
+       loadmodel->num = count;
 
-       if (loadmodel->ishlbsp)
+       for (i = 0;i < count;i++, in++, out++)
        {
-               hull = &loadmodel->hulls[1];
-               hull->clipnodes = out;
-               hull->firstclipnode = 0;
-               hull->lastclipnode = count-1;
-               hull->planes = loadmodel->planes;
-               hull->clip_mins[0] = -16;
-               hull->clip_mins[1] = -16;
-               hull->clip_mins[2] = -36;
-               hull->clip_maxs[0] = 16;
-               hull->clip_maxs[1] = 16;
-               hull->clip_maxs[2] = 36;
-               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
+       }
+*/
+}
 
-               hull = &loadmodel->hulls[2];
-               hull->clipnodes = out;
-               hull->firstclipnode = 0;
-               hull->lastclipnode = count-1;
-               hull->planes = loadmodel->planes;
-               hull->clip_mins[0] = -32;
-               hull->clip_mins[1] = -32;
-               hull->clip_mins[2] = -32;
-               hull->clip_maxs[0] = 32;
-               hull->clip_maxs[1] = 32;
-               hull->clip_maxs[2] = 32;
-               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
+static void Mod_Q2BSP_LoadSurfEdges(lump_t *l)
+{
+/*
+       d_t *in;
+       m_t *out;
+       int i, count;
 
-               hull = &loadmodel->hulls[3];
-               hull->clipnodes = out;
-               hull->firstclipnode = 0;
-               hull->lastclipnode = count-1;
-               hull->planes = loadmodel->planes;
-               hull->clip_mins[0] = -16;
-               hull->clip_mins[1] = -16;
-               hull->clip_mins[2] = -18;
-               hull->clip_maxs[0] = 16;
-               hull->clip_maxs[1] = 16;
-               hull->clip_maxs[2] = 18;
-               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-       }
-       else
-       {
-               hull = &loadmodel->hulls[1];
-               hull->clipnodes = out;
-               hull->firstclipnode = 0;
-               hull->lastclipnode = count-1;
-               hull->planes = loadmodel->planes;
-               hull->clip_mins[0] = -16;
-               hull->clip_mins[1] = -16;
-               hull->clip_mins[2] = -24;
-               hull->clip_maxs[0] = 16;
-               hull->clip_maxs[1] = 16;
-               hull->clip_maxs[2] = 32;
-               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
+       in = (void *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q2BSP_LoadSurfEdges: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-               hull = &loadmodel->hulls[2];
-               hull->clipnodes = out;
-               hull->firstclipnode = 0;
-               hull->lastclipnode = count-1;
-               hull->planes = loadmodel->planes;
-               hull->clip_mins[0] = -32;
-               hull->clip_mins[1] = -32;
-               hull->clip_mins[2] = -24;
-               hull->clip_maxs[0] = 32;
-               hull->clip_maxs[1] = 32;
-               hull->clip_maxs[2] = 64;
-               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
-       }
+       loadmodel-> = out;
+       loadmodel->num = count;
 
-       for (i=0 ; i<count ; i++, out++, in++)
+       for (i = 0;i < count;i++, in++, out++)
        {
-               out->planenum = LittleLong(in->planenum);
-               out->children[0] = LittleShort(in->children[0]);
-               out->children[1] = LittleShort(in->children[1]);
-               if (out->children[0] >= count || out->children[1] >= count)
-                       Host_Error("Corrupt clipping hull (out of range child)\n");
        }
+*/
 }
 
+static void Mod_Q2BSP_LoadBrushes(lump_t *l)
+{
 /*
-=================
-Mod_MakeHull0
+       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));
 
-Duplicate the drawing hull structure as a clipping hull
-=================
+       loadmodel-> = out;
+       loadmodel->num = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+       }
 */
-static void Mod_MakeHull0 (void)
-{
-       mnode_t         *in;
-       dclipnode_t *out;
-       int                     i;
-       hull_t          *hull;
+}
 
-       hull = &loadmodel->hulls[0];
+static void Mod_Q2BSP_LoadBrushSides(lump_t *l)
+{
+/*
+       d_t *in;
+       m_t *out;
+       int i, count;
 
-       in = loadmodel->nodes;
-       out = Mem_Alloc(loadmodel->mempool, loadmodel->numnodes * sizeof(dclipnode_t));
+       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));
 
-       hull->clipnodes = out;
-       hull->firstclipnode = 0;
-       hull->lastclipnode = loadmodel->numnodes - 1;
-       hull->planes = loadmodel->planes;
+       loadmodel-> = out;
+       loadmodel->num = count;
 
-       for (i = 0;i < loadmodel->numnodes;i++, out++, in++)
+       for (i = 0;i < count;i++, in++, out++)
        {
-               out->planenum = in->plane - loadmodel->planes;
-               out->children[0] = in->children[0]->contents < 0 ? in->children[0]->contents : in->children[0] - loadmodel->nodes;
-               out->children[1] = in->children[1]->contents < 0 ? in->children[1]->contents : in->children[1] - loadmodel->nodes;
        }
+*/
 }
 
-/*
-=================
-Mod_LoadMarksurfaces
-=================
-*/
-static void Mod_LoadMarksurfaces (lump_t *l)
+static void Mod_Q2BSP_LoadAreas(lump_t *l)
 {
-       int i, j;
-       short *in;
+/*
+       d_t *in;
+       m_t *out;
+       int i, count;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       loadmodel->nummarksurfaces = l->filelen / sizeof(*in);
-       loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(int));
+               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));
 
-       for (i = 0;i < loadmodel->nummarksurfaces;i++)
+       loadmodel-> = out;
+       loadmodel->num = count;
+
+       for (i = 0;i < count;i++, in++, out++)
        {
-               j = (unsigned) LittleShort(in[i]);
-               if (j >= loadmodel->numsurfaces)
-                       Host_Error ("Mod_ParseMarksurfaces: bad surface number");
-               loadmodel->marksurfaces[i] = j;
        }
+*/
 }
 
-/*
-=================
-Mod_LoadSurfedges
-=================
-*/
-static void Mod_LoadSurfedges (lump_t *l)
+static void Mod_Q2BSP_LoadAreaPortals(lump_t *l)
 {
-       int             i;
-       int             *in;
+/*
+       d_t *in;
+       m_t *out;
+       int i, count;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       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]);
-}
+               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;
 
-/*
-=================
-Mod_LoadPlanes
-=================
+       for (i = 0;i < count;i++, in++, out++)
+       {
+       }
 */
-static void Mod_LoadPlanes (lump_t *l)
+}
+
+static void Mod_Q2BSP_LoadModels(lump_t *l)
 {
-       int                     i;
-       mplane_t        *out;
-       dplane_t        *in;
+/*
+       d_t *in;
+       m_t *out;
+       int i, count;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
-               Host_Error ("MOD_LoadBmodel: funny lump size in %s", loadmodel->name);
+               Host_Error("Mod_Q2BSP_LoadModels: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       loadmodel->numplanes = l->filelen / sizeof(*in);
-       loadmodel->planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->numplanes * sizeof(*out));
+       loadmodel-> = out;
+       loadmodel->num = count;
 
-       for (i = 0;i < loadmodel->numplanes;i++, in++, out++)
+       for (i = 0;i < count;i++, in++, out++)
        {
-               out->normal[0] = LittleFloat (in->normal[0]);
-               out->normal[1] = LittleFloat (in->normal[1]);
-               out->normal[2] = LittleFloat (in->normal[2]);
-               out->dist = LittleFloat (in->dist);
+       }
+*/
+}
 
-               PlaneClassify(out);
+void static Mod_Q2BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       int i;
+       q2dheader_t *header;
+
+       Host_Error("Mod_Q2BSP_Load: not yet implemented");
+
+       mod->modeldatatypestring = "Q2BSP";
+
+       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, Q2BSPVERSION);
+
+       mod_base = (unsigned char *)header;
+
+       // swap all the lumps
+       for (i = 0;i < (int) sizeof(*header) / 4;i++)
+               ((int *)header)[i] = LittleLong(((int *)header)[i]);
+
+       mod->brush.qw_md4sum = 0;
+       mod->brush.qw_md4sum2 = 0;
+       for (i = 0;i < Q2HEADER_LUMPS;i++)
+       {
+               if (i == Q2LUMP_ENTITIES)
+                       continue;
+               mod->brush.qw_md4sum ^= Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen);
+               if (i == Q2LUMP_VISIBILITY || i == Q2LUMP_LEAFS || i == Q2LUMP_NODES)
+                       continue;
+               mod->brush.qw_md4sum2 ^= Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen);
        }
+
+       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]);
 }
 
-#define MAX_POINTS_ON_WINDING 64
+static int Mod_Q3BSP_SuperContentsFromNativeContents(dp_model_t *model, int nativecontents);
+static int Mod_Q3BSP_NativeContentsFromSuperContents(dp_model_t *model, int supercontents);
 
-typedef struct
+static void Mod_Q3BSP_LoadEntities(lump_t *l)
 {
-       int numpoints;
-       int padding;
-       double points[8][3]; // variable sized
+       const char *data;
+       char key[128], value[MAX_INPUTLINE];
+       float v[3];
+       loadmodel->brushq3.num_lightgrid_cellsize[0] = 64;
+       loadmodel->brushq3.num_lightgrid_cellsize[1] = 64;
+       loadmodel->brushq3.num_lightgrid_cellsize[2] = 128;
+       if (!l->filelen)
+               return;
+       loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1);
+       memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen);
+       loadmodel->brush.entities[l->filelen] = 0;
+       data = loadmodel->brush.entities;
+       // some Q3 maps override the lightgrid_cellsize with a worldspawn key
+       if (data && COM_ParseToken_Simple(&data, false, false) && com_token[0] == '{')
+       {
+               while (1)
+               {
+                       if (!COM_ParseToken_Simple(&data, false, false))
+                               break; // error
+                       if (com_token[0] == '}')
+                               break; // end of worldspawn
+                       if (com_token[0] == '_')
+                               strlcpy(key, com_token + 1, sizeof(key));
+                       else
+                               strlcpy(key, com_token, sizeof(key));
+                       while (key[strlen(key)-1] == ' ') // remove trailing spaces
+                               key[strlen(key)-1] = 0;
+                       if (!COM_ParseToken_Simple(&data, false, false))
+                               break; // error
+                       strlcpy(value, com_token, sizeof(value));
+                       if (!strcmp("gridsize", key))
+                       {
+#if _MSC_VER >= 1400
+#define sscanf sscanf_s
+#endif
+                               if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3 && v[0] != 0 && v[1] != 0 && v[2] != 0)
+                                       VectorCopy(v, loadmodel->brushq3.num_lightgrid_cellsize);
+                       }
+               }
+       }
 }
-winding_t;
 
-/*
-==================
-NewWinding
-==================
-*/
-static winding_t *NewWinding (int points)
+static void Mod_Q3BSP_LoadTextures(lump_t *l)
 {
-       winding_t *w;
-       int size;
+       q3dtexture_t *in;
+       texture_t *out;
+       int i, count;
+
+       in = (q3dtexture_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadTextures: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (texture_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       if (points > MAX_POINTS_ON_WINDING)
-               Sys_Error("NewWinding: too many points\n");
+       loadmodel->data_textures = out;
+       loadmodel->num_textures = count;
+       loadmodel->num_texturesperskin = loadmodel->num_textures;
+
+       for (i = 0;i < count;i++)
+       {
+               strlcpy (out[i].name, in[i].name, sizeof (out[i].name));
+               out[i].surfaceflags = LittleLong(in[i].surfaceflags);
+               out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
+       }
 
-       size = sizeof(winding_t) + sizeof(double[3]) * (points - 8);
-       w = Mem_Alloc(loadmodel->mempool, size);
-       memset (w, 0, size);
+       if (cls.state == ca_dedicated)
+               return;
 
-       return w;
+       for (i = 0;i < count;i++, in++, out++)
+               Mod_LoadTextureFromQ3Shader(out, out->name, true, true, TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
 }
 
-static void FreeWinding (winding_t *w)
+static void Mod_Q3BSP_LoadPlanes(lump_t *l)
 {
-       Mem_Free(w);
+       q3dplane_t *in;
+       mplane_t *out;
+       int i, count;
+
+       in = (q3dplane_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadPlanes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mplane_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+       loadmodel->brush.data_planes = out;
+       loadmodel->brush.num_planes = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               out->normal[0] = LittleFloat(in->normal[0]);
+               out->normal[1] = LittleFloat(in->normal[1]);
+               out->normal[2] = LittleFloat(in->normal[2]);
+               out->dist = LittleFloat(in->dist);
+               PlaneClassify(out);
+       }
 }
 
-/*
-=================
-BaseWindingForPlane
-=================
-*/
-static winding_t *BaseWindingForPlane (mplane_t *p)
+static void Mod_Q3BSP_LoadBrushSides(lump_t *l)
 {
-       double org[3], vright[3], vup[3], normal[3];
-       winding_t *w;
+       q3dbrushside_t *in;
+       q3mbrushside_t *out;
+       int i, n, count;
+
+       in = (q3dbrushside_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadBrushSides: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (q3mbrushside_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+       loadmodel->brush.data_brushsides = out;
+       loadmodel->brush.num_brushsides = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               n = LittleLong(in->planeindex);
+               if (n < 0 || n >= loadmodel->brush.num_planes)
+                       Host_Error("Mod_Q3BSP_LoadBrushSides: invalid planeindex %i (%i planes)", n, loadmodel->brush.num_planes);
+               out->plane = loadmodel->brush.data_planes + n;
+               n = LittleLong(in->textureindex);
+               if (n < 0 || n >= loadmodel->num_textures)
+                       Host_Error("Mod_Q3BSP_LoadBrushSides: invalid textureindex %i (%i textures)", n, loadmodel->num_textures);
+               out->texture = loadmodel->data_textures + n;
+       }
+}
 
-       VectorCopy(p->normal, normal);
-       VectorVectorsDouble(normal, vright, vup);
+static void Mod_Q3BSP_LoadBrushSides_IG(lump_t *l)
+{
+       q3dbrushside_ig_t *in;
+       q3mbrushside_t *out;
+       int i, n, count;
 
-       VectorScale (vup, 1024.0*1024.0*1024.0, vup);
-       VectorScale (vright, 1024.0*1024.0*1024.0, vright);
+       in = (q3dbrushside_ig_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadBrushSides: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (q3mbrushside_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       // project a really big axis aligned box onto the plane
-       w = NewWinding (4);
+       loadmodel->brush.data_brushsides = out;
+       loadmodel->brush.num_brushsides = count;
 
-       VectorScale (p->normal, p->dist, org);
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               n = LittleLong(in->planeindex);
+               if (n < 0 || n >= loadmodel->brush.num_planes)
+                       Host_Error("Mod_Q3BSP_LoadBrushSides: invalid planeindex %i (%i planes)", n, loadmodel->brush.num_planes);
+               out->plane = loadmodel->brush.data_planes + n;
+               n = LittleLong(in->textureindex);
+               if (n < 0 || n >= loadmodel->num_textures)
+                       Host_Error("Mod_Q3BSP_LoadBrushSides: invalid textureindex %i (%i textures)", n, loadmodel->num_textures);
+               out->texture = loadmodel->data_textures + n;
+       }
+}
 
-       VectorSubtract (org, vright, w->points[0]);
-       VectorAdd (w->points[0], vup, w->points[0]);
+static void Mod_Q3BSP_LoadBrushes(lump_t *l)
+{
+       q3dbrush_t *in;
+       q3mbrush_t *out;
+       int i, j, n, c, count, maxplanes;
+       colplanef_t *planes;
 
-       VectorAdd (org, vright, w->points[1]);
-       VectorAdd (w->points[1], vup, w->points[1]);
+       in = (q3dbrush_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadBrushes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (q3mbrush_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       VectorAdd (org, vright, w->points[2]);
-       VectorSubtract (w->points[2], vup, w->points[2]);
+       loadmodel->brush.data_brushes = out;
+       loadmodel->brush.num_brushes = count;
 
-       VectorSubtract (org, vright, w->points[3]);
-       VectorSubtract (w->points[3], vup, w->points[3]);
+       maxplanes = 0;
+       planes = NULL;
 
-       w->numpoints = 4;
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               n = LittleLong(in->firstbrushside);
+               c = LittleLong(in->numbrushsides);
+               if (n < 0 || n + c > loadmodel->brush.num_brushsides)
+                       Host_Error("Mod_Q3BSP_LoadBrushes: invalid brushside range %i : %i (%i brushsides)", n, n + c, loadmodel->brush.num_brushsides);
+               out->firstbrushside = loadmodel->brush.data_brushsides + n;
+               out->numbrushsides = c;
+               n = LittleLong(in->textureindex);
+               if (n < 0 || n >= loadmodel->num_textures)
+                       Host_Error("Mod_Q3BSP_LoadBrushes: invalid textureindex %i (%i textures)", n, loadmodel->num_textures);
+               out->texture = loadmodel->data_textures + n;
+
+               // make a list of mplane_t structs to construct a colbrush from
+               if (maxplanes < out->numbrushsides)
+               {
+                       maxplanes = out->numbrushsides;
+                       if (planes)
+                               Mem_Free(planes);
+                       planes = (colplanef_t *)Mem_Alloc(tempmempool, sizeof(colplanef_t) * maxplanes);
+               }
+               for (j = 0;j < out->numbrushsides;j++)
+               {
+                       VectorCopy(out->firstbrushside[j].plane->normal, planes[j].normal);
+                       planes[j].dist = out->firstbrushside[j].plane->dist;
+                       planes[j].q3surfaceflags = out->firstbrushside[j].texture->surfaceflags;
+                       planes[j].texture = out->firstbrushside[j].texture;
+               }
+               // make the colbrush from the planes
+               out->colbrushf = Collision_NewBrushFromPlanes(loadmodel->mempool, out->numbrushsides, planes, out->texture->supercontents);
 
-       return w;
+               // this whole loop can take a while (e.g. on redstarrepublic4)
+               CL_KeepaliveMessage(false);
+       }
+       if (planes)
+               Mem_Free(planes);
 }
 
-/*
-==================
-ClipWinding
-
-Clips the winding to the plane, returning the new winding on the positive side
-Frees the input winding.
-If keepon is true, an exactly on-plane winding will be saved, otherwise
-it will be clipped away.
-==================
-*/
-static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
+static void Mod_Q3BSP_LoadEffects(lump_t *l)
 {
-       double  dists[MAX_POINTS_ON_WINDING + 1];
-       int             sides[MAX_POINTS_ON_WINDING + 1];
-       int             counts[3];
-       double  dot;
-       int             i, j;
-       double  *p1, *p2;
-       double  mid[3];
-       winding_t       *neww;
-       int             maxpts;
+       q3deffect_t *in;
+       q3deffect_t *out;
+       int i, n, count;
+
+       in = (q3deffect_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadEffects: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (q3deffect_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       counts[SIDE_FRONT] = counts[SIDE_BACK] = counts[SIDE_ON] = 0;
+       loadmodel->brushq3.data_effects = out;
+       loadmodel->brushq3.num_effects = count;
 
-       // determine sides for each point
-       for (i = 0;i < in->numpoints;i++)
+       for (i = 0;i < count;i++, in++, out++)
        {
-               dists[i] = dot = DotProduct (in->points[i], split->normal) - split->dist;
-               if (dot > ON_EPSILON)
-                       sides[i] = SIDE_FRONT;
-               else if (dot < -ON_EPSILON)
-                       sides[i] = SIDE_BACK;
-               else
-                       sides[i] = SIDE_ON;
-               counts[sides[i]]++;
+               strlcpy (out->shadername, in->shadername, sizeof (out->shadername));
+               n = LittleLong(in->brushindex);
+               if (n >= loadmodel->brush.num_brushes)
+               {
+                       Con_Printf("Mod_Q3BSP_LoadEffects: invalid brushindex %i (%i brushes), setting to -1\n", n, loadmodel->brush.num_brushes);
+                       n = -1;
+               }
+               out->brushindex = n;
+               out->unknown = LittleLong(in->unknown);
        }
-       sides[i] = sides[0];
-       dists[i] = dists[0];
+}
 
-       if (keepon && !counts[0] && !counts[1])
-               return in;
+static void Mod_Q3BSP_LoadVertices(lump_t *l)
+{
+       q3dvertex_t *in;
+       int i, count;
 
-       if (!counts[0])
+       in = (q3dvertex_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadVertices: funny lump size in %s",loadmodel->name);
+       loadmodel->brushq3.num_vertices = count = l->filelen / sizeof(*in);
+       loadmodel->brushq3.data_vertex3f = (float *)Mem_Alloc(loadmodel->mempool, count * (sizeof(float) * (3 + 3 + 2 + 2 + 4)));
+       loadmodel->brushq3.data_normal3f = loadmodel->brushq3.data_vertex3f + count * 3;
+       loadmodel->brushq3.data_texcoordtexture2f = loadmodel->brushq3.data_normal3f + count * 3;
+       loadmodel->brushq3.data_texcoordlightmap2f = loadmodel->brushq3.data_texcoordtexture2f + count * 2;
+       loadmodel->brushq3.data_color4f = loadmodel->brushq3.data_texcoordlightmap2f + count * 2;
+
+       for (i = 0;i < count;i++, in++)
        {
-               FreeWinding (in);
-               return NULL;
+               loadmodel->brushq3.data_vertex3f[i * 3 + 0] = LittleFloat(in->origin3f[0]);
+               loadmodel->brushq3.data_vertex3f[i * 3 + 1] = LittleFloat(in->origin3f[1]);
+               loadmodel->brushq3.data_vertex3f[i * 3 + 2] = LittleFloat(in->origin3f[2]);
+               loadmodel->brushq3.data_normal3f[i * 3 + 0] = LittleFloat(in->normal3f[0]);
+               loadmodel->brushq3.data_normal3f[i * 3 + 1] = LittleFloat(in->normal3f[1]);
+               loadmodel->brushq3.data_normal3f[i * 3 + 2] = LittleFloat(in->normal3f[2]);
+               loadmodel->brushq3.data_texcoordtexture2f[i * 2 + 0] = LittleFloat(in->texcoord2f[0]);
+               loadmodel->brushq3.data_texcoordtexture2f[i * 2 + 1] = LittleFloat(in->texcoord2f[1]);
+               loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 0] = LittleFloat(in->lightmap2f[0]);
+               loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 1] = LittleFloat(in->lightmap2f[1]);
+               // svector/tvector are calculated later in face loading
+               loadmodel->brushq3.data_color4f[i * 4 + 0] = in->color4ub[0] * (1.0f / 255.0f);
+               loadmodel->brushq3.data_color4f[i * 4 + 1] = in->color4ub[1] * (1.0f / 255.0f);
+               loadmodel->brushq3.data_color4f[i * 4 + 2] = in->color4ub[2] * (1.0f / 255.0f);
+               loadmodel->brushq3.data_color4f[i * 4 + 3] = in->color4ub[3] * (1.0f / 255.0f);
        }
-       if (!counts[1])
-               return in;
-
-       maxpts = in->numpoints+4;       // can't use counts[0]+2 because of fp grouping errors
-       if (maxpts > MAX_POINTS_ON_WINDING)
-               Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+}
 
-       neww = NewWinding (maxpts);
+static void Mod_Q3BSP_LoadTriangles(lump_t *l)
+{
+       int *in;
+       int *out;
+       int i, count;
 
-       for (i = 0;i < in->numpoints;i++)
-       {
-               if (neww->numpoints >= maxpts)
-                       Sys_Error ("ClipWinding: points exceeded estimate");
+       in = (int *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(int[3]))
+               Host_Error("Mod_Q3BSP_LoadTriangles: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (int *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-               p1 = in->points[i];
+       loadmodel->brushq3.num_triangles = count / 3;
+       loadmodel->brushq3.data_element3i = out;
 
-               if (sides[i] == SIDE_ON)
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               *out = LittleLong(*in);
+               if (*out < 0 || *out >= loadmodel->brushq3.num_vertices)
                {
-                       VectorCopy (p1, neww->points[neww->numpoints]);
-                       neww->numpoints++;
-                       continue;
+                       Con_Printf("Mod_Q3BSP_LoadTriangles: invalid vertexindex %i (%i vertices), setting to 0\n", *out, loadmodel->brushq3.num_vertices);
+                       *out = 0;
                }
+       }
+}
+
+static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
+{
+       q3dlightmap_t *input_pointer;
+       int i, j, k, count, power, power2, mask, endlightmap, mergewidth, mergeheight;
+       unsigned char *c;
+
+       unsigned char *convertedpixels;
+       char mapname[MAX_QPATH];
+       int size, bytesperpixel, rgbmap[3];
+       qboolean external;
+       unsigned char *inpixels[10000]; // max count q3map2 can output (it uses 4 digits)
+
+       // defaults for q3bsp
+       size = 128;
+       bytesperpixel = 3;
+       rgbmap[0] = 2;
+       rgbmap[1] = 1;
+       rgbmap[2] = 0;
+       external = false;
+       loadmodel->brushq3.lightmapsize = 128;
+
+       if (cls.state == ca_dedicated)
+               return;
+
+       if(mod_q3bsp_nolightmaps.integer)
+       {
+               return;
+       }
+       else if(l->filelen)
+       {
+               // prefer internal LMs for compatibility (a BSP contains no info on whether external LMs exist)
+               if (developer_loading.integer)
+                       Con_Printf("Using internal lightmaps\n");
+               input_pointer = (q3dlightmap_t *)(mod_base + l->fileofs);
+               if (l->filelen % sizeof(*input_pointer))
+                       Host_Error("Mod_Q3BSP_LoadLightmaps: funny lump size in %s",loadmodel->name);
+               count = l->filelen / sizeof(*input_pointer);
+               for(i = 0; i < count; ++i)
+                       inpixels[i] = input_pointer[i].rgb;
+       }
+       else
+       {
+               // no internal lightmaps
+               // try external lightmaps
+               if (developer_loading.integer)
+                       Con_Printf("Using external lightmaps\n");
+               FS_StripExtension(loadmodel->name, mapname, sizeof(mapname));
+               inpixels[0] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, 0), false, false);
+               if(!inpixels[0])
+                       return;
 
-               if (sides[i] == SIDE_FRONT)
+               // using EXTERNAL lightmaps instead
+               if(image_width != (int) CeilPowerOf2(image_width) || image_width != image_height)
                {
-                       VectorCopy (p1, neww->points[neww->numpoints]);
-                       neww->numpoints++;
+                       Mem_Free(inpixels[0]);
+                       Host_Error("Mod_Q3BSP_LoadLightmaps: invalid external lightmap size in %s",loadmodel->name);
                }
 
-               if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-                       continue;
+               size = image_width;
+               bytesperpixel = 4;
+               rgbmap[0] = 0;
+               rgbmap[1] = 1;
+               rgbmap[2] = 2;
+               external = true;
 
-               // generate a split point
-               p2 = in->points[(i+1)%in->numpoints];
+               for(count = 1; ; ++count)
+               {
+                       inpixels[count] = loadimagepixelsbgra(va("%s/lm_%04d", mapname, count), false, false);
+                       if(!inpixels[count])
+                               break; // we got all of them
+                       if(image_width != size || image_height != size)
+                       {
+                               for(i = 0; i <= count; ++i)
+                                       Mem_Free(inpixels[i]);
+                               Host_Error("Mod_Q3BSP_LoadLightmaps: invalid external lightmap size in %s",loadmodel->name);
+                       }
+               }
+       }
 
-               dot = dists[i] / (dists[i]-dists[i+1]);
-               for (j = 0;j < 3;j++)
-               {       // avoid round off error when possible
-                       if (split->normal[j] == 1)
-                               mid[j] = split->dist;
-                       else if (split->normal[j] == -1)
-                               mid[j] = -split->dist;
-                       else
-                               mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+       convertedpixels = (unsigned char *) Mem_Alloc(tempmempool, size*size*4);
+       loadmodel->brushq3.lightmapsize = size;
+       loadmodel->brushq3.num_originallightmaps = count;
+
+       // now check the surfaces to see if any of them index an odd numbered
+       // lightmap, if so this is not a deluxemapped bsp file
+       //
+       // also check what lightmaps are actually used, because q3map2 sometimes
+       // (always?) makes an unused one at the end, which
+       // q3map2 sometimes (or always?) makes a second blank lightmap for no
+       // reason when only one lightmap is used, which can throw off the
+       // deluxemapping detection method, so check 2-lightmap bsp's specifically
+       // to see if the second lightmap is blank, if so it is not deluxemapped.
+       loadmodel->brushq3.deluxemapping = !(count & 1);
+       loadmodel->brushq3.deluxemapping_modelspace = true;
+       endlightmap = 0;
+       if (loadmodel->brushq3.deluxemapping)
+       {
+               int facecount = faceslump->filelen / sizeof(q3dface_t);
+               q3dface_t *faces = (q3dface_t *)(mod_base + faceslump->fileofs);
+               for (i = 0;i < facecount;i++)
+               {
+                       j = LittleLong(faces[i].lightmapindex);
+                       if (j >= 0)
+                       {
+                               endlightmap = max(endlightmap, j + 1);
+                               if ((j & 1) || j + 1 >= count)
+                               {
+                                       loadmodel->brushq3.deluxemapping = false;
+                                       break;
+                               }
+                       }
                }
+       }
 
-               VectorCopy (mid, neww->points[neww->numpoints]);
-               neww->numpoints++;
+       // q3map2 sometimes (or always?) makes a second blank lightmap for no
+       // reason when only one lightmap is used, which can throw off the
+       // deluxemapping detection method, so check 2-lightmap bsp's specifically
+       // to see if the second lightmap is blank, if so it is not deluxemapped.
+       //
+       // further research has shown q3map2 sometimes creates a deluxemap and two
+       // blank lightmaps, which must be handled properly as well
+       if (endlightmap == 1 && count > 1)
+       {
+               c = inpixels[1];
+               for (i = 0;i < size*size;i++)
+               {
+                       if (c[bytesperpixel*i + rgbmap[0]])
+                               break;
+                       if (c[bytesperpixel*i + rgbmap[1]])
+                               break;
+                       if (c[bytesperpixel*i + rgbmap[2]])
+                               break;
+               }
+               if (i == size*size)
+               {
+                       // all pixels in the unused lightmap were black...
+                       loadmodel->brushq3.deluxemapping = false;
+               }
        }
 
-       // free the original winding
-       FreeWinding (in);
+       Con_DPrintf("%s is %sdeluxemapped\n", loadmodel->name, loadmodel->brushq3.deluxemapping ? "" : "not ");
 
-       return neww;
-}
+       // figure out what the most reasonable merge power is within limits
 
+       loadmodel->brushq3.num_lightmapmergepower = 0;
 
-/*
-==================
-DivideWinding
-
-Divides a winding by a plane, producing one or two windings.  The
-original winding is not damaged or freed.  If only on one side, the
-returned winding will be the input winding.  If on both sides, two
-new windings will be created.
-==================
-*/
-static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t **back)
-{
-       double  dists[MAX_POINTS_ON_WINDING + 1];
-       int             sides[MAX_POINTS_ON_WINDING + 1];
-       int             counts[3];
-       double  dot;
-       int             i, j;
-       double  *p1, *p2;
-       double  mid[3];
-       winding_t       *f, *b;
-       int             maxpts;
+       for(i = 0; (128 << i) < size; ++i)
+               ;
+       // i is now 0 for 128, 1 for 256, etc
+
+       for (power = 1;power + i <= mod_q3bsp_lightmapmergepower.integer && (size << power) <= gl_max_texture_size && (1 << (power * 2)) < 4 * (count >> loadmodel->brushq3.deluxemapping); power++)
+               loadmodel->brushq3.num_lightmapmergepower = power;
+
+       loadmodel->brushq3.num_lightmapmerge = 1 << loadmodel->brushq3.num_lightmapmergepower;
+
+       loadmodel->brushq3.num_mergedlightmaps = ((count >> loadmodel->brushq3.deluxemapping) + (1 << (loadmodel->brushq3.num_lightmapmergepower * 2)) - 1) >> (loadmodel->brushq3.num_lightmapmergepower * 2);
+       loadmodel->brushq3.data_lightmaps = (rtexture_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brushq3.num_mergedlightmaps * sizeof(rtexture_t *));
+       if (loadmodel->brushq3.deluxemapping)
+               loadmodel->brushq3.data_deluxemaps = (rtexture_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brushq3.num_mergedlightmaps * sizeof(rtexture_t *));
 
-       counts[SIDE_FRONT] = counts[SIDE_BACK] = counts[SIDE_ON] = 0;
+       // allocate a texture pool if we need it
+       if (loadmodel->texturepool == NULL && cls.state != ca_dedicated)
+               loadmodel->texturepool = R_AllocTexturePool();
+
+       power = loadmodel->brushq3.num_lightmapmergepower;
+       power2 = power * 2;
+       mask = (1 << power) - 1;
+       for (i = 0;i < count;i++)
+       {
+               // figure out which merged lightmap texture this fits into
+               int lightmapindex = i >> (loadmodel->brushq3.deluxemapping + power2);
+               for (k = 0;k < size*size;k++)
+               {
+                       convertedpixels[k*4+0] = inpixels[i][k*bytesperpixel+rgbmap[0]];
+                       convertedpixels[k*4+1] = inpixels[i][k*bytesperpixel+rgbmap[1]];
+                       convertedpixels[k*4+2] = inpixels[i][k*bytesperpixel+rgbmap[2]];
+                       convertedpixels[k*4+3] = 255;
+               }
+               if (loadmodel->brushq3.num_lightmapmergepower > 0)
+               {
+                       // if the lightmap has not been allocated yet, create it
+                       if (!loadmodel->brushq3.data_lightmaps[lightmapindex])
+                       {
+                               // create a lightmap only as large as necessary to hold the
+                               // remaining size*size blocks
+                               // if there are multiple merged lightmap textures then they will
+                               // all be full size except the last one which may be smaller
+                               // because it only needs to the remaining blocks, and it will often
+                               // be odd sizes like 2048x512 due to only being 25% full or so.
+                               j = (count >> loadmodel->brushq3.deluxemapping) - (lightmapindex << power2);
+                               for (mergewidth = 1;mergewidth < j && mergewidth < (1 << power);mergewidth *= 2)
+                                       ;
+                               for (mergeheight = 1;mergewidth*mergeheight < j && mergeheight < (1 << power);mergeheight *= 2)
+                                       ;
+                               if (developer_loading.integer)
+                                       Con_Printf("lightmap merge texture #%i is %ix%i (%i of %i used)\n", lightmapindex, mergewidth*size, mergeheight*size, min(j, mergewidth*mergeheight), mergewidth*mergeheight);
+                               loadmodel->brushq3.data_lightmaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), mergewidth * size, mergeheight * size, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_PRECACHE | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), NULL);
+                               if (loadmodel->brushq3.data_deluxemaps)
+                                       loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), mergewidth * size, mergeheight * size, NULL, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_PRECACHE | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : 0), NULL);
+                       }
+                       mergewidth = R_TextureWidth(loadmodel->brushq3.data_lightmaps[lightmapindex]) / size;
+                       mergeheight = R_TextureHeight(loadmodel->brushq3.data_lightmaps[lightmapindex]) / size;
+                       j = (i >> loadmodel->brushq3.deluxemapping) & ((1 << power2) - 1);
+                       if (loadmodel->brushq3.deluxemapping && (i & 1))
+                               R_UpdateTexture(loadmodel->brushq3.data_deluxemaps[lightmapindex], convertedpixels, (j % mergewidth) * size, (j / mergewidth) * size, size, size);
+                       else
+                               R_UpdateTexture(loadmodel->brushq3.data_lightmaps [lightmapindex], convertedpixels, (j % mergewidth) * size, (j / mergewidth) * size, size, size);
+               }
+               else
+               {
+                       // figure out which merged lightmap texture this fits into
+                       if (loadmodel->brushq3.deluxemapping && (i & 1))
+                               loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), size, size, convertedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_PRECACHE | (gl_texturecompression_q3bspdeluxemaps.integer ? TEXF_COMPRESS : 0), NULL);
+                       else
+                               loadmodel->brushq3.data_lightmaps [lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), size, size, convertedpixels, TEXTYPE_BGRA, TEXF_FORCELINEAR | TEXF_PRECACHE | (gl_texturecompression_q3bsplightmaps.integer ? TEXF_COMPRESS : 0), NULL);
+               }
+       }
 
-       // determine sides for each point
-       for (i = 0;i < in->numpoints;i++)
+       Mem_Free(convertedpixels);
+       if(external)
        {
-               dot = DotProduct (in->points[i], split->normal);
-               dot -= split->dist;
-               dists[i] = dot;
-               if (dot > ON_EPSILON) sides[i] = SIDE_FRONT;
-               else if (dot < -ON_EPSILON) sides[i] = SIDE_BACK;
-               else sides[i] = SIDE_ON;
-               counts[sides[i]]++;
+               for(i = 0; i < count; ++i)
+                       Mem_Free(inpixels[i]);
        }
-       sides[i] = sides[0];
-       dists[i] = dists[0];
-
-       *front = *back = NULL;
+}
 
-       if (!counts[0])
+static void Mod_Q3BSP_BuildBBoxes(const int *element3i, int num_triangles, const float *vertex3f, float **collisionbbox6f, int *collisionstride, int stride)
+{
+       int j, k, cnt, tri;
+       float *mins, *maxs;
+       const float *vert;
+       if(stride > 0)
        {
-               *back = in;
-               return;
+               *collisionstride = stride;
+               cnt = (num_triangles + stride - 1) / stride;
+               *collisionbbox6f = (float *) Mem_Alloc(loadmodel->mempool, sizeof(float[6]) * cnt);
+               for(j = 0; j < cnt; ++j)
+               {
+                       mins = &((*collisionbbox6f)[6 * j + 0]);
+                       maxs = &((*collisionbbox6f)[6 * j + 3]);
+                       for(k = 0; k < stride; ++k)
+                       {
+                               tri = j * stride + k;
+                               if(tri >= num_triangles)
+                                       break;
+                               vert = &(vertex3f[element3i[3 * tri + 0] * 3]);
+                               if(!k || vert[0] < mins[0]) mins[0] = vert[0];
+                               if(!k || vert[1] < mins[1]) mins[1] = vert[1];
+                               if(!k || vert[2] < mins[2]) mins[2] = vert[2];
+                               if(!k || vert[0] > maxs[0]) maxs[0] = vert[0];
+                               if(!k || vert[1] > maxs[1]) maxs[1] = vert[1];
+                               if(!k || vert[2] > maxs[2]) maxs[2] = vert[2];
+                               vert = &(vertex3f[element3i[3 * tri + 1] * 3]);
+                               if(vert[0] < mins[0]) mins[0] = vert[0];
+                               if(vert[1] < mins[1]) mins[1] = vert[1];
+                               if(vert[2] < mins[2]) mins[2] = vert[2];
+                               if(vert[0] > maxs[0]) maxs[0] = vert[0];
+                               if(vert[1] > maxs[1]) maxs[1] = vert[1];
+                               if(vert[2] > maxs[2]) maxs[2] = vert[2];
+                               vert = &(vertex3f[element3i[3 * tri + 2] * 3]);
+                               if(vert[0] < mins[0]) mins[0] = vert[0];
+                               if(vert[1] < mins[1]) mins[1] = vert[1];
+                               if(vert[2] < mins[2]) mins[2] = vert[2];
+                               if(vert[0] > maxs[0]) maxs[0] = vert[0];
+                               if(vert[1] > maxs[1]) maxs[1] = vert[1];
+                               if(vert[2] > maxs[2]) maxs[2] = vert[2];
+                       }
+               }
        }
-       if (!counts[1])
+       else
        {
-               *front = in;
-               return;
+               *collisionstride = 0;
+               *collisionbbox6f = NULL;
        }
+}
 
-       maxpts = in->numpoints+4;       // can't use counts[0]+2 because of fp grouping errors
+typedef struct patchtess_s
+{
+       patchinfo_t info;
+
+       // Auxiliary data used only by patch loading code in Mod_Q3BSP_LoadFaces
+       int surface_id;
+       float lodgroup[6];
+       float *originalvertex3f;
+} patchtess_t;
+
+#define PATCHTESS_SAME_LODGROUP(a,b) \
+       ( \
+               (a).lodgroup[0] == (b).lodgroup[0] && \
+               (a).lodgroup[1] == (b).lodgroup[1] && \
+               (a).lodgroup[2] == (b).lodgroup[2] && \
+               (a).lodgroup[3] == (b).lodgroup[3] && \
+               (a).lodgroup[4] == (b).lodgroup[4] && \
+               (a).lodgroup[5] == (b).lodgroup[5] \
+       )
+
+static void Mod_Q3BSP_LoadFaces(lump_t *l)
+{
+       q3dface_t *in, *oldin;
+       msurface_t *out, *oldout;
+       int i, oldi, j, n, count, invalidelements, patchsize[2], finalwidth, finalheight, xtess, ytess, finalvertices, finaltriangles, firstvertex, firstelement, type, oldnumtriangles, oldnumtriangles2, meshvertices, meshtriangles, numvertices, numtriangles, cxtess, cytess;
+       float lightmaptcbase[2], lightmaptcscale[2];
+       //int *originalelement3i;
+       //int *originalneighbor3i;
+       float *originalvertex3f;
+       //float *originalsvector3f;
+       //float *originaltvector3f;
+       float *originalnormal3f;
+       float *originalcolor4f;
+       float *originaltexcoordtexture2f;
+       float *originaltexcoordlightmap2f;
+       float *v;
+       patchtess_t *patchtess = NULL;
+       int patchtesscount = 0;
+       qboolean again;
+
+       in = (q3dface_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadFaces: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (msurface_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       if (maxpts > MAX_POINTS_ON_WINDING)
-               Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+       loadmodel->data_surfaces = out;
+       loadmodel->num_surfaces = count;
 
-       *front = f = NewWinding (maxpts);
-       *back = b = NewWinding (maxpts);
+       if(count > 0)
+               patchtess = (patchtess_t*) Mem_Alloc(tempmempool, count * sizeof(*patchtess));
 
-       for (i = 0;i < in->numpoints;i++)
+       i = 0;
+       oldi = i;
+       oldin = in;
+       oldout = out;
+       meshvertices = 0;
+       meshtriangles = 0;
+       for (;i < count;i++, in++, out++)
        {
-               if (f->numpoints >= maxpts || b->numpoints >= maxpts)
-                       Sys_Error ("DivideWinding: points exceeded estimate");
-
-               p1 = in->points[i];
-
-               if (sides[i] == SIDE_ON)
+               // check face type first
+               type = LittleLong(in->type);
+               if (type != Q3FACETYPE_FLAT
+                && type != Q3FACETYPE_PATCH
+                && type != Q3FACETYPE_MESH
+                && type != Q3FACETYPE_FLARE)
                {
-                       VectorCopy (p1, f->points[f->numpoints]);
-                       f->numpoints++;
-                       VectorCopy (p1, b->points[b->numpoints]);
-                       b->numpoints++;
+                       Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i: unknown face type %i\n", i, type);
                        continue;
                }
 
-               if (sides[i] == SIDE_FRONT)
+               n = LittleLong(in->textureindex);
+               if (n < 0 || n >= loadmodel->num_textures)
                {
-                       VectorCopy (p1, f->points[f->numpoints]);
-                       f->numpoints++;
+                       Con_DPrintf("Mod_Q3BSP_LoadFaces: face #%i: invalid textureindex %i (%i textures)\n", i, n, loadmodel->num_textures);
+                       continue;
                }
-               else if (sides[i] == SIDE_BACK)
+               out->texture = loadmodel->data_textures + n;
+               n = LittleLong(in->effectindex);
+               if (n < -1 || n >= loadmodel->brushq3.num_effects)
                {
-                       VectorCopy (p1, b->points[b->numpoints]);
-                       b->numpoints++;
+                       if (developer.integer >= 100)
+                               Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid effectindex %i (%i effects)\n", i, out->texture->name, n, loadmodel->brushq3.num_effects);
+                       n = -1;
                }
+               if (n == -1)
+                       out->effect = NULL;
+               else
+                       out->effect = loadmodel->brushq3.data_effects + n;
 
-               if (sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-                       continue;
-
-               // generate a split point
-               p2 = in->points[(i+1)%in->numpoints];
-
-               dot = dists[i] / (dists[i]-dists[i+1]);
-               for (j = 0;j < 3;j++)
-               {       // avoid round off error when possible
-                       if (split->normal[j] == 1)
-                               mid[j] = split->dist;
-                       else if (split->normal[j] == -1)
-                               mid[j] = -split->dist;
+               if (cls.state != ca_dedicated)
+               {
+                       out->lightmaptexture = NULL;
+                       out->deluxemaptexture = r_texture_blanknormalmap;
+                       n = LittleLong(in->lightmapindex);
+                       if (n < 0)
+                               n = -1;
+                       else if (n >= loadmodel->brushq3.num_originallightmaps)
+                       {
+                               if(loadmodel->brushq3.num_originallightmaps != 0)
+                                       Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid lightmapindex %i (%i lightmaps)\n", i, out->texture->name, n, loadmodel->brushq3.num_originallightmaps);
+                               n = -1;
+                       }
                        else
-                               mid[j] = p1[j] + dot*(p2[j]-p1[j]);
+                       {
+                               out->lightmaptexture = loadmodel->brushq3.data_lightmaps[n >> (loadmodel->brushq3.num_lightmapmergepower * 2 + loadmodel->brushq3.deluxemapping)];
+                               if (loadmodel->brushq3.deluxemapping)
+                                       out->deluxemaptexture = loadmodel->brushq3.data_deluxemaps[n >> (loadmodel->brushq3.num_lightmapmergepower * 2 + loadmodel->brushq3.deluxemapping)];
+                       }
                }
 
-               VectorCopy (mid, f->points[f->numpoints]);
-               f->numpoints++;
-               VectorCopy (mid, b->points[b->numpoints]);
-               b->numpoints++;
+               firstvertex = LittleLong(in->firstvertex);
+               numvertices = LittleLong(in->numvertices);
+               firstelement = LittleLong(in->firstelement);
+               numtriangles = LittleLong(in->numelements) / 3;
+               if (numtriangles * 3 != LittleLong(in->numelements))
+               {
+                       Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): numelements %i is not a multiple of 3\n", i, out->texture->name, LittleLong(in->numelements));
+                       continue;
+               }
+               if (firstvertex < 0 || firstvertex + numvertices > loadmodel->brushq3.num_vertices)
+               {
+                       Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid vertex range %i : %i (%i vertices)\n", i, out->texture->name, firstvertex, firstvertex + numvertices, loadmodel->brushq3.num_vertices);
+                       continue;
+               }
+               if (firstelement < 0 || firstelement + numtriangles * 3 > loadmodel->brushq3.num_triangles * 3)
+               {
+                       Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid element range %i : %i (%i elements)\n", i, out->texture->name, firstelement, firstelement + numtriangles * 3, loadmodel->brushq3.num_triangles * 3);
+                       continue;
+               }
+               switch(type)
+               {
+               case Q3FACETYPE_FLAT:
+               case Q3FACETYPE_MESH:
+                       // no processing necessary
+                       break;
+               case Q3FACETYPE_PATCH:
+                       patchsize[0] = LittleLong(in->specific.patch.patchsize[0]);
+                       patchsize[1] = LittleLong(in->specific.patch.patchsize[1]);
+                       if (numvertices != (patchsize[0] * patchsize[1]) || patchsize[0] < 3 || patchsize[1] < 3 || !(patchsize[0] & 1) || !(patchsize[1] & 1) || patchsize[0] * patchsize[1] >= min(r_subdivisions_maxvertices.integer, r_subdivisions_collision_maxvertices.integer))
+                       {
+                               Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid patchsize %ix%i\n", i, out->texture->name, patchsize[0], patchsize[1]);
+                               continue;
+                       }
+                       originalvertex3f = loadmodel->brushq3.data_vertex3f + firstvertex * 3;
+
+                       // convert patch to Q3FACETYPE_MESH
+                       xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value);
+                       ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value);
+                       // bound to user settings
+                       xtess = bound(r_subdivisions_mintess.integer, xtess, r_subdivisions_maxtess.integer);
+                       ytess = bound(r_subdivisions_mintess.integer, ytess, r_subdivisions_maxtess.integer);
+                       // bound to sanity settings
+                       xtess = bound(0, xtess, 1024);
+                       ytess = bound(0, ytess, 1024);
+
+                       // lower quality collision patches! Same procedure as before, but different cvars
+                       // convert patch to Q3FACETYPE_MESH
+                       cxtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value);
+                       cytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value);
+                       // bound to user settings
+                       cxtess = bound(r_subdivisions_collision_mintess.integer, cxtess, r_subdivisions_collision_maxtess.integer);
+                       cytess = bound(r_subdivisions_collision_mintess.integer, cytess, r_subdivisions_collision_maxtess.integer);
+                       // bound to sanity settings
+                       cxtess = bound(0, cxtess, 1024);
+                       cytess = bound(0, cytess, 1024);
+
+                       // store it for the LOD grouping step
+                       patchtess[patchtesscount].info.xsize = patchsize[0];
+                       patchtess[patchtesscount].info.ysize = patchsize[1];
+                       patchtess[patchtesscount].info.lods[PATCH_LOD_VISUAL].xtess = xtess;
+                       patchtess[patchtesscount].info.lods[PATCH_LOD_VISUAL].ytess = ytess;
+                       patchtess[patchtesscount].info.lods[PATCH_LOD_COLLISION].xtess = cxtess;
+                       patchtess[patchtesscount].info.lods[PATCH_LOD_COLLISION].ytess = cytess;
+       
+                       patchtess[patchtesscount].surface_id = i;
+                       patchtess[patchtesscount].lodgroup[0] = in->specific.patch.mins[0];
+                       patchtess[patchtesscount].lodgroup[1] = in->specific.patch.mins[1];
+                       patchtess[patchtesscount].lodgroup[2] = in->specific.patch.mins[2];
+                       patchtess[patchtesscount].lodgroup[3] = in->specific.patch.maxs[0];
+                       patchtess[patchtesscount].lodgroup[4] = in->specific.patch.maxs[1];
+                       patchtess[patchtesscount].lodgroup[5] = in->specific.patch.maxs[2];
+                       patchtess[patchtesscount].originalvertex3f = originalvertex3f;
+                       ++patchtesscount;
+                       break;
+               case Q3FACETYPE_FLARE:
+                       if (developer.integer >= 100)
+                               Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): Q3FACETYPE_FLARE not supported (yet)\n", i, out->texture->name);
+                       // don't render it
+                       continue;
+               }
+               out->num_vertices = numvertices;
+               out->num_triangles = numtriangles;
+               meshvertices += out->num_vertices;
+               meshtriangles += out->num_triangles;
        }
-}
-
-typedef struct portal_s
-{
-       mplane_t plane;
-       mnode_t *nodes[2];              // [0] = front side of plane
-       struct portal_s *next[2];
-       winding_t *winding;
-       struct portal_s *chain; // all portals are linked into a list
-}
-portal_t;
-
-static portal_t *portalchain;
-
-/*
-===========
-AllocPortal
-===========
-*/
-static portal_t *AllocPortal (void)
-{
-       portal_t *p;
-       p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
-       p->chain = portalchain;
-       portalchain = p;
-       return p;
-}
-
-static void FreePortal(portal_t *p)
-{
-       Mem_Free(p);
-}
-
-static void Mod_RecursiveRecalcNodeBBox(mnode_t *node)
-{
-       // calculate children first
-       if (node->children[0]->contents >= 0)
-               Mod_RecursiveRecalcNodeBBox(node->children[0]);
-       if (node->children[1]->contents >= 0)
-               Mod_RecursiveRecalcNodeBBox(node->children[1]);
 
-       // make combined bounding box from children
-       node->mins[0] = min(node->children[0]->mins[0], node->children[1]->mins[0]);
-       node->mins[1] = min(node->children[0]->mins[1], node->children[1]->mins[1]);
-       node->mins[2] = min(node->children[0]->mins[2], node->children[1]->mins[2]);
-       node->maxs[0] = max(node->children[0]->maxs[0], node->children[1]->maxs[0]);
-       node->maxs[1] = max(node->children[0]->maxs[1], node->children[1]->maxs[1]);
-       node->maxs[2] = max(node->children[0]->maxs[2], node->children[1]->maxs[2]);
-}
+       // Fix patches tesselations so that they make no seams
+       do
+       {
+               again = false;
+               for(i = 0; i < patchtesscount; ++i)
+               {
+                       for(j = i+1; j < patchtesscount; ++j)
+                       {
+                               if (!PATCHTESS_SAME_LODGROUP(patchtess[i], patchtess[j]))
+                                       continue;
 
-static void Mod_FinalizePortals(void)
-{
-       int i, j, numportals, numpoints;
-       portal_t *p, *pnext;
-       mportal_t *portal;
-       mvertex_t *point;
-       mleaf_t *leaf, *endleaf;
-       winding_t *w;
+                               if (Q3PatchAdjustTesselation(3, &patchtess[i].info, patchtess[i].originalvertex3f, &patchtess[j].info, patchtess[j].originalvertex3f) )
+                                       again = true;
+                       }
+               }
+       }
+       while (again);
 
-       // recalculate bounding boxes for all leafs (because qbsp is very sloppy)
-       leaf = loadmodel->leafs;
-       endleaf = leaf + loadmodel->numleafs;
-       for (;leaf < endleaf;leaf++)
+       // Calculate resulting number of triangles
+       for(i = 0; i < patchtesscount; ++i)
        {
-               VectorSet(leaf->mins,  2000000000,  2000000000,  2000000000);
-               VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
+               finalwidth = Q3PatchDimForTess(patchtess[i].info.xsize, patchtess[i].info.lods[PATCH_LOD_VISUAL].xtess);
+               finalheight = Q3PatchDimForTess(patchtess[i].info.ysize,patchtess[i].info.lods[PATCH_LOD_VISUAL].ytess);
+               numvertices = finalwidth * finalheight;
+               numtriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+
+               oldout[patchtess[i].surface_id].num_vertices = numvertices;
+               oldout[patchtess[i].surface_id].num_triangles = numtriangles;
+               meshvertices += oldout[patchtess[i].surface_id].num_vertices;
+               meshtriangles += oldout[patchtess[i].surface_id].num_triangles;
        }
-       p = portalchain;
-       while(p)
+
+       i = oldi;
+       in = oldin;
+       out = oldout;
+       Mod_AllocSurfMesh(loadmodel->mempool, meshvertices, meshtriangles, false, true, false);
+       meshvertices = 0;
+       meshtriangles = 0;
+       for (;i < count && meshvertices + out->num_vertices <= loadmodel->surfmesh.num_vertices;i++, in++, out++)
        {
-               if (p->winding)
+               if (out->num_vertices < 3 || out->num_triangles < 1)
+                       continue;
+
+               type = LittleLong(in->type);
+               firstvertex = LittleLong(in->firstvertex);
+               firstelement = LittleLong(in->firstelement);
+               out->num_firstvertex = meshvertices;
+               out->num_firsttriangle = meshtriangles;
+               switch(type)
                {
-                       for (i = 0;i < 2;i++)
+               case Q3FACETYPE_FLAT:
+               case Q3FACETYPE_MESH:
+                       // no processing necessary, except for lightmap merging
+                       for (j = 0;j < out->num_vertices;j++)
                        {
-                               leaf = (mleaf_t *)p->nodes[i];
-                               w = p->winding;
-                               for (j = 0;j < w->numpoints;j++)
+                               (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 0] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 0];
+                               (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 1] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 1];
+                               (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 2] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 2];
+                               (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex)[j * 3 + 0] = loadmodel->brushq3.data_normal3f[(firstvertex + j) * 3 + 0];
+                               (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex)[j * 3 + 1] = loadmodel->brushq3.data_normal3f[(firstvertex + j) * 3 + 1];
+                               (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex)[j * 3 + 2] = loadmodel->brushq3.data_normal3f[(firstvertex + j) * 3 + 2];
+                               (loadmodel->surfmesh.data_texcoordtexture2f + 2 * out->num_firstvertex)[j * 2 + 0] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 0];
+                               (loadmodel->surfmesh.data_texcoordtexture2f + 2 * out->num_firstvertex)[j * 2 + 1] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 1];
+                               (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex)[j * 2 + 0] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 0];
+                               (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex)[j * 2 + 1] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 1];
+                               (loadmodel->surfmesh.data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 0] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 0];
+                               (loadmodel->surfmesh.data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 1] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 1];
+                               (loadmodel->surfmesh.data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 2] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 2];
+                               (loadmodel->surfmesh.data_lightmapcolor4f + 4 * out->num_firstvertex)[j * 4 + 3] = loadmodel->brushq3.data_color4f[(firstvertex + j) * 4 + 3];
+                       }
+                       for (j = 0;j < out->num_triangles*3;j++)
+                               (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] = loadmodel->brushq3.data_element3i[firstelement + j] + out->num_firstvertex;
+                       break;
+               case Q3FACETYPE_PATCH:
+                       patchsize[0] = LittleLong(in->specific.patch.patchsize[0]);
+                       patchsize[1] = LittleLong(in->specific.patch.patchsize[1]);
+                       originalvertex3f = loadmodel->brushq3.data_vertex3f + firstvertex * 3;
+                       originalnormal3f = loadmodel->brushq3.data_normal3f + firstvertex * 3;
+                       originaltexcoordtexture2f = loadmodel->brushq3.data_texcoordtexture2f + firstvertex * 2;
+                       originaltexcoordlightmap2f = loadmodel->brushq3.data_texcoordlightmap2f + firstvertex * 2;
+                       originalcolor4f = loadmodel->brushq3.data_color4f + firstvertex * 4;
+
+                       xtess = ytess = cxtess = cytess = -1;
+                       for(j = 0; j < patchtesscount; ++j)
+                               if(patchtess[j].surface_id == i)
                                {
-                                       if (leaf->mins[0] > w->points[j][0]) leaf->mins[0] = w->points[j][0];
-                                       if (leaf->mins[1] > w->points[j][1]) leaf->mins[1] = w->points[j][1];
-                                       if (leaf->mins[2] > w->points[j][2]) leaf->mins[2] = w->points[j][2];
-                                       if (leaf->maxs[0] < w->points[j][0]) leaf->maxs[0] = w->points[j][0];
-                                       if (leaf->maxs[1] < w->points[j][1]) leaf->maxs[1] = w->points[j][1];
-                                       if (leaf->maxs[2] < w->points[j][2]) leaf->maxs[2] = w->points[j][2];
+                                       xtess = patchtess[j].info.lods[PATCH_LOD_VISUAL].xtess;
+                                       ytess = patchtess[j].info.lods[PATCH_LOD_VISUAL].ytess;
+                                       cxtess = patchtess[j].info.lods[PATCH_LOD_COLLISION].xtess;
+                                       cytess = patchtess[j].info.lods[PATCH_LOD_COLLISION].ytess;
+                                       break;
                                }
+                       if(xtess == -1)
+                       {
+                               Con_Printf("ERROR: patch %d isn't preprocessed?!?\n", i);
+                               xtess = ytess = cxtess = cytess = 0;
                        }
-               }
-               p = p->chain;
-       }
 
-       Mod_RecursiveRecalcNodeBBox(loadmodel->nodes);
-
-       // tally up portal and point counts
-       p = portalchain;
-       numportals = 0;
-       numpoints = 0;
-       while(p)
-       {
-               // note: this check must match the one below or it will usually corrupt memory
-               // the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
-               if (p->winding && p->nodes[0] != p->nodes[1]
-                && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID
-                && p->nodes[0]->contents != CONTENTS_SKY && p->nodes[1]->contents != CONTENTS_SKY)
+                       finalwidth = Q3PatchDimForTess(patchsize[0],xtess); //((patchsize[0] - 1) * xtess) + 1;
+                       finalheight = Q3PatchDimForTess(patchsize[1],ytess); //((patchsize[1] - 1) * ytess) + 1;
+                       finalvertices = finalwidth * finalheight;
+                       finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+                       type = Q3FACETYPE_MESH;
+                       // generate geometry
+                       // (note: normals are skipped because they get recalculated)
+                       Q3PatchTesselateFloat(3, sizeof(float[3]), (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess);
+                       Q3PatchTesselateFloat(3, sizeof(float[3]), (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[3]), originalnormal3f, xtess, ytess);
+                       Q3PatchTesselateFloat(2, sizeof(float[2]), (loadmodel->surfmesh.data_texcoordtexture2f + 2 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordtexture2f, xtess, ytess);
+                       Q3PatchTesselateFloat(2, sizeof(float[2]), (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordlightmap2f, xtess, ytess);
+                       Q3PatchTesselateFloat(4, sizeof(float[4]), (loadmodel->surfmesh.data_lightmapcolor4f + 4 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[4]), originalcolor4f, xtess, ytess);
+                       Q3PatchTriangleElements((loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle), finalwidth, finalheight, out->num_firstvertex);
+
+                       out->num_triangles = Mod_RemoveDegenerateTriangles(out->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle), (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle), loadmodel->surfmesh.data_vertex3f);
+
+                       if (developer.integer >= 100)
+                       {
+                               if (out->num_triangles < finaltriangles)
+                                       Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve subdivided to %i vertices / %i triangles, %i degenerate triangles removed (leaving %i)\n", patchsize[0], patchsize[1], out->num_vertices, finaltriangles, finaltriangles - out->num_triangles, out->num_triangles);
+                               else
+                                       Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve subdivided to %i vertices / %i triangles\n", patchsize[0], patchsize[1], out->num_vertices, out->num_triangles);
+                       }
+                       // q3map does not put in collision brushes for curves... ugh
+                       // build the lower quality collision geometry
+                       finalwidth = Q3PatchDimForTess(patchsize[0],cxtess); //((patchsize[0] - 1) * cxtess) + 1;
+                       finalheight = Q3PatchDimForTess(patchsize[1],cytess); //((patchsize[1] - 1) * cytess) + 1;
+                       finalvertices = finalwidth * finalheight;
+                       finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2;
+
+                       out->data_collisionvertex3f = (float *)Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * finalvertices);
+                       out->data_collisionelement3i = (int *)Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * finaltriangles);
+                       out->num_collisionvertices = finalvertices;
+                       out->num_collisiontriangles = finaltriangles;
+                       Q3PatchTesselateFloat(3, sizeof(float[3]), out->data_collisionvertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, cxtess, cytess);
+                       Q3PatchTriangleElements(out->data_collisionelement3i, finalwidth, finalheight, 0);
+
+                       //Mod_SnapVertices(3, out->num_vertices, (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), 0.25);
+                       Mod_SnapVertices(3, out->num_collisionvertices, out->data_collisionvertex3f, 1);
+
+                       oldnumtriangles = out->num_triangles;
+                       oldnumtriangles2 = out->num_collisiontriangles;
+                       out->num_collisiontriangles = Mod_RemoveDegenerateTriangles(out->num_collisiontriangles, out->data_collisionelement3i, out->data_collisionelement3i, out->data_collisionvertex3f);
+
+                       // now optimize the collision mesh by finding triangle bboxes...
+                       Mod_Q3BSP_BuildBBoxes(out->data_collisionelement3i, out->num_collisiontriangles, out->data_collisionvertex3f, &out->data_collisionbbox6f, &out->num_collisionbboxstride, mod_q3bsp_curves_collisions_stride.integer);
+                       Mod_Q3BSP_BuildBBoxes(loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle, out->num_triangles, loadmodel->surfmesh.data_vertex3f, &out->data_bbox6f, &out->num_bboxstride, mod_q3bsp_curves_stride.integer);
+
+                       if (developer.integer >= 100)
+                               Con_Printf("Mod_Q3BSP_LoadFaces: %ix%i curve became %i:%i vertices / %i:%i triangles (%i:%i degenerate)\n", patchsize[0], patchsize[1], out->num_vertices, out->num_collisionvertices, oldnumtriangles, oldnumtriangles2, oldnumtriangles - out->num_triangles, oldnumtriangles2 - out->num_collisiontriangles);
+                       break;
+               default:
+                       break;
+               }
+               meshvertices += out->num_vertices;
+               meshtriangles += out->num_triangles;
+               for (j = 0, invalidelements = 0;j < out->num_triangles * 3;j++)
+                       if ((loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] < out->num_firstvertex || (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] >= out->num_firstvertex + out->num_vertices)
+                               invalidelements++;
+               if (invalidelements)
                {
-                       numportals += 2;
-                       numpoints += p->winding->numpoints * 2;
+                       Con_Printf("Mod_Q3BSP_LoadFaces: Warning: face #%i has %i invalid elements, type = %i, texture->name = \"%s\", texture->surfaceflags = %i, firstvertex = %i, numvertices = %i, firstelement = %i, numelements = %i, elements list:\n", i, invalidelements, type, out->texture->name, out->texture->surfaceflags, firstvertex, out->num_vertices, firstelement, out->num_triangles * 3);
+                       for (j = 0;j < out->num_triangles * 3;j++)
+                       {
+                               Con_Printf(" %i", (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] - out->num_firstvertex);
+                               if ((loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] < out->num_firstvertex || (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] >= out->num_firstvertex + out->num_vertices)
+                                       (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle)[j] = out->num_firstvertex;
+                       }
+                       Con_Print("\n");
                }
-               p = p->chain;
-       }
-       loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
-       loadmodel->numportals = numportals;
-       loadmodel->portalpoints = (void *) ((qbyte *) loadmodel->portals + numportals * sizeof(mportal_t));
-       loadmodel->numportalpoints = numpoints;
-       // clear all leaf portal chains
-       for (i = 0;i < loadmodel->numleafs;i++)
-               loadmodel->leafs[i].portals = NULL;
-       // process all portals in the global portal chain, while freeing them
-       portal = loadmodel->portals;
-       point = loadmodel->portalpoints;
-       p = portalchain;
-       portalchain = NULL;
-       while (p)
-       {
-               pnext = p->chain;
-
-               if (p->winding)
+               // calculate a bounding box
+               VectorClear(out->mins);
+               VectorClear(out->maxs);
+               if (out->num_vertices)
                {
-                       // note: this check must match the one above or it will usually corrupt memory
-                       // the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides
-                       if (p->nodes[0] != p->nodes[1]
-                        && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID
-                        && p->nodes[0]->contents != CONTENTS_SKY && p->nodes[1]->contents != CONTENTS_SKY)
+                       if (cls.state != ca_dedicated && out->lightmaptexture)
                        {
-                               // first make the back to front portal (forward portal)
-                               portal->points = point;
-                               portal->numpoints = p->winding->numpoints;
-                               portal->plane.dist = p->plane.dist;
-                               VectorCopy(p->plane.normal, portal->plane.normal);
-                               portal->here = (mleaf_t *)p->nodes[1];
-                               portal->past = (mleaf_t *)p->nodes[0];
-                               // copy points
-                               for (j = 0;j < portal->numpoints;j++)
+                               // figure out which part of the merged lightmap this fits into
+                               int lightmapindex = LittleLong(in->lightmapindex) >> loadmodel->brushq3.deluxemapping;
+                               int mergewidth = R_TextureWidth(out->lightmaptexture) / loadmodel->brushq3.lightmapsize;
+                               int mergeheight = R_TextureHeight(out->lightmaptexture) / loadmodel->brushq3.lightmapsize;
+                               lightmapindex &= mergewidth * mergeheight - 1;
+                               lightmaptcscale[0] = 1.0f / mergewidth;
+                               lightmaptcscale[1] = 1.0f / mergeheight;
+                               lightmaptcbase[0] = (lightmapindex % mergewidth) * lightmaptcscale[0];
+                               lightmaptcbase[1] = (lightmapindex / mergewidth) * lightmaptcscale[1];
+                               // modify the lightmap texcoords to match this region of the merged lightmap
+                               for (j = 0, v = loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex;j < out->num_vertices;j++, v += 2)
                                {
-                                       VectorCopy(p->winding->points[j], point->position);
-                                       point++;
+                                       v[0] = v[0] * lightmaptcscale[0] + lightmaptcbase[0];
+                                       v[1] = v[1] * lightmaptcscale[1] + lightmaptcbase[1];
                                }
-                               PlaneClassify(&portal->plane);
+                       }
+                       VectorCopy((loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), out->mins);
+                       VectorCopy((loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), out->maxs);
+                       for (j = 1, v = (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex) + 3;j < out->num_vertices;j++, v += 3)
+                       {
+                               out->mins[0] = min(out->mins[0], v[0]);
+                               out->maxs[0] = max(out->maxs[0], v[0]);
+                               out->mins[1] = min(out->mins[1], v[1]);
+                               out->maxs[1] = max(out->maxs[1], v[1]);
+                               out->mins[2] = min(out->mins[2], v[2]);
+                               out->maxs[2] = max(out->maxs[2], v[2]);
+                       }
+                       out->mins[0] -= 1.0f;
+                       out->mins[1] -= 1.0f;
+                       out->mins[2] -= 1.0f;
+                       out->maxs[0] += 1.0f;
+                       out->maxs[1] += 1.0f;
+                       out->maxs[2] += 1.0f;
+               }
+               // set lightmap styles for consistency with q1bsp
+               //out->lightmapinfo->styles[0] = 0;
+               //out->lightmapinfo->styles[1] = 255;
+               //out->lightmapinfo->styles[2] = 255;
+               //out->lightmapinfo->styles[3] = 255;
+       }
 
-                               // link into leaf's portal chain
-                               portal->next = portal->here->portals;
-                               portal->here->portals = portal;
+       i = oldi;
+       out = oldout;
+       for (;i < count;i++, out++)
+       {
+               if(out->num_vertices && out->num_triangles)
+                       continue;
+               if(out->num_vertices == 0)
+                       Con_Printf("Mod_Q3BSP_LoadFaces: surface %d has no vertices, ignoring\n", i);
+               if(out->num_triangles == 0)
+                       Con_Printf("Mod_Q3BSP_LoadFaces: surface %d has no triangles, ignoring\n", i);
+       }
 
-                               // advance to next portal
-                               portal++;
+       // for per pixel lighting
+       Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true);
+
+       // generate ushort elements array if possible
+       if (loadmodel->surfmesh.data_element3s)
+               for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+                       loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
+
+       // free the no longer needed vertex data
+       loadmodel->brushq3.num_vertices = 0;
+       if (loadmodel->brushq3.data_vertex3f)
+               Mem_Free(loadmodel->brushq3.data_vertex3f);
+       loadmodel->brushq3.data_vertex3f = NULL;
+       loadmodel->brushq3.data_normal3f = NULL;
+       loadmodel->brushq3.data_texcoordtexture2f = NULL;
+       loadmodel->brushq3.data_texcoordlightmap2f = NULL;
+       loadmodel->brushq3.data_color4f = NULL;
+       // free the no longer needed triangle data
+       loadmodel->brushq3.num_triangles = 0;
+       if (loadmodel->brushq3.data_element3i)
+               Mem_Free(loadmodel->brushq3.data_element3i);
+       loadmodel->brushq3.data_element3i = NULL;
+
+       if(patchtess)
+               Mem_Free(patchtess);
+}
 
-                               // then make the front to back portal (backward portal)
-                               portal->points = point;
-                               portal->numpoints = p->winding->numpoints;
-                               portal->plane.dist = -p->plane.dist;
-                               VectorNegate(p->plane.normal, portal->plane.normal);
-                               portal->here = (mleaf_t *)p->nodes[0];
-                               portal->past = (mleaf_t *)p->nodes[1];
-                               // copy points
-                               for (j = portal->numpoints - 1;j >= 0;j--)
-                               {
-                                       VectorCopy(p->winding->points[j], point->position);
-                                       point++;
-                               }
-                               PlaneClassify(&portal->plane);
+static void Mod_Q3BSP_LoadModels(lump_t *l)
+{
+       q3dmodel_t *in;
+       q3dmodel_t *out;
+       int i, j, n, c, count;
 
-                               // link into leaf's portal chain
-                               portal->next = portal->here->portals;
-                               portal->here->portals = portal;
+       in = (q3dmodel_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadModels: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (q3dmodel_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-                               // advance to next portal
-                               portal++;
-                       }
-                       FreeWinding(p->winding);
+       loadmodel->brushq3.data_models = out;
+       loadmodel->brushq3.num_models = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               for (j = 0;j < 3;j++)
+               {
+                       out->mins[j] = LittleFloat(in->mins[j]);
+                       out->maxs[j] = LittleFloat(in->maxs[j]);
                }
-               FreePortal(p);
-               p = pnext;
+               n = LittleLong(in->firstface);
+               c = LittleLong(in->numfaces);
+               if (n < 0 || n + c > loadmodel->num_surfaces)
+                       Host_Error("Mod_Q3BSP_LoadModels: invalid face range %i : %i (%i faces)", n, n + c, loadmodel->num_surfaces);
+               out->firstface = n;
+               out->numfaces = c;
+               n = LittleLong(in->firstbrush);
+               c = LittleLong(in->numbrushes);
+               if (n < 0 || n + c > loadmodel->brush.num_brushes)
+                       Host_Error("Mod_Q3BSP_LoadModels: invalid brush range %i : %i (%i brushes)", n, n + c, loadmodel->brush.num_brushes);
+               out->firstbrush = n;
+               out->numbrushes = c;
        }
 }
 
-/*
-=============
-AddPortalToNodes
-=============
-*/
-static void AddPortalToNodes (portal_t *p, mnode_t *front, mnode_t *back)
+static void Mod_Q3BSP_LoadLeafBrushes(lump_t *l)
 {
-       if (!front)
-               Host_Error ("AddPortalToNodes: NULL front node");
-       if (!back)
-               Host_Error ("AddPortalToNodes: NULL back node");
-       if (p->nodes[0] || p->nodes[1])
-               Host_Error ("AddPortalToNodes: already included");
-       // note: front == back is handled gracefully, because leaf 0 is the shared solid leaf, it can often have portals with the same leaf on both sides
+       int *in;
+       int *out;
+       int i, n, count;
 
-       p->nodes[0] = front;
-       p->next[0] = (portal_t *)front->portals;
-       front->portals = (mportal_t *)p;
+       in = (int *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadLeafBrushes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (int *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-       p->nodes[1] = back;
-       p->next[1] = (portal_t *)back->portals;
-       back->portals = (mportal_t *)p;
+       loadmodel->brush.data_leafbrushes = out;
+       loadmodel->brush.num_leafbrushes = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               n = LittleLong(*in);
+               if (n < 0 || n >= loadmodel->brush.num_brushes)
+                       Host_Error("Mod_Q3BSP_LoadLeafBrushes: invalid brush index %i (%i brushes)", n, loadmodel->brush.num_brushes);
+               *out = n;
+       }
 }
 
-/*
-=============
-RemovePortalFromNode
-=============
-*/
-static void RemovePortalFromNodes(portal_t *portal)
+static void Mod_Q3BSP_LoadLeafFaces(lump_t *l)
 {
-       int i;
-       mnode_t *node;
-       void **portalpointer;
-       portal_t *t;
-       for (i = 0;i < 2;i++)
+       int *in;
+       int *out;
+       int i, n, count;
+
+       in = (int *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadLeafFaces: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (int *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+       loadmodel->brush.data_leafsurfaces = out;
+       loadmodel->brush.num_leafsurfaces = count;
+
+       for (i = 0;i < count;i++, in++, out++)
        {
-               node = portal->nodes[i];
+               n = LittleLong(*in);
+               if (n < 0 || n >= loadmodel->num_surfaces)
+                       Host_Error("Mod_Q3BSP_LoadLeafFaces: invalid face index %i (%i faces)", n, loadmodel->num_surfaces);
+               *out = n;
+       }
+}
+
+static void Mod_Q3BSP_LoadLeafs(lump_t *l)
+{
+       q3dleaf_t *in;
+       mleaf_t *out;
+       int i, j, n, c, count;
+
+       in = (q3dleaf_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadLeafs: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mleaf_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+
+       loadmodel->brush.data_leafs = out;
+       loadmodel->brush.num_leafs = count;
+
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               out->parent = NULL;
+               out->plane = NULL;
+               out->clusterindex = LittleLong(in->clusterindex);
+               out->areaindex = LittleLong(in->areaindex);
+               for (j = 0;j < 3;j++)
+               {
+                       // yes the mins/maxs are ints
+                       out->mins[j] = LittleLong(in->mins[j]) - 1;
+                       out->maxs[j] = LittleLong(in->maxs[j]) + 1;
+               }
+               n = LittleLong(in->firstleafface);
+               c = LittleLong(in->numleaffaces);
+               if (n < 0 || n + c > loadmodel->brush.num_leafsurfaces)
+                       Host_Error("Mod_Q3BSP_LoadLeafs: invalid leafsurface range %i : %i (%i leafsurfaces)", n, n + c, loadmodel->brush.num_leafsurfaces);
+               out->firstleafsurface = loadmodel->brush.data_leafsurfaces + n;
+               out->numleafsurfaces = c;
+               n = LittleLong(in->firstleafbrush);
+               c = LittleLong(in->numleafbrushes);
+               if (n < 0 || n + c > loadmodel->brush.num_leafbrushes)
+                       Host_Error("Mod_Q3BSP_LoadLeafs: invalid leafbrush range %i : %i (%i leafbrushes)", n, n + c, loadmodel->brush.num_leafbrushes);
+               out->firstleafbrush = loadmodel->brush.data_leafbrushes + n;
+               out->numleafbrushes = c;
+       }
+}
+
+static void Mod_Q3BSP_LoadNodes(lump_t *l)
+{
+       q3dnode_t *in;
+       mnode_t *out;
+       int i, j, n, count;
+
+       in = (q3dnode_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadNodes: funny lump size in %s",loadmodel->name);
+       count = l->filelen / sizeof(*in);
+       out = (mnode_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
-               portalpointer = (void **) &node->portals;
-               while (1)
-               {
-                       t = *portalpointer;
-                       if (!t)
-                               Host_Error ("RemovePortalFromNodes: portal not in leaf");
+       loadmodel->brush.data_nodes = out;
+       loadmodel->brush.num_nodes = count;
 
-                       if (t == portal)
+       for (i = 0;i < count;i++, in++, out++)
+       {
+               out->parent = NULL;
+               n = LittleLong(in->planeindex);
+               if (n < 0 || n >= loadmodel->brush.num_planes)
+                       Host_Error("Mod_Q3BSP_LoadNodes: invalid planeindex %i (%i planes)", n, loadmodel->brush.num_planes);
+               out->plane = loadmodel->brush.data_planes + n;
+               for (j = 0;j < 2;j++)
+               {
+                       n = LittleLong(in->childrenindex[j]);
+                       if (n >= 0)
                        {
-                               if (portal->nodes[0] == node)
-                               {
-                                       *portalpointer = portal->next[0];
-                                       portal->nodes[0] = NULL;
-                               }
-                               else if (portal->nodes[1] == node)
-                               {
-                                       *portalpointer = portal->next[1];
-                                       portal->nodes[1] = NULL;
-                               }
-                               else
-                                       Host_Error ("RemovePortalFromNodes: portal not bounding leaf");
-                               break;
+                               if (n >= loadmodel->brush.num_nodes)
+                                       Host_Error("Mod_Q3BSP_LoadNodes: invalid child node index %i (%i nodes)", n, loadmodel->brush.num_nodes);
+                               out->children[j] = loadmodel->brush.data_nodes + n;
                        }
-
-                       if (t->nodes[0] == node)
-                               portalpointer = (void **) &t->next[0];
-                       else if (t->nodes[1] == node)
-                               portalpointer = (void **) &t->next[1];
                        else
-                               Host_Error ("RemovePortalFromNodes: portal not bounding leaf");
+                       {
+                               n = -1 - n;
+                               if (n >= loadmodel->brush.num_leafs)
+                                       Host_Error("Mod_Q3BSP_LoadNodes: invalid child leaf index %i (%i leafs)", n, loadmodel->brush.num_leafs);
+                               out->children[j] = (mnode_t *)(loadmodel->brush.data_leafs + n);
+                       }
                }
+               for (j = 0;j < 3;j++)
+               {
+                       // yes the mins/maxs are ints
+                       out->mins[j] = LittleLong(in->mins[j]) - 1;
+                       out->maxs[j] = LittleLong(in->maxs[j]) + 1;
+               }
+       }
+
+       // set the parent pointers
+       Mod_Q1BSP_LoadNodes_RecursiveSetParent(loadmodel->brush.data_nodes, NULL);
+}
+
+static void Mod_Q3BSP_LoadLightGrid(lump_t *l)
+{
+       q3dlightgrid_t *in;
+       q3dlightgrid_t *out;
+       int count;
+
+       in = (q3dlightgrid_t *)(mod_base + l->fileofs);
+       if (l->filelen % sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadLightGrid: funny lump size in %s",loadmodel->name);
+       loadmodel->brushq3.num_lightgrid_scale[0] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[0];
+       loadmodel->brushq3.num_lightgrid_scale[1] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[1];
+       loadmodel->brushq3.num_lightgrid_scale[2] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[2];
+       loadmodel->brushq3.num_lightgrid_imins[0] = (int)ceil(loadmodel->brushq3.data_models->mins[0] * loadmodel->brushq3.num_lightgrid_scale[0]);
+       loadmodel->brushq3.num_lightgrid_imins[1] = (int)ceil(loadmodel->brushq3.data_models->mins[1] * loadmodel->brushq3.num_lightgrid_scale[1]);
+       loadmodel->brushq3.num_lightgrid_imins[2] = (int)ceil(loadmodel->brushq3.data_models->mins[2] * loadmodel->brushq3.num_lightgrid_scale[2]);
+       loadmodel->brushq3.num_lightgrid_imaxs[0] = (int)floor(loadmodel->brushq3.data_models->maxs[0] * loadmodel->brushq3.num_lightgrid_scale[0]);
+       loadmodel->brushq3.num_lightgrid_imaxs[1] = (int)floor(loadmodel->brushq3.data_models->maxs[1] * loadmodel->brushq3.num_lightgrid_scale[1]);
+       loadmodel->brushq3.num_lightgrid_imaxs[2] = (int)floor(loadmodel->brushq3.data_models->maxs[2] * loadmodel->brushq3.num_lightgrid_scale[2]);
+       loadmodel->brushq3.num_lightgrid_isize[0] = loadmodel->brushq3.num_lightgrid_imaxs[0] - loadmodel->brushq3.num_lightgrid_imins[0] + 1;
+       loadmodel->brushq3.num_lightgrid_isize[1] = loadmodel->brushq3.num_lightgrid_imaxs[1] - loadmodel->brushq3.num_lightgrid_imins[1] + 1;
+       loadmodel->brushq3.num_lightgrid_isize[2] = loadmodel->brushq3.num_lightgrid_imaxs[2] - loadmodel->brushq3.num_lightgrid_imins[2] + 1;
+       count = loadmodel->brushq3.num_lightgrid_isize[0] * loadmodel->brushq3.num_lightgrid_isize[1] * loadmodel->brushq3.num_lightgrid_isize[2];
+       Matrix4x4_CreateScale3(&loadmodel->brushq3.num_lightgrid_indexfromworld, loadmodel->brushq3.num_lightgrid_scale[0], loadmodel->brushq3.num_lightgrid_scale[1], loadmodel->brushq3.num_lightgrid_scale[2]);
+       Matrix4x4_ConcatTranslate(&loadmodel->brushq3.num_lightgrid_indexfromworld, -loadmodel->brushq3.num_lightgrid_imins[0] * loadmodel->brushq3.num_lightgrid_cellsize[0], -loadmodel->brushq3.num_lightgrid_imins[1] * loadmodel->brushq3.num_lightgrid_cellsize[1], -loadmodel->brushq3.num_lightgrid_imins[2] * loadmodel->brushq3.num_lightgrid_cellsize[2]);
+
+       // if lump is empty there is nothing to load, we can deal with that in the LightPoint code
+       if (l->filelen)
+       {
+               if (l->filelen < count * (int)sizeof(*in))
+                       Host_Error("Mod_Q3BSP_LoadLightGrid: invalid lightgrid lump size %i bytes, should be %i bytes (%ix%ix%i)", l->filelen, (int)(count * sizeof(*in)), loadmodel->brushq3.num_lightgrid_isize[0], loadmodel->brushq3.num_lightgrid_isize[1], loadmodel->brushq3.num_lightgrid_isize[2]);
+               if (l->filelen != count * (int)sizeof(*in))
+                       Con_Printf("Mod_Q3BSP_LoadLightGrid: Warning: calculated lightgrid size %i bytes does not match lump size %i\n", (int)(count * sizeof(*in)), l->filelen);
+               out = (q3dlightgrid_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
+               loadmodel->brushq3.data_lightgrid = out;
+               loadmodel->brushq3.num_lightgrid = count;
+               // no swapping or validation necessary
+               memcpy(out, in, count * (int)sizeof(*out));
        }
 }
 
-static void Mod_RecursiveNodePortals (mnode_t *node)
+static void Mod_Q3BSP_LoadPVS(lump_t *l)
 {
-       int side;
-       mnode_t *front, *back, *other_node;
-       mplane_t clipplane, *plane;
-       portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
-       winding_t *nodeportalwinding, *frontwinding, *backwinding;
+       q3dpvs_t *in;
+       int totalchains;
 
-       // if a leaf, we're done
-       if (node->contents)
+       if (l->filelen == 0)
+       {
+               int i;
+               // unvised maps often have cluster indices even without pvs, so check
+               // leafs to find real number of clusters
+               loadmodel->brush.num_pvsclusters = 1;
+               for (i = 0;i < loadmodel->brush.num_leafs;i++)
+                       loadmodel->brush.num_pvsclusters = max(loadmodel->brush.num_pvsclusters, loadmodel->brush.data_leafs[i].clusterindex + 1);
+
+               // create clusters
+               loadmodel->brush.num_pvsclusterbytes = (loadmodel->brush.num_pvsclusters + 7) / 8;
+               totalchains = loadmodel->brush.num_pvsclusterbytes * loadmodel->brush.num_pvsclusters;
+               loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, totalchains);
+               memset(loadmodel->brush.data_pvsclusters, 0xFF, totalchains);
                return;
+       }
 
-       plane = node->plane;
+       in = (q3dpvs_t *)(mod_base + l->fileofs);
+       if (l->filelen < 9)
+               Host_Error("Mod_Q3BSP_LoadPVS: funny lump size in %s",loadmodel->name);
 
-       front = node->children[0];
-       back = node->children[1];
-       if (front == back)
-               Host_Error("Mod_RecursiveNodePortals: corrupt node hierarchy");
+       loadmodel->brush.num_pvsclusters = LittleLong(in->numclusters);
+       loadmodel->brush.num_pvsclusterbytes = LittleLong(in->chainlength);
+       if (loadmodel->brush.num_pvsclusterbytes < ((loadmodel->brush.num_pvsclusters + 7) / 8))
+               Host_Error("Mod_Q3BSP_LoadPVS: (chainlength = %i) < ((numclusters = %i) + 7) / 8", loadmodel->brush.num_pvsclusterbytes, loadmodel->brush.num_pvsclusters);
+       totalchains = loadmodel->brush.num_pvsclusterbytes * loadmodel->brush.num_pvsclusters;
+       if (l->filelen < totalchains + (int)sizeof(*in))
+               Host_Error("Mod_Q3BSP_LoadPVS: lump too small ((numclusters = %i) * (chainlength = %i) + sizeof(q3dpvs_t) == %i bytes, lump is %i bytes)", loadmodel->brush.num_pvsclusters, loadmodel->brush.num_pvsclusterbytes, (int)(totalchains + sizeof(*in)), l->filelen);
 
-       // create the new portal by generating a polygon for the node plane,
-       // and clipping it by all of the other portals (which came from nodes above this one)
-       nodeportal = AllocPortal ();
-       nodeportal->plane = *node->plane;
+       loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, totalchains);
+       memcpy(loadmodel->brush.data_pvsclusters, (unsigned char *)(in + 1), totalchains);
+}
 
-       nodeportalwinding = BaseWindingForPlane (node->plane);
-       side = 0;       // shut up compiler warning
-       for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
+static void Mod_Q3BSP_LightPoint(dp_model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
+{
+       int i, j, k, index[3];
+       float transformed[3], blend1, blend2, blend, stylescale;
+       q3dlightgrid_t *a, *s;
+
+       // scale lighting by lightstyle[0] so that darkmode in dpmod works properly
+       stylescale = r_refdef.scene.rtlightstylevalue[0];
+
+       if (!model->brushq3.num_lightgrid)
        {
-               clipplane = portal->plane;
-               if (portal->nodes[0] == portal->nodes[1])
-                       Host_Error("Mod_RecursiveNodePortals: portal has same node on both sides (1)");
-               if (portal->nodes[0] == node)
-                       side = 0;
-               else if (portal->nodes[1] == node)
-               {
-                       clipplane.dist = -clipplane.dist;
-                       VectorNegate (clipplane.normal, clipplane.normal);
-                       side = 1;
-               }
-               else
-                       Host_Error ("Mod_RecursiveNodePortals: mislinked portal");
+               ambientcolor[0] = stylescale;
+               ambientcolor[1] = stylescale;
+               ambientcolor[2] = stylescale;
+               return;
+       }
 
-               nodeportalwinding = ClipWinding (nodeportalwinding, &clipplane, true);
-               if (!nodeportalwinding)
+       Matrix4x4_Transform(&model->brushq3.num_lightgrid_indexfromworld, p, transformed);
+       //Matrix4x4_Print(&model->brushq3.num_lightgrid_indexfromworld);
+       //Con_Printf("%f %f %f transformed %f %f %f clamped ", p[0], p[1], p[2], transformed[0], transformed[1], transformed[2]);
+       transformed[0] = bound(0, transformed[0], model->brushq3.num_lightgrid_isize[0] - 1);
+       transformed[1] = bound(0, transformed[1], model->brushq3.num_lightgrid_isize[1] - 1);
+       transformed[2] = bound(0, transformed[2], model->brushq3.num_lightgrid_isize[2] - 1);
+       index[0] = (int)floor(transformed[0]);
+       index[1] = (int)floor(transformed[1]);
+       index[2] = (int)floor(transformed[2]);
+       //Con_Printf("%f %f %f index %i %i %i:\n", transformed[0], transformed[1], transformed[2], index[0], index[1], index[2]);
+
+       // now lerp the values
+       VectorClear(diffusenormal);
+       a = &model->brushq3.data_lightgrid[(index[2] * model->brushq3.num_lightgrid_isize[1] + index[1]) * model->brushq3.num_lightgrid_isize[0] + index[0]];
+       for (k = 0;k < 2;k++)
+       {
+               blend1 = (k ? (transformed[2] - index[2]) : (1 - (transformed[2] - index[2])));
+               if (blend1 < 0.001f || index[2] + k >= model->brushq3.num_lightgrid_isize[2])
+                       continue;
+               for (j = 0;j < 2;j++)
                {
-                       printf ("Mod_RecursiveNodePortals: WARNING: new portal was clipped away\n");
-                       break;
+                       blend2 = blend1 * (j ? (transformed[1] - index[1]) : (1 - (transformed[1] - index[1])));
+                       if (blend2 < 0.001f || index[1] + j >= model->brushq3.num_lightgrid_isize[1])
+                               continue;
+                       for (i = 0;i < 2;i++)
+                       {
+                               blend = blend2 * (i ? (transformed[0] - index[0]) : (1 - (transformed[0] - index[0]))) * stylescale;
+                               if (blend < 0.001f || index[0] + i >= model->brushq3.num_lightgrid_isize[0])
+                                       continue;
+                               s = a + (k * model->brushq3.num_lightgrid_isize[1] + j) * model->brushq3.num_lightgrid_isize[0] + i;
+                               VectorMA(ambientcolor, blend * (1.0f / 128.0f), s->ambientrgb, ambientcolor);
+                               VectorMA(diffusecolor, blend * (1.0f / 128.0f), s->diffusergb, diffusecolor);
+                               // this uses the mod_md3_sin table because the values are
+                               // already in the 0-255 range, the 64+ bias fetches a cosine
+                               // instead of a sine value
+                               diffusenormal[0] += blend * (mod_md3_sin[64 + s->diffuseyaw] * mod_md3_sin[s->diffusepitch]);
+                               diffusenormal[1] += blend * (mod_md3_sin[     s->diffuseyaw] * mod_md3_sin[s->diffusepitch]);
+                               diffusenormal[2] += blend * (mod_md3_sin[64 + s->diffusepitch]);
+                               //Con_Printf("blend %f: ambient %i %i %i, diffuse %i %i %i, diffusepitch %i diffuseyaw %i (%f %f, normal %f %f %f)\n", blend, s->ambientrgb[0], s->ambientrgb[1], s->ambientrgb[2], s->diffusergb[0], s->diffusergb[1], s->diffusergb[2], s->diffusepitch, s->diffuseyaw, pitch, yaw, (cos(yaw) * cospitch), (sin(yaw) * cospitch), (-sin(pitch)));
+                       }
                }
        }
 
-       if (nodeportalwinding)
+       // normalize the light direction before turning
+       VectorNormalize(diffusenormal);
+       //Con_Printf("result: ambient %f %f %f diffuse %f %f %f diffusenormal %f %f %f\n", ambientcolor[0], ambientcolor[1], ambientcolor[2], diffusecolor[0], diffusecolor[1], diffusecolor[2], diffusenormal[0], diffusenormal[1], diffusenormal[2]);
+}
+
+static void Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace_t *trace, dp_model_t *model, mnode_t *node, const vec3_t point, int markframe)
+{
+       int i;
+       mleaf_t *leaf;
+       colbrushf_t *brush;
+       // find which leaf the point is in
+       while (node->plane)
+               node = node->children[(node->plane->type < 3 ? point[node->plane->type] : DotProduct(point, node->plane->normal)) < node->plane->dist];
+       // point trace the brushes
+       leaf = (mleaf_t *)node;
+       for (i = 0;i < leaf->numleafbrushes;i++)
        {
-               // if the plane was not clipped on all sides, there was an error
-               nodeportal->winding = nodeportalwinding;
-               AddPortalToNodes (nodeportal, front, back);
+               brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
+               if (brush && brush->markframe != markframe && BoxesOverlap(point, point, brush->mins, brush->maxs))
+               {
+                       brush->markframe = markframe;
+                       Collision_TracePointBrushFloat(trace, point, brush);
+               }
        }
+       // can't do point traces on curves (they have no thickness)
+}
 
-       // split the portals of this node along this node's plane and assign them to the children of this node
-       // (migrating the portals downward through the tree)
-       for (portal = (portal_t *)node->portals;portal;portal = nextportal)
+static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, dp_model_t *model, mnode_t *node, const vec3_t start, const vec3_t end, vec_t startfrac, vec_t endfrac, const vec3_t linestart, const vec3_t lineend, int markframe, const vec3_t segmentmins, const vec3_t segmentmaxs)
+{
+       int i, startside, endside;
+       float dist1, dist2, midfrac, mid[3], nodesegmentmins[3], nodesegmentmaxs[3];
+       mleaf_t *leaf;
+       msurface_t *surface;
+       mplane_t *plane;
+       colbrushf_t *brush;
+       // walk the tree until we hit a leaf, recursing for any split cases
+       while (node->plane)
        {
-               if (portal->nodes[0] == portal->nodes[1])
-                       Host_Error("Mod_RecursiveNodePortals: portal has same node on both sides (2)");
-               if (portal->nodes[0] == node)
-                       side = 0;
-               else if (portal->nodes[1] == node)
-                       side = 1;
-               else
-                       Host_Error ("Mod_RecursiveNodePortals: mislinked portal");
-               nextportal = portal->next[side];
-
-               other_node = portal->nodes[!side];
-               RemovePortalFromNodes (portal);
-
-               // cut the portal into two portals, one on each side of the node plane
-               DivideWinding (portal->winding, plane, &frontwinding, &backwinding);
-
-               if (!frontwinding)
+               // abort if this part of the bsp tree can not be hit by this trace
+//             if (!(node->combinedsupercontents & trace->hitsupercontentsmask))
+//                     return;
+               plane = node->plane;
+               // axial planes are much more common than non-axial, so an optimized
+               // axial case pays off here
+               if (plane->type < 3)
                {
-                       if (side == 0)
-                               AddPortalToNodes (portal, back, other_node);
-                       else
-                               AddPortalToNodes (portal, other_node, back);
-                       continue;
+                       dist1 = start[plane->type] - plane->dist;
+                       dist2 = end[plane->type] - plane->dist;
                }
-               if (!backwinding)
+               else
                {
-                       if (side == 0)
-                               AddPortalToNodes (portal, front, other_node);
-                       else
-                               AddPortalToNodes (portal, other_node, front);
-                       continue;
+                       dist1 = DotProduct(start, plane->normal) - plane->dist;
+                       dist2 = DotProduct(end, plane->normal) - plane->dist;
                }
-
-               // the winding is split
-               splitportal = AllocPortal ();
-               temp = splitportal->chain;
-               *splitportal = *portal;
-               splitportal->chain = temp;
-               splitportal->winding = backwinding;
-               FreeWinding (portal->winding);
-               portal->winding = frontwinding;
-
-               if (side == 0)
+               startside = dist1 < 0;
+               endside = dist2 < 0;
+               if (startside == endside)
                {
-                       AddPortalToNodes (portal, front, other_node);
-                       AddPortalToNodes (splitportal, back, other_node);
+                       // most of the time the line fragment is on one side of the plane
+                       node = node->children[startside];
                }
                else
                {
-                       AddPortalToNodes (portal, other_node, front);
-                       AddPortalToNodes (splitportal, other_node, back);
+                       // line crosses node plane, split the line
+                       dist1 = PlaneDiff(linestart, plane);
+                       dist2 = PlaneDiff(lineend, plane);
+                       midfrac = dist1 / (dist1 - dist2);
+                       VectorLerp(linestart, midfrac, lineend, mid);
+                       // take the near side first
+                       Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, node->children[startside], start, mid, startfrac, midfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+                       // if we found an impact on the front side, don't waste time
+                       // exploring the far side
+                       if (midfrac <= trace->realfraction)
+                               Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, node->children[endside], mid, end, midfrac, endfrac, linestart, lineend, markframe, segmentmins, segmentmaxs);
+                       return;
                }
        }
-
-       Mod_RecursiveNodePortals(front);
-       Mod_RecursiveNodePortals(back);
-}
-
-
-static void Mod_MakePortals(void)
-{
-       portalchain = NULL;
-       Mod_RecursiveNodePortals (loadmodel->nodes);
-       Mod_FinalizePortals();
-}
-
-static void Mod_BuildSurfaceNeighbors (msurface_t *surfaces, int numsurfaces, mempool_t *mempool)
-{
-#if 0
-       int surfnum, vertnum, vertnum2, snum, vnum, vnum2;
-       msurface_t *surf, *s;
-       float *v0, *v1, *v2, *v3;
-       for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
-               surf->neighborsurfaces = Mem_Alloc(mempool, surf->poly_numverts * sizeof(msurface_t *));
-       for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
+       // abort if this part of the bsp tree can not be hit by this trace
+//     if (!(node->combinedsupercontents & trace->hitsupercontentsmask))
+//             return;
+       // hit a leaf
+       nodesegmentmins[0] = min(start[0], end[0]) - 1;
+       nodesegmentmins[1] = min(start[1], end[1]) - 1;
+       nodesegmentmins[2] = min(start[2], end[2]) - 1;
+       nodesegmentmaxs[0] = max(start[0], end[0]) + 1;
+       nodesegmentmaxs[1] = max(start[1], end[1]) + 1;
+       nodesegmentmaxs[2] = max(start[2], end[2]) + 1;
+       // line trace the brushes
+       leaf = (mleaf_t *)node;
+       for (i = 0;i < leaf->numleafbrushes;i++)
        {
-               for (vertnum = surf->poly_numverts - 1, vertnum2 = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;vertnum2 < surf->poly_numverts;vertnum = vertnum2, vertnum2++, v0 = v1, v1 += 3)
+               brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
+               if (brush && brush->markframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, brush->mins, brush->maxs))
                {
-                       if (surf->neighborsurfaces[vertnum])
-                               continue;
-                       surf->neighborsurfaces[vertnum] = NULL;
-                       for (s = surfaces, snum = 0;snum < numsurfaces;s++, snum++)
+                       brush->markframe = markframe;
+                       Collision_TraceLineBrushFloat(trace, linestart, lineend, brush, brush);
+               }
+       }
+       // can't do point traces on curves (they have no thickness)
+       if (leaf->containscollisionsurfaces && mod_q3bsp_curves_collisions.integer && !VectorCompare(start, end))
+       {
+               // line trace the curves
+               for (i = 0;i < leaf->numleafsurfaces;i++)
+               {
+                       surface = model->data_surfaces + leaf->firstleafsurface[i];
+                       if (surface->num_collisiontriangles && surface->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, surface->mins, surface->maxs))
                        {
-                               if (s->poly_mins[0] > (surf->poly_maxs[0] + 1) || s->poly_maxs[0] < (surf->poly_mins[0] - 1)
-                                || s->poly_mins[1] > (surf->poly_maxs[1] + 1) || s->poly_maxs[1] < (surf->poly_mins[1] - 1)
-                                || s->poly_mins[2] > (surf->poly_maxs[2] + 1) || s->poly_maxs[2] < (surf->poly_mins[2] - 1)
-                                || s == surf)
-                                       continue;
-                               for (vnum = 0;vnum < s->poly_numverts;vnum++)
-                                       if (s->neighborsurfaces[vnum] == surf)
-                                               break;
-                               if (vnum < s->poly_numverts)
-                                       continue;
-                               for (vnum = s->poly_numverts - 1, vnum2 = 0, v2 = s->poly_verts + (s->poly_numverts - 1) * 3, v3 = s->poly_verts;vnum2 < s->poly_numverts;vnum = vnum2, vnum2++, v2 = v3, v3 += 3)
-                               {
-                                       if (s->neighborsurfaces[vnum] == NULL
-                                        && ((v0[0] == v2[0] && v0[1] == v2[1] && v0[2] == v2[2] && v1[0] == v3[0] && v1[1] == v3[1] && v1[2] == v3[2])
-                                         || (v1[0] == v2[0] && v1[1] == v2[1] && v1[2] == v2[2] && v0[0] == v3[0] && v0[1] == v3[1] && v0[2] == v3[2])))
-                                       {
-                                               surf->neighborsurfaces[vertnum] = s;
-                                               s->neighborsurfaces[vnum] = surf;
-                                               break;
-                                       }
-                               }
-                               if (vnum < s->poly_numverts)
-                                       break;
+                               surface->collisionmarkframe = markframe;
+                               Collision_TraceLineTriangleMeshFloat(trace, linestart, lineend, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->num_collisionbboxstride, surface->data_collisionbbox6f, surface->texture->supercontents, surface->texture->surfaceflags, surface->texture, segmentmins, segmentmaxs);
                        }
                }
        }
-#endif
 }
 
-void Mod_BuildLightmapUpdateChains(mempool_t *mempool, model_t *model)
+static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, dp_model_t *model, mnode_t *node, const colbrushf_t *thisbrush_start, const colbrushf_t *thisbrush_end, int markframe, const vec3_t segmentmins, const vec3_t segmentmaxs)
 {
-       int i, 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++)
+       int i;
+       int sides;
+       mleaf_t *leaf;
+       colbrushf_t *brush;
+       msurface_t *surface;
+       mplane_t *plane;
+       float nodesegmentmins[3], nodesegmentmaxs[3];
+       // walk the tree until we hit a leaf, recursing for any split cases
+       while (node->plane)
        {
-               if (stylecounts[i])
+               // abort if this part of the bsp tree can not be hit by this trace
+//             if (!(node->combinedsupercontents & trace->hitsupercontentsmask))
+//                     return;
+               plane = node->plane;
+               // axial planes are much more common than non-axial, so an optimized
+               // axial case pays off here
+               if (plane->type < 3)
                {
-                       remapstyles[i] = model->light_styles++;
-                       totalcount += stylecounts[i] + 1;
+                       // this is an axial plane, compare bounding box directly to it and
+                       // recurse sides accordingly
+                       // recurse down node sides
+                       // use an inlined axial BoxOnPlaneSide to slightly reduce overhead
+                       //sides = BoxOnPlaneSide(nodesegmentmins, nodesegmentmaxs, plane);
+                       //sides = ((segmentmaxs[plane->type] >= plane->dist) | ((segmentmins[plane->type] < plane->dist) << 1));
+                       sides = ((segmentmaxs[plane->type] >= plane->dist) + ((segmentmins[plane->type] < plane->dist) * 2));
                }
+               else
+               {
+                       // this is a non-axial plane, so check if the start and end boxes
+                       // are both on one side of the plane to handle 'diagonal' cases
+                       sides = BoxOnPlaneSide(thisbrush_start->mins, thisbrush_start->maxs, plane) | BoxOnPlaneSide(thisbrush_end->mins, thisbrush_end->maxs, plane);
+               }
+               if (sides == 3)
+               {
+                       // segment crosses plane
+                       Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, node->children[0], thisbrush_start, thisbrush_end, markframe, segmentmins, segmentmaxs);
+                       sides = 2;
+               }
+               // if sides == 0 then the trace itself is bogus (Not A Number values),
+               // in this case we simply pretend the trace hit nothing
+               if (sides == 0)
+                       return; // ERROR: NAN bounding box!
+               // take whichever side the segment box is on
+               node = node->children[sides - 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++)
+       // abort if this part of the bsp tree can not be hit by this trace
+//     if (!(node->combinedsupercontents & trace->hitsupercontentsmask))
+//             return;
+       nodesegmentmins[0] = max(segmentmins[0], node->mins[0] - 1);
+       nodesegmentmins[1] = max(segmentmins[1], node->mins[1] - 1);
+       nodesegmentmins[2] = max(segmentmins[2], node->mins[2] - 1);
+       nodesegmentmaxs[0] = min(segmentmaxs[0], node->maxs[0] + 1);
+       nodesegmentmaxs[1] = min(segmentmaxs[1], node->maxs[1] + 1);
+       nodesegmentmaxs[2] = min(segmentmaxs[2], node->maxs[2] + 1);
+       // hit a leaf
+       leaf = (mleaf_t *)node;
+       for (i = 0;i < leaf->numleafbrushes;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;
+               brush = model->brush.data_brushes[leaf->firstleafbrush[i]].colbrushf;
+               if (brush && brush->markframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, brush->mins, brush->maxs))
+               {
+                       brush->markframe = markframe;
+                       Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, brush, brush);
+               }
        }
-       j = 0;
-       for (i = 0;i < model->light_styles;i++)
+       if (leaf->containscollisionsurfaces && mod_q3bsp_curves_collisions.integer)
        {
-               *model->light_styleupdatechains[i] = NULL;
-               model->light_styleupdatechains[i] = model->light_styleupdatechainsbuffer + j;
-               j += stylecounts[model->light_style[i]] + 1;
+               for (i = 0;i < leaf->numleafsurfaces;i++)
+               {
+                       surface = model->data_surfaces + leaf->firstleafsurface[i];
+                       if (surface->num_collisiontriangles && surface->collisionmarkframe != markframe && BoxesOverlap(nodesegmentmins, nodesegmentmaxs, surface->mins, surface->maxs))
+                       {
+                               surface->collisionmarkframe = markframe;
+                               Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->num_collisionbboxstride, surface->data_collisionbbox6f, surface->texture->supercontents, surface->texture->surfaceflags, surface->texture, segmentmins, segmentmaxs);
+                       }
+               }
        }
 }
 
-void Mod_BuildPVSTextureChains(model_t *model)
+static void Mod_Q3BSP_TraceBox(dp_model_t *model, int frame, trace_t *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask)
 {
-       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++)
+       int i;
+       vec3_t shiftstart, shiftend;
+       float segmentmins[3], segmentmaxs[3];
+       static int markframe = 0;
+       msurface_t *surface;
+       q3mbrush_t *brush;
+       memset(trace, 0, sizeof(*trace));
+       trace->fraction = 1;
+       trace->realfraction = 1;
+       trace->hitsupercontentsmask = hitsupercontentsmask;
+       if (mod_q3bsp_optimizedtraceline.integer && VectorCompare(boxmins, boxmaxs))
        {
-               if (model->surfacepvsframes[j] == model->pvsframecount)
+               VectorAdd(start, boxmins, shiftstart);
+               VectorAdd(end, boxmins, shiftend);
+               if (VectorCompare(shiftstart, shiftend))
+               {
+                       // point trace
+                       if (model->brush.submodel)
+                       {
+                               for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+                                       if (brush->colbrushf)
+                                               Collision_TracePointBrushFloat(trace, shiftstart, brush->colbrushf);
+                       }
+                       else
+                               Mod_Q3BSP_TracePoint_RecursiveBSPNode(trace, model, model->brush.data_nodes, shiftstart, ++markframe);
+               }
+               else
                {
-                       model->pvssurflist[model->pvssurflistlength++] = j;
-                       model->pvstexturechainslength[model->surfaces[j].texinfo->texture->number]++;
+                       // line trace
+                       segmentmins[0] = min(shiftstart[0], shiftend[0]) - 1;
+                       segmentmins[1] = min(shiftstart[1], shiftend[1]) - 1;
+                       segmentmins[2] = min(shiftstart[2], shiftend[2]) - 1;
+                       segmentmaxs[0] = max(shiftstart[0], shiftend[0]) + 1;
+                       segmentmaxs[1] = max(shiftstart[1], shiftend[1]) + 1;
+                       segmentmaxs[2] = max(shiftstart[2], shiftend[2]) + 1;
+                       if (model->brush.submodel)
+                       {
+                               for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+                                       if (brush->colbrushf)
+                                               Collision_TraceLineBrushFloat(trace, shiftstart, shiftend, brush->colbrushf, brush->colbrushf);
+                               if (mod_q3bsp_curves_collisions.integer)
+                                       for (i = 0, surface = model->data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++)
+                                               if (surface->num_collisiontriangles)
+                                                       Collision_TraceLineTriangleMeshFloat(trace, shiftstart, shiftend, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->num_collisionbboxstride, surface->data_collisionbbox6f, surface->texture->supercontents, surface->texture->surfaceflags, surface->texture, segmentmins, segmentmaxs);
+                       }
+                       else
+                               Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace, model, model->brush.data_nodes, shiftstart, shiftend, 0, 1, shiftstart, shiftend, ++markframe, segmentmins, segmentmaxs);
                }
        }
-       for (i = 0, j = 0;i < model->numtextures;i++)
+       else
        {
-               if (model->pvstexturechainslength[i])
+               // box trace, performed as brush trace
+               colbrushf_t *thisbrush_start, *thisbrush_end;
+               vec3_t boxstartmins, boxstartmaxs, boxendmins, boxendmaxs;
+               segmentmins[0] = min(start[0], end[0]) + boxmins[0] - 1;
+               segmentmins[1] = min(start[1], end[1]) + boxmins[1] - 1;
+               segmentmins[2] = min(start[2], end[2]) + boxmins[2] - 1;
+               segmentmaxs[0] = max(start[0], end[0]) + boxmaxs[0] + 1;
+               segmentmaxs[1] = max(start[1], end[1]) + boxmaxs[1] + 1;
+               segmentmaxs[2] = max(start[2], end[2]) + boxmaxs[2] + 1;
+               VectorAdd(start, boxmins, boxstartmins);
+               VectorAdd(start, boxmaxs, boxstartmaxs);
+               VectorAdd(end, boxmins, boxendmins);
+               VectorAdd(end, boxmaxs, boxendmaxs);
+               thisbrush_start = Collision_BrushForBox(&identitymatrix, boxstartmins, boxstartmaxs, 0, 0, NULL);
+               thisbrush_end = Collision_BrushForBox(&identitymatrix, boxendmins, boxendmaxs, 0, 0, NULL);
+               if (model->brush.submodel)
                {
-                       model->pvstexturechains[i] = model->pvstexturechainsbuffer + j;
-                       j += model->pvstexturechainslength[i] + 1;
+                       for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+                               if (brush->colbrushf)
+                                       Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, brush->colbrushf, brush->colbrushf);
+                       if (mod_q3bsp_curves_collisions.integer)
+                               for (i = 0, surface = model->data_surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surface++)
+                                       if (surface->num_collisiontriangles)
+                                               Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, surface->num_collisiontriangles, surface->data_collisionelement3i, surface->data_collisionvertex3f, surface->num_collisionbboxstride, surface->data_collisionbbox6f, surface->texture->supercontents, surface->texture->surfaceflags, surface->texture, segmentmins, segmentmaxs);
                }
                else
-                       model->pvstexturechains[i] = NULL;
+                       Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace, model, model->brush.data_nodes, thisbrush_start, thisbrush_end, ++markframe, segmentmins, segmentmaxs);
+       }
+}
+
+static int Mod_Q3BSP_PointSuperContents(struct model_s *model, int frame, const vec3_t point)
+{
+       int i;
+       int supercontents = 0;
+       q3mbrush_t *brush;
+       // test if the point is inside each brush
+       if (model->brush.submodel)
+       {
+               // submodels are effectively one leaf
+               for (i = 0, brush = model->brush.data_brushes + model->firstmodelbrush;i < model->nummodelbrushes;i++, brush++)
+                       if (brush->colbrushf && Collision_PointInsideBrushFloat(point, brush->colbrushf))
+                               supercontents |= brush->colbrushf->supercontents;
        }
-       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++)
+       else
        {
-               if (model->pvstexturechainslength[i])
+               mnode_t *node = model->brush.data_nodes;
+               mleaf_t *leaf;
+               // find which leaf the point is in
+               while (node->plane)
+                       node = node->children[(node->plane->type < 3 ? point[node->plane->type] : DotProduct(point, node->plane->normal)) < node->plane->dist];
+               leaf = (mleaf_t *)node;
+               // now check the brushes in the leaf
+               for (i = 0;i < leaf->numleafbrushes;i++)
                {
-                       *model->pvstexturechains[i] = NULL;
-                       model->pvstexturechains[i] -= model->pvstexturechainslength[i];
+                       brush = model->brush.data_brushes + leaf->firstleafbrush[i];
+                       if (brush->colbrushf && Collision_PointInsideBrushFloat(point, brush->colbrushf))
+                               supercontents |= brush->colbrushf->supercontents;
                }
        }
+       return supercontents;
 }
 
-/*
-=================
-Mod_LoadBrushModel
-=================
-*/
-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)
+static int Mod_Q3BSP_SuperContentsFromNativeContents(dp_model_t *model, int nativecontents)
 {
-       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;
+       int supercontents = 0;
+       if (nativecontents & CONTENTSQ3_SOLID)
+               supercontents |= SUPERCONTENTS_SOLID;
+       if (nativecontents & CONTENTSQ3_WATER)
+               supercontents |= SUPERCONTENTS_WATER;
+       if (nativecontents & CONTENTSQ3_SLIME)
+               supercontents |= SUPERCONTENTS_SLIME;
+       if (nativecontents & CONTENTSQ3_LAVA)
+               supercontents |= SUPERCONTENTS_LAVA;
+       if (nativecontents & CONTENTSQ3_BODY)
+               supercontents |= SUPERCONTENTS_BODY;
+       if (nativecontents & CONTENTSQ3_CORPSE)
+               supercontents |= SUPERCONTENTS_CORPSE;
+       if (nativecontents & CONTENTSQ3_NODROP)
+               supercontents |= SUPERCONTENTS_NODROP;
+       if (nativecontents & CONTENTSQ3_PLAYERCLIP)
+               supercontents |= SUPERCONTENTS_PLAYERCLIP;
+       if (nativecontents & CONTENTSQ3_MONSTERCLIP)
+               supercontents |= SUPERCONTENTS_MONSTERCLIP;
+       if (nativecontents & CONTENTSQ3_DONOTENTER)
+               supercontents |= SUPERCONTENTS_DONOTENTER;
+       if (nativecontents & CONTENTSQ3_BOTCLIP)
+               supercontents |= SUPERCONTENTS_BOTCLIP;
+       if (!(nativecontents & CONTENTSQ3_TRANSLUCENT))
+               supercontents |= SUPERCONTENTS_OPAQUE;
+       return supercontents;
+}
 
-       header = (dheader_t *)buffer;
+static int Mod_Q3BSP_NativeContentsFromSuperContents(dp_model_t *model, int supercontents)
+{
+       int nativecontents = 0;
+       if (supercontents & SUPERCONTENTS_SOLID)
+               nativecontents |= CONTENTSQ3_SOLID;
+       if (supercontents & SUPERCONTENTS_WATER)
+               nativecontents |= CONTENTSQ3_WATER;
+       if (supercontents & SUPERCONTENTS_SLIME)
+               nativecontents |= CONTENTSQ3_SLIME;
+       if (supercontents & SUPERCONTENTS_LAVA)
+               nativecontents |= CONTENTSQ3_LAVA;
+       if (supercontents & SUPERCONTENTS_BODY)
+               nativecontents |= CONTENTSQ3_BODY;
+       if (supercontents & SUPERCONTENTS_CORPSE)
+               nativecontents |= CONTENTSQ3_CORPSE;
+       if (supercontents & SUPERCONTENTS_NODROP)
+               nativecontents |= CONTENTSQ3_NODROP;
+       if (supercontents & SUPERCONTENTS_PLAYERCLIP)
+               nativecontents |= CONTENTSQ3_PLAYERCLIP;
+       if (supercontents & SUPERCONTENTS_MONSTERCLIP)
+               nativecontents |= CONTENTSQ3_MONSTERCLIP;
+       if (supercontents & SUPERCONTENTS_DONOTENTER)
+               nativecontents |= CONTENTSQ3_DONOTENTER;
+       if (supercontents & SUPERCONTENTS_BOTCLIP)
+               nativecontents |= CONTENTSQ3_BOTCLIP;
+       if (!(supercontents & SUPERCONTENTS_OPAQUE))
+               nativecontents |= CONTENTSQ3_TRANSLUCENT;
+       return nativecontents;
+}
 
-       i = LittleLong (header->version);
-       if (i != BSPVERSION && i != 30)
-               Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i (Quake) or 30 (HalfLife))", mod->name, i, BSPVERSION);
-       mod->ishlbsp = i == 30;
-       if (loadmodel->isworldmodel)
+void Mod_Q3BSP_RecursiveFindNumLeafs(mnode_t *node)
+{
+       int numleafs;
+       while (node->plane)
        {
-               Cvar_SetValue("halflifebsp", mod->ishlbsp);
-               // until we get a texture for it...
-               R_ResetQuakeSky();
+               Mod_Q3BSP_RecursiveFindNumLeafs(node->children[0]);
+               node = node->children[1];
        }
+       numleafs = ((mleaf_t *)node - loadmodel->brush.data_leafs) + 1;
+       if (loadmodel->brush.num_leafs < numleafs)
+               loadmodel->brush.num_leafs = numleafs;
+}
 
-// swap all the lumps
-       mod_base = (qbyte *)header;
-
-       for (i = 0;i < (int) sizeof(dheader_t) / 4;i++)
-               ((int *)header)[i] = LittleLong ( ((int *)header)[i]);
-
-// load into heap
-
-       // store which lightmap format to use
-       mod->lightmaprgba = r_lightmaprgba.integer;
-
-       Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-       Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-       Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-       Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-       Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-       Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-       Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-       Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-       Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-       Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-       Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-       Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-       Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-       Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-       Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-
-       Mod_MakeHull0 ();
-       Mod_MakePortals();
-
-       mod->numframes = 2;             // regular and alternate animation
+void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       int i, j, numshadowmeshtriangles, lumps;
+       q3dheader_t *header;
+       float corner[3], yawradius, modelradius;
+       msurface_t *surface;
+
+       mod->modeldatatypestring = "Q3BSP";
+
+       mod->type = mod_brushq3;
+       mod->numframes = 2; // although alternate textures are not supported it is annoying to complain about no such frame 1
+       mod->numskins = 1;
+
+       header = (q3dheader_t *)buffer;
+       if((char *) bufferend < (char *) buffer + sizeof(q3dheader_t))
+               Host_Error("Mod_Q3BSP_Load: %s is smaller than its header", mod->name);
+
+       i = LittleLong(header->version);
+       if (i != Q3BSPVERSION && i != Q3BSPVERSION_IG && i != Q3BSPVERSION_LIVE)
+               Host_Error("Mod_Q3BSP_Load: %s has wrong version number (%i, should be %i)", mod->name, i, Q3BSPVERSION);
+
+       mod->soundfromcenter = true;
+       mod->TraceBox = Mod_Q3BSP_TraceBox;
+       mod->PointSuperContents = Mod_Q3BSP_PointSuperContents;
+       mod->brush.TraceLineOfSight = Mod_Q1BSP_TraceLineOfSight;
+       mod->brush.SuperContentsFromNativeContents = Mod_Q3BSP_SuperContentsFromNativeContents;
+       mod->brush.NativeContentsFromSuperContents = Mod_Q3BSP_NativeContentsFromSuperContents;
+       mod->brush.GetPVS = Mod_Q1BSP_GetPVS;
+       mod->brush.FatPVS = Mod_Q1BSP_FatPVS;
+       mod->brush.BoxTouchingPVS = Mod_Q1BSP_BoxTouchingPVS;
+       mod->brush.BoxTouchingLeafPVS = Mod_Q1BSP_BoxTouchingLeafPVS;
+       mod->brush.BoxTouchingVisibleLeafs = Mod_Q1BSP_BoxTouchingVisibleLeafs;
+       mod->brush.FindBoxClusters = Mod_Q1BSP_FindBoxClusters;
+       mod->brush.LightPoint = Mod_Q3BSP_LightPoint;
+       mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation;
+       mod->brush.AmbientSoundLevelsForPoint = NULL;
+       mod->brush.RoundUpToHullSize = NULL;
+       mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf;
+       mod->Draw = R_Q1BSP_Draw;
+       mod->DrawDepth = R_Q1BSP_DrawDepth;
+       mod->DrawDebug = R_Q1BSP_DrawDebug;
+       mod->GetLightInfo = R_Q1BSP_GetLightInfo;
+       mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume;
+       mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume;
+       mod->DrawLight = R_Q1BSP_DrawLight;
+
+       mod_base = (unsigned char *)header;
+
+       // swap all the lumps
+       header->ident = LittleLong(header->ident);
+       header->version = LittleLong(header->version);
+       lumps = (header->version == Q3BSPVERSION_LIVE) ? Q3HEADER_LUMPS_LIVE : Q3HEADER_LUMPS;
+       for (i = 0;i < lumps;i++)
+       {
+               j = (header->lumps[i].fileofs = LittleLong(header->lumps[i].fileofs));
+               if((char *) bufferend < (char *) buffer + j)
+                       Host_Error("Mod_Q3BSP_Load: %s has a lump that starts outside the file!", mod->name);
+               j += (header->lumps[i].filelen = LittleLong(header->lumps[i].filelen));
+               if((char *) bufferend < (char *) buffer + j)
+                       Host_Error("Mod_Q3BSP_Load: %s has a lump that ends outside the file!", mod->name);
+       }
+       /*
+        * NO, do NOT clear them!
+        * they contain actual data referenced by other stuff.
+        * Instead, before using the advertisements lump, check header->versio
+        * again!
+        * Sorry, but otherwise it breaks memory of the first lump.
+       for (i = lumps;i < Q3HEADER_LUMPS_MAX;i++)
+       {
+               header->lumps[i].fileofs = 0;
+               header->lumps[i].filelen = 0;
+       }
+       */
 
-       mainmempool = mod->mempool;
-       loadname = mod->name;
+       mod->brush.qw_md4sum = 0;
+       mod->brush.qw_md4sum2 = 0;
+       for (i = 0;i < lumps;i++)
+       {
+               if (i == Q3LUMP_ENTITIES)
+                       continue;
+               mod->brush.qw_md4sum ^= Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen);
+               if (i == Q3LUMP_PVS || i == Q3LUMP_LEAFS || i == Q3LUMP_NODES)
+                       continue;
+               mod->brush.qw_md4sum2 ^= Com_BlockChecksum(mod_base + header->lumps[i].fileofs, header->lumps[i].filelen);
 
-       Mod_LoadLightList ();
-       originalloadmodel = loadmodel;
+               // all this checksumming can take a while, so let's send keepalives here too
+               CL_KeepaliveMessage(false);
+       }
 
-//
-// set up the submodels (FIXME: this is confusing)
-//
-       for (i = 0;i < mod->numsubmodels;i++)
+       Mod_Q3BSP_LoadEntities(&header->lumps[Q3LUMP_ENTITIES]);
+       Mod_Q3BSP_LoadTextures(&header->lumps[Q3LUMP_TEXTURES]);
+       Mod_Q3BSP_LoadPlanes(&header->lumps[Q3LUMP_PLANES]);
+       if (header->version == Q3BSPVERSION_IG)
+               Mod_Q3BSP_LoadBrushSides_IG(&header->lumps[Q3LUMP_BRUSHSIDES]);
+       else
+               Mod_Q3BSP_LoadBrushSides(&header->lumps[Q3LUMP_BRUSHSIDES]);
+       Mod_Q3BSP_LoadBrushes(&header->lumps[Q3LUMP_BRUSHES]);
+       Mod_Q3BSP_LoadEffects(&header->lumps[Q3LUMP_EFFECTS]);
+       Mod_Q3BSP_LoadVertices(&header->lumps[Q3LUMP_VERTICES]);
+       Mod_Q3BSP_LoadTriangles(&header->lumps[Q3LUMP_TRIANGLES]);
+       Mod_Q3BSP_LoadLightmaps(&header->lumps[Q3LUMP_LIGHTMAPS], &header->lumps[Q3LUMP_FACES]);
+       Mod_Q3BSP_LoadFaces(&header->lumps[Q3LUMP_FACES]);
+       Mod_Q3BSP_LoadModels(&header->lumps[Q3LUMP_MODELS]);
+       Mod_Q3BSP_LoadLeafBrushes(&header->lumps[Q3LUMP_LEAFBRUSHES]);
+       Mod_Q3BSP_LoadLeafFaces(&header->lumps[Q3LUMP_LEAFFACES]);
+       Mod_Q3BSP_LoadLeafs(&header->lumps[Q3LUMP_LEAFS]);
+       Mod_Q3BSP_LoadNodes(&header->lumps[Q3LUMP_NODES]);
+       Mod_Q3BSP_LoadLightGrid(&header->lumps[Q3LUMP_LIGHTGRID]);
+       Mod_Q3BSP_LoadPVS(&header->lumps[Q3LUMP_PVS]);
+       loadmodel->brush.numsubmodels = loadmodel->brushq3.num_models;
+
+       // the MakePortals code works fine on the q3bsp data as well
+       Mod_Q1BSP_MakePortals();
+
+       // FIXME: shader alpha should replace r_wateralpha support in q3bsp
+       loadmodel->brush.supportwateralpha = true;
+
+       // make a single combined shadow mesh to allow optimized shadow volume creation
+       numshadowmeshtriangles = 0;
+       if (cls.state != ca_dedicated)
        {
-               bm = &mod->submodels[i];
-
-               mod->hulls[0].firstclipnode = bm->headnode[0];
-               for (j=1 ; j<MAX_MAP_HULLS ; j++)
+               for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
                {
-                       mod->hulls[j].firstclipnode = bm->headnode[j];
-                       mod->hulls[j].lastclipnode = mod->numclipnodes - 1;
+                       surface->num_firstshadowmeshtriangle = numshadowmeshtriangles;
+                       numshadowmeshtriangles += surface->num_triangles;
                }
+               loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true);
+               for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
+                       if (surface->num_triangles > 0)
+                               Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, loadmodel->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
+               loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true, false);
+               Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles);
+       }
 
-               mod->firstmodelsurface = bm->firstface;
-               mod->nummodelsurfaces = bm->numfaces;
+       loadmodel->brush.num_leafs = 0;
+       Mod_Q3BSP_RecursiveFindNumLeafs(loadmodel->brush.data_nodes);
 
-               // this gets altered below if sky is used
-               mod->DrawSky = NULL;
-               mod->Draw = R_Model_Brush_Draw;
-               mod->DrawFakeShadow = NULL;
-               mod->DrawShadowVolume = R_Model_Brush_DrawShadowVolume;
-               mod->DrawLight = R_Model_Brush_DrawLight;
-               mod->pvstexturechains = Mem_Alloc(originalloadmodel->mempool, mod->numtextures * sizeof(msurface_t **));
-               mod->pvstexturechainsbuffer = Mem_Alloc(originalloadmodel->mempool, (mod->nummodelsurfaces + mod->numtextures) * sizeof(msurface_t *));
-               mod->pvstexturechainslength = Mem_Alloc(originalloadmodel->mempool, mod->numtextures * sizeof(int));
-               Mod_BuildPVSTextureChains(mod);
-               Mod_BuildLightmapUpdateChains(originalloadmodel->mempool, mod);
-               if (mod->nummodelsurfaces)
+       mod = loadmodel;
+       for (i = 0;i < loadmodel->brush.numsubmodels;i++)
+       {
+               if (i > 0)
                {
-                       // 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)
-                               if (surf->texinfo->texture->shader == &Cshader_sky)
-                                       mod->DrawSky = R_Model_Brush_DrawSky;
-                               // LordHavoc: submodels always clip, even if water
-                               if (mod->numsubmodels - 1)
-                                       surf->flags |= SURF_SOLIDCLIP;
-                               // calculate bounding shapes
-                               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                               {
-                                       for (k = 0, vec = mesh->verts;k < mesh->numverts;k++, vec += 4)
-                                       {
-                                               if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0];
-                                               if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1];
-                                               if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2];
-                                               if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0];
-                                               if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1];
-                                               if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2];
-                                               dist = vec[0]*vec[0]+vec[1]*vec[1];
-                                               if (modelyawradius < dist)
-                                                       modelyawradius = dist;
-                                               dist += vec[2]*vec[2];
-                                               if (modelradius < dist)
-                                                       modelradius = dist;
-                                       }
-                               }
-                       }
-                       modelyawradius = sqrt(modelyawradius);
-                       modelradius = sqrt(modelradius);
-                       mod->yawmins[0] = mod->yawmins[1] = -(mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius);
-                       mod->yawmins[2] = mod->normalmins[2];
-                       mod->yawmaxs[2] = mod->normalmaxs[2];
-                       mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
-                       mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
-                       mod->radius = modelradius;
-                       mod->radius2 = modelradius * modelradius;
+                       char name[10];
+                       // duplicate the basic information
+                       dpsnprintf(name, sizeof(name), "*%i", i);
+                       mod = Mod_FindName(name, loadmodel->name);
+                       // copy the base model to this one
+                       *mod = *loadmodel;
+                       // rename the clone back to its proper name
+                       strlcpy(mod->name, name, sizeof(mod->name));
+                       mod->brush.parentmodel = loadmodel;
+                       // textures and memory belong to the main model
+                       mod->texturepool = NULL;
+                       mod->mempool = NULL;
+                       mod->brush.TraceLineOfSight = NULL;
+                       mod->brush.GetPVS = NULL;
+                       mod->brush.FatPVS = NULL;
+                       mod->brush.BoxTouchingPVS = NULL;
+                       mod->brush.BoxTouchingLeafPVS = NULL;
+                       mod->brush.BoxTouchingVisibleLeafs = NULL;
+                       mod->brush.FindBoxClusters = NULL;
+                       mod->brush.LightPoint = NULL;
+                       mod->brush.AmbientSoundLevelsForPoint = NULL;
                }
-               else
+               mod->brush.submodel = i;
+
+               // make the model surface list (used by shadowing/lighting)
+               mod->firstmodelsurface = mod->brushq3.data_models[i].firstface;
+               mod->nummodelsurfaces = mod->brushq3.data_models[i].numfaces;
+               mod->firstmodelbrush = mod->brushq3.data_models[i].firstbrush;
+               mod->nummodelbrushes = mod->brushq3.data_models[i].numbrushes;
+               mod->sortedmodelsurfaces = (int *)Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->sortedmodelsurfaces));
+               Mod_MakeSortedSurfaces(mod);
+
+               VectorCopy(mod->brushq3.data_models[i].mins, mod->normalmins);
+               VectorCopy(mod->brushq3.data_models[i].maxs, mod->normalmaxs);
+               // enlarge the bounding box to enclose all geometry of this model,
+               // because q3map2 sometimes lies (mostly to affect the lightgrid),
+               // which can in turn mess up the farclip (as well as culling when
+               // outside the level - an unimportant concern)
+
+               //printf("Editing model %d... BEFORE re-bounding: %f %f %f - %f %f %f\n", i, mod->normalmins[0], mod->normalmins[1], mod->normalmins[2], mod->normalmaxs[0], mod->normalmaxs[1], mod->normalmaxs[2]);
+               for (j = 0;j < mod->nummodelsurfaces;j++)
                {
-                       // LordHavoc: empty submodel (lacrima.bsp has such a glitch)
-                       Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname);
+                       const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface;
+                       const float *v = mod->surfmesh.data_vertex3f + 3 * surface->num_firstvertex;
+                       int k;
+                       if (!surface->num_vertices)
+                               continue;
+                       for (k = 0;k < surface->num_vertices;k++, v += 3)
+                       {
+                               mod->normalmins[0] = min(mod->normalmins[0], v[0]);
+                               mod->normalmins[1] = min(mod->normalmins[1], v[1]);
+                               mod->normalmins[2] = min(mod->normalmins[2], v[2]);
+                               mod->normalmaxs[0] = max(mod->normalmaxs[0], v[0]);
+                               mod->normalmaxs[1] = max(mod->normalmaxs[1], v[1]);
+                               mod->normalmaxs[2] = max(mod->normalmaxs[2], v[2]);
+                       }
                }
-               Mod_BuildSurfaceNeighbors(mod->surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, originalloadmodel->mempool);
+               //printf("Editing model %d... AFTER re-bounding: %f %f %f - %f %f %f\n", i, mod->normalmins[0], mod->normalmins[1], mod->normalmins[2], mod->normalmaxs[0], mod->normalmaxs[1], mod->normalmaxs[2]);
+               corner[0] = max(fabs(mod->normalmins[0]), fabs(mod->normalmaxs[0]));
+               corner[1] = max(fabs(mod->normalmins[1]), fabs(mod->normalmaxs[1]));
+               corner[2] = max(fabs(mod->normalmins[2]), fabs(mod->normalmaxs[2]));
+               modelradius = sqrt(corner[0]*corner[0]+corner[1]*corner[1]+corner[2]*corner[2]);
+               yawradius = sqrt(corner[0]*corner[0]+corner[1]*corner[1]);
+               mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
+               mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
+               mod->yawmaxs[0] = mod->yawmaxs[1] = yawradius;
+               mod->yawmins[0] = mod->yawmins[1] = -yawradius;
+               mod->yawmins[2] = mod->normalmins[2];
+               mod->yawmaxs[2] = mod->normalmaxs[2];
+               mod->radius = modelradius;
+               mod->radius2 = modelradius * modelradius;
+
+               // this gets altered below if sky or water is used
+               mod->DrawSky = NULL;
+               mod->DrawAddWaterPlanes = NULL;
+
+               for (j = 0;j < mod->nummodelsurfaces;j++)
+                       if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & MATERIALFLAG_SKY)
+                               break;
+               if (j < mod->nummodelsurfaces)
+                       mod->DrawSky = R_Q1BSP_DrawSky;
 
-               mod->numleafs = bm->visleafs;
+               for (j = 0;j < mod->nummodelsurfaces;j++)
+                       if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION))
+                               break;
+               if (j < mod->nummodelsurfaces)
+                       mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;
+       }
+}
 
-               // LordHavoc: only register submodels if it is the world
-               // (prevents bsp models from replacing world submodels)
-               if (loadmodel->isworldmodel && i < (mod->numsubmodels - 1))
-               {
-                       char    name[10];
-                       // duplicate the basic information
-                       sprintf (name, "*%i", i+1);
-                       loadmodel = Mod_FindName (name);
-                       *loadmodel = *mod;
-                       strcpy (loadmodel->name, name);
-                       // textures and memory belong to the main model
-                       loadmodel->texturepool = NULL;
-                       loadmodel->mempool = NULL;
-                       mod = loadmodel;
-               }
+void Mod_IBSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       int i = LittleLong(((int *)buffer)[1]);
+       if (i == Q3BSPVERSION || i == Q3BSPVERSION_IG || i == Q3BSPVERSION_LIVE)
+               Mod_Q3BSP_Load(mod,buffer, bufferend);
+       else if (i == Q2BSPVERSION)
+               Mod_Q2BSP_Load(mod,buffer, bufferend);
+       else
+               Host_Error("Mod_IBSP_Load: unknown/unsupported version %i", i);
+}
+
+void Mod_MAP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+{
+       Host_Error("Mod_MAP_Load: not yet implemented");
+}
+
+qboolean Mod_CanSeeBox_Trace(int numsamples, float t, dp_model_t *model, vec3_t eye, vec3_t minsX, vec3_t maxsX)
+{
+       // we already have done PVS culling at this point...
+       // so we don't need to do it again.
+
+       int i;
+       vec3_t testorigin, mins, maxs;
+
+       testorigin[0] = (minsX[0] + maxsX[0]) * 0.5;
+       testorigin[1] = (minsX[1] + maxsX[1]) * 0.5;
+       testorigin[2] = (minsX[2] + maxsX[2]) * 0.5;
+
+       if(model->brush.TraceLineOfSight(model, eye, testorigin))
+               return 1;
+
+       // expand the box a little
+       mins[0] = (t+1) * minsX[0] - t * maxsX[0];
+       maxs[0] = (t+1) * maxsX[0] - t * minsX[0];
+       mins[1] = (t+1) * minsX[1] - t * maxsX[1];
+       maxs[1] = (t+1) * maxsX[1] - t * minsX[1];
+       mins[2] = (t+1) * minsX[2] - t * maxsX[2];
+       maxs[2] = (t+1) * maxsX[2] - t * minsX[2];
+
+       for(i = 0; i != numsamples; ++i)
+       {
+               testorigin[0] = lhrandom(mins[0], maxs[0]);
+               testorigin[1] = lhrandom(mins[1], maxs[1]);
+               testorigin[2] = lhrandom(mins[2], maxs[2]);
+
+               if(model->brush.TraceLineOfSight(model, eye, testorigin))
+                       return 1;
        }
 
-       loadmodel = originalloadmodel;
-       //Mod_ProcessLightList ();
+       return 0;
 }