]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_brush.c
changed format of aliasvertex_t to use floats (hopefully this is a speedup, it sure...
[xonotic/darkplaces.git] / model_brush.c
index b005563b02b4630bdd9d04c91a5c7e9c5de5c697..4959d8c32887cb48585abe14b9c9e5a6625e5177 100644 (file)
@@ -19,14 +19,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "image.h"
 
-byte mod_novis[(MAX_MAP_LEAFS + 7)/ 8];
+// note: model_shared.c sets up r_notexture, and r_surf_notexture
 
-qboolean       hlbsp; // LordHavoc: true if it is a HalfLife BSP file (version 30)
+qbyte mod_novis[(MAX_MAP_LEAFS + 7)/ 8];
 
-cvar_t gl_subdivide_size = {CVAR_SAVE, "gl_subdivide_size", "128"};
+//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"};
+
+#define NUM_DETAILTEXTURES 1
+static rtexture_t *detailtextures[NUM_DETAILTEXTURES];
+static rtexturepool_t *detailtexturepool;
 
 /*
 ===============
@@ -35,15 +44,63 @@ Mod_BrushInit
 */
 void Mod_BrushInit (void)
 {
-       Cvar_RegisterVariable (&gl_subdivide_size);
-       Cvar_RegisterVariable (&halflifebsp);
-       Cvar_RegisterVariable (&r_novis);
+//     Cvar_RegisterVariable(&r_subdivide_size);
+       Cvar_RegisterVariable(&halflifebsp);
+       Cvar_RegisterVariable(&r_novis);
+       Cvar_RegisterVariable(&r_miplightmaps);
+       Cvar_RegisterVariable(&r_lightmaprgba);
+       Cvar_RegisterVariable(&r_nosurftextures);
+       Cvar_RegisterVariable(&r_sortsurfaces);
        memset(mod_novis, 0xff, sizeof(mod_novis));
 }
 
-void Mod_Brush_SERAddEntity(void)
+void Mod_BrushStartup (void)
 {
-       R_Clip_AddBox(currentrenderentity->mins, currentrenderentity->maxs, R_Entity_Callback, currentrenderentity, NULL);
+       int i, x, y, light;
+       float vc[3], vx[3], vy[3], vn[3], lightdir[3];
+#define DETAILRESOLUTION 256
+       qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION];
+       detailtexturepool = R_AllocTexturePool();
+       lightdir[0] = 0.5;
+       lightdir[1] = 1;
+       lightdir[2] = -0.25;
+       VectorNormalize(lightdir);
+       for (i = 0;i < NUM_DETAILTEXTURES;i++)
+       {
+               fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4);
+               for (y = 0;y < DETAILRESOLUTION;y++)
+               {
+                       for (x = 0;x < DETAILRESOLUTION;x++)
+                       {
+                               vc[0] = x;
+                               vc[1] = y;
+                               vc[2] = noise[y][x] * (1.0f / 32.0f);
+                               vx[0] = x + 1;
+                               vx[1] = y;
+                               vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f);
+                               vy[0] = x;
+                               vy[1] = y + 1;
+                               vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f);
+                               VectorSubtract(vx, vc, vx);
+                               VectorSubtract(vy, vc, vy);
+                               CrossProduct(vx, vy, vn);
+                               VectorNormalize(vn);
+                               light = 128 - DotProduct(vn, lightdir) * 128;
+                               light = bound(0, light, 255);
+                               data[y][x][0] = data[y][x][1] = data[y][x][2] = light;
+                               data[y][x][3] = 255;
+                       }
+               }
+               detailtextures[i] = R_LoadTexture2D(detailtexturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
+       }
+}
+
+void Mod_BrushShutdown (void)
+{
+       int i;
+       for (i = 0;i < NUM_DETAILTEXTURES;i++)
+               R_FreeTexture(detailtextures[i]);
+       R_FreeTexturePool(&detailtexturepool);
 }
 
 /*
@@ -51,74 +108,72 @@ void Mod_Brush_SERAddEntity(void)
 Mod_PointInLeaf
 ===============
 */
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
+mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
 {
-       mnode_t         *node;
+       mnode_t *node;
 
-//     if (!model || !model->nodes)
-//             Sys_Error ("Mod_PointInLeaf: bad model");
+       if (model == NULL)
+               return NULL;
 
-       node = model->nodes;
-       do
+       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];
-       while (node->contents == 0);
 
        return (mleaf_t *)node;
 }
-/*
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
+
+int Mod_PointContents (const vec3_t p, model_t *model)
 {
-       mnode_t         *node;
-       float           d;
-       mplane_t        *plane;
+       mnode_t *node;
 
-       if (!model || !model->nodes)
-               Sys_Error ("Mod_PointInLeaf: bad model");
+       if (model == NULL)
+               return CONTENTS_EMPTY;
 
-       node = model->nodes;
-       while (1)
-       {
-               if (node->contents < 0)
-                       return (mleaf_t *)node;
-               plane = node->plane;
-               d = DotProduct (p,plane->normal) - plane->dist;
-               if (d > 0)
-                       node = node->children[0];
-               else
-                       node = node->children[1];
-       }
+       Mod_CheckLoaded(model);
 
-       return NULL;    // never reached
+       // 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)
+{
+       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;
+}
+
 
 /*
 ===================
 Mod_DecompressVis
 ===================
 */
-static byte *Mod_DecompressVis (byte *in, model_t *model)
+static qbyte *Mod_DecompressVis (qbyte *in, model_t *model)
 {
-       static byte     decompressed[MAX_MAP_LEAFS/8];
-       int             c;
-       byte    *out;
-       int             row;
+       static qbyte decompressed[MAX_MAP_LEAFS/8];
+       int c;
+       qbyte *out;
+       int row;
 
        row = (model->numleafs+7)>>3;
        out = decompressed;
 
-       /*
-       if (!in)
-       {       // no vis info, so make all visible
-               while (row)
-               {
-                       *out++ = 0xff;
-                       row--;
-               }
-               return decompressed;
-       }
-       */
-
        do
        {
                if (*in)
@@ -139,54 +194,13 @@ static byte *Mod_DecompressVis (byte *in, model_t *model)
        return decompressed;
 }
 
-byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
+qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
 {
-       if (r_novis.value || leaf == model->leafs || leaf->compressed_vis == NULL)
+       if (r_novis.integer || leaf == model->leafs || leaf->compressed_vis == NULL)
                return mod_novis;
        return Mod_DecompressVis (leaf->compressed_vis, model);
 }
 
-rtexture_t *r_notexture;
-texture_t r_notexture_mip;
-
-void Mod_SetupNoTexture(void)
-{
-       int             x, y;
-       byte    pix[16][16][4];
-
-       // create a simple checkerboard texture for the default
-       // LordHavoc: redesigned this to remove reliance on the palette and texture_t
-       for (y = 0;y < 16;y++)
-       {
-               for (x = 0;x < 16;x++)
-               {
-                       if ((y < 8) ^ (x < 8))
-                       {
-                               pix[y][x][0] = 128;
-                               pix[y][x][1] = 128;
-                               pix[y][x][2] = 128;
-                               pix[y][x][3] = 255;
-                       }
-                       else
-                       {
-                               pix[y][x][0] = 64;
-                               pix[y][x][1] = 64;
-                               pix[y][x][2] = 64;
-                               pix[y][x][3] = 255;
-                       }
-               }
-       }
-
-       r_notexture = R_LoadTexture("notexture", 16, 16, &pix[0][0][0], TEXF_MIPMAP | TEXF_RGBA);
-
-       strcpy(r_notexture_mip.name, "notexture");
-       r_notexture_mip.width = 16;
-       r_notexture_mip.height = 16;
-       r_notexture_mip.transparent = false;
-       r_notexture_mip.texture = r_notexture;
-       r_notexture_mip.glowtexture = NULL;
-}
-
 /*
 =================
 Mod_LoadTextures
@@ -194,33 +208,62 @@ Mod_LoadTextures
 */
 static void Mod_LoadTextures (lump_t *l)
 {
-       int                             i, j, k, num, max, altmax, mtwidth, mtheight, *dofs;
-       miptex_t                *dmiptex;
-       texture_t               *tx, *tx2, *anims[10], *altanims[10];
-       dmiptexlump_t   *m;
-       byte                    *data, *mtdata;
+       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];
+       qbyte *basepixels, *bumppixels, *nmappixels, *glosspixels, *glowpixels, *maskpixels;
+       int basepixels_width, basepixels_height, bumppixels_width, bumppixels_height;
+       int nmappixels_width, nmappixels_height, glosspixels_width, glosspixels_height;
+       int glowpixels_width, glowpixels_height, maskpixels_width, maskpixels_height;
+       rtexture_t *detailtexture;
+
+       loadmodel->textures = NULL;
 
        if (!l->filelen)
-       {
-               loadmodel->textures = NULL;
                return;
-       }
 
        m = (dmiptexlump_t *)(mod_base + l->fileofs);
-       
+
        m->nummiptex = LittleLong (m->nummiptex);
 
-       loadmodel->numtextures = m->nummiptex;
-       loadmodel->textures = Hunk_AllocName (m->nummiptex * sizeof(*loadmodel->textures), va("%s texture headers", loadname));
+       // 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;
+               tx->width = 16;
+               tx->height = 16;
+               tx->texture = r_notexture;
+               tx->shader = &Cshader_wall_lightmap;
+               if (i == loadmodel->numtextures - 1)
+               {
+                       tx->flags = SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+                       tx->shader = &Cshader_water;
+               }
+               tx->currentframe = tx;
+       }
 
        // just to work around bounds checking when debugging with it (array index out of bounds error thing)
        dofs = m->dataofs;
+       // LordHavoc: mostly rewritten map texture loader
        for (i = 0;i < m->nummiptex;i++)
        {
                dofs[i] = LittleLong(dofs[i]);
-               if (dofs[i] == -1)
+               if (dofs[i] == -1 || r_nosurftextures.integer)
                        continue;
-               dmiptex = (miptex_t *)((byte *)m + dofs[i]);
+               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;
@@ -229,184 +272,266 @@ static void Mod_LoadTextures (lump_t *l)
                {
                        // texture included
                        if (j < 40 || j + mtwidth * mtheight > l->filelen)
-                               Host_Error ("Texture %s is corrupt or incomplete\n", dmiptex->name);
-                       mtdata = (byte *)dmiptex + j;
+                       {
+                               Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
+                               continue;
+                       }
+                       mtdata = (qbyte *)dmiptex + j;
                }
 
                if ((mtwidth & 15) || (mtheight & 15))
-                       Host_Error ("Texture %s is not 16 aligned", dmiptex->name);
-               // LordHavoc: rewriting the map texture loader for GLQuake
-               tx = Hunk_AllocName (sizeof(texture_t), va("%s textures", loadname));
-               memset(tx, 0, sizeof(texture_t));
-               tx->anim_total = 0;
-               tx->alternate_anims = NULL;
-               loadmodel->textures[i] = tx;
-
-               // LordHavoc: force all names to lowercase and make sure they are terminated while copying
-               for (j = 0;dmiptex->name[j] && j < 15;j++)
-               {
-                       if (dmiptex->name[j] >= 'A' && dmiptex->name[j] <= 'Z')
-                               tx->name[j] = dmiptex->name[j] + ('a' - 'A');
-                       else
-                               tx->name[j] = dmiptex->name[j];
-               }
-               for (;j < 16;j++)
-                       tx->name[j] = 0;
+                       Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
+
+               // 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])
                {
-                       Con_Printf("warning: unnamed texture in %s\n", loadname);
                        sprintf(tx->name, "unnamed%i", i);
+                       Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
                }
 
-               tx->transparent = false;
-               data = loadimagepixels(tx->name, false, 0, 0);
-               if (data)
+               basepixels = NULL;basepixels_width = 0;basepixels_height = 0;
+               bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0;
+               nmappixels = NULL;nmappixels_width = 0;nmappixels_height = 0;
+               glosspixels = NULL;glosspixels_width = 0;glosspixels_height = 0;
+               glowpixels = NULL;glowpixels_width = 0;glowpixels_height = 0;
+               maskpixels = NULL;maskpixels_width = 0;maskpixels_height = 0;
+               detailtexture = NULL;
+
+               // LordHavoc: HL sky textures are entirely different than quake
+               if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
                {
-                       if (!hlbsp && !strncmp(tx->name,"sky",3) && image_width == 256 && image_height == 128) // LordHavoc: HL sky textures are entirely unrelated
+                       if (loadmodel->isworldmodel)
                        {
-                               tx->width = 0;
-                               tx->height = 0;
-                               tx->transparent = false;
-                               tx->texture = NULL;
-                               tx->glowtexture = NULL;
-                               R_InitSky (data, 4);
-                       }
-                       else
-                       {
-                               tx->width = mtwidth;
-                               tx->height = mtheight;
-                               tx->transparent = Image_CheckAlpha(data, image_width * image_height, true);
-                               tx->texture = R_LoadTexture (tx->name, image_width, image_height, data, TEXF_MIPMAP | (tx->transparent ? TEXF_ALPHA : 0) | TEXF_RGBA | TEXF_PRECACHE);
-                               tx->glowtexture = NULL;
+                               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);
                        }
-                       qfree(data);
                }
                else
                {
-                       if (hlbsp)
+                       if ((basepixels = loadimagepixels(tx->name, false, 0, 0)) != NULL)
+                       {
+                               basepixels_width = image_width;
+                               basepixels_height = image_height;
+                       }
+                       // _luma is supported for tenebrae compatibility
+                       // (I think it's a very stupid name, but oh well)
+                       if ((glowpixels = loadimagepixels(va("%s_glow", tx->name), false, 0, 0)) != NULL
+                        || (glowpixels = loadimagepixels(va("%s_luma", tx->name), false, 0, 0)) != NULL)
                        {
-                               if (mtdata) // texture included
+                               glowpixels_width = image_width;
+                               glowpixels_height = image_height;
+                       }
+                       if ((bumppixels = loadimagepixels(va("%s_bump", tx->name), false, 0, 0)) != NULL)
+                       {
+                               bumppixels_width = image_width;
+                               bumppixels_height = image_height;
+                       }
+                       if ((glosspixels = loadimagepixels(va("%s_gloss", tx->name), false, 0, 0)) != NULL)
+                       {
+                               glosspixels_width = image_width;
+                               glosspixels_height = image_height;
+                       }
+                       if (!basepixels)
+                       {
+                               if (loadmodel->ishlbsp)
                                {
-                                       data = W_ConvertWAD3Texture(dmiptex);
-                                       if (data)
+                                       // internal texture overrides wad
+                                       if (mtdata && (basepixels = W_ConvertWAD3Texture(dmiptex)) != NULL)
                                        {
-                                               tx->width = mtwidth;
-                                               tx->height = mtheight;
-                                               tx->transparent = Image_CheckAlpha(data, mtwidth * mtheight, true);
-                                               tx->texture = R_LoadTexture (tx->name, mtwidth, mtheight, data, TEXF_MIPMAP | (tx->transparent ? TEXF_ALPHA : 0) | TEXF_RGBA | TEXF_PRECACHE);
-                                               tx->glowtexture = NULL;
-                                               qfree(data);
+                                               basepixels_width = image_width;
+                                               basepixels_height = image_height;
                                        }
-                               }
-                               if (!data)
-                               {
-                                       data = W_GetTexture(tx->name);
-                                       // get the size from the wad texture
-                                       if (data)
+                                       else if ((basepixels = W_GetTexture(tx->name)) != NULL)
                                        {
-                                               tx->width = image_width;
-                                               tx->height = image_height;
-                                               tx->transparent = Image_CheckAlpha(data, image_width * image_height, true);
-                                               tx->texture = R_LoadTexture (tx->name, image_width, image_height, data, TEXF_MIPMAP | (tx->transparent ? TEXF_ALPHA : 0) | TEXF_RGBA | TEXF_PRECACHE);
-                                               tx->glowtexture = NULL;
-                                               qfree(data);
+                                               // get the size from the wad texture
+                                               tx->width = basepixels_width = image_width;
+                                               tx->height = basepixels_height = image_height;
                                        }
                                }
-                               if (!data)
-                               {
-                                       tx->width = 16;
-                                       tx->height = 16;
-                                       tx->transparent = false;
-                                       tx->texture = r_notexture;
-                                       tx->glowtexture = NULL;
-                               }
-                       }
-                       else
-                       {
-                               if (!strncmp(tx->name,"sky",3) && mtwidth == 256 && mtheight == 128)
-                               {
-                                       tx->width = mtwidth;
-                                       tx->height = mtheight;
-                                       tx->transparent = false;
-                                       tx->texture = NULL;
-                                       tx->glowtexture = NULL;
-                                       R_InitSky (mtdata, 1);
-                               }
                                else
                                {
                                        if (mtdata) // texture included
                                        {
-                                               int fullbrights;
-                                               data = mtdata;
-                                               tx->width = mtwidth;
-                                               tx->height = mtheight;
-                                               tx->transparent = false;
-                                               fullbrights = false;
-                                               if (r_fullbrights.value && tx->name[0] != '*')
+                                               if (r_fullbrights.integer && tx->name[0] != '*')
                                                {
-                                                       for (j = 0;j < tx->width*tx->height;j++)
+                                                       basepixels_width = tx->width;
+                                                       basepixels_height = tx->height;
+                                                       basepixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                                                       Image_Copy8bitRGBA(mtdata, basepixels, basepixels_width * basepixels_height, palette_nofullbrights);
+                                                       if (!glowpixels)
                                                        {
-                                                               if (data[j] >= 224) // fullbright
+                                                               for (j = 0;j < (int)(tx->width*tx->height);j++)
+                                                                       if (((qbyte *)&palette_onlyfullbrights[mtdata[j]])[3] > 0) // fullbright
+                                                                               break;
+                                                               if (j < (int)(tx->width * tx->height))
                                                                {
-                                                                       fullbrights = true;
-                                                                       break;
+                                                                       glowpixels_width = tx->width;
+                                                                       glowpixels_height = tx->height;
+                                                                       glowpixels = Mem_Alloc(loadmodel->mempool, glowpixels_width * glowpixels_height * 4);
+                                                                       Image_Copy8bitRGBA(mtdata, glowpixels, glowpixels_width * glowpixels_height, palette_onlyfullbrights);
                                                                }
                                                        }
                                                }
-                                               if (fullbrights)
-                                               {
-                                                       char name[64];
-                                                       byte *data2;
-                                                       data2 = qmalloc(tx->width*tx->height);
-                                                       for (j = 0;j < tx->width*tx->height;j++)
-                                                               data2[j] = data[j] >= 224 ? 0 : data[j]; // no fullbrights
-                                                       tx->texture = R_LoadTexture (tx->name, tx->width, tx->height, data2, TEXF_MIPMAP | TEXF_PRECACHE);
-                                                       strcpy(name, tx->name);
-                                                       strcat(name, "_glow");
-                                                       for (j = 0;j < tx->width*tx->height;j++)
-                                                               data2[j] = data[j] >= 224 ? data[j] : 0; // only fullbrights
-                                                       tx->glowtexture = R_LoadTexture (name, tx->width, tx->height, data2, TEXF_MIPMAP | TEXF_PRECACHE);
-                                                       qfree(data2);
-                                               }
                                                else
                                                {
-                                                       tx->texture = R_LoadTexture (tx->name, tx->width, tx->height, data, TEXF_MIPMAP | TEXF_PRECACHE);
-                                                       tx->glowtexture = NULL;
+                                                       basepixels_width = tx->width;
+                                                       basepixels_height = tx->height;
+                                                       basepixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                                                       Image_Copy8bitRGBA(mtdata, basepixels, tx->width * tx->height, palette_complete);
                                                }
                                        }
-                                       else // no texture, and no external replacement texture was found
-                                       {
-                                               tx->width = 16;
-                                               tx->height = 16;
-                                               tx->transparent = false;
-                                               tx->texture = r_notexture;
-                                               tx->glowtexture = NULL;
-                                       }
                                }
                        }
                }
+
+               if (basepixels)
+               {
+                       for (j = 3;j < basepixels_width * basepixels_height * 4;j += 4)
+                               if (basepixels[j] < 255)
+                                       break;
+                       if (j < basepixels_width * basepixels_height * 4)
+                       {
+                               maskpixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                               maskpixels_width = basepixels_width;
+                               maskpixels_height = basepixels_height;
+                               for (j = 0;j < basepixels_width * basepixels_height * 4;j += 4)
+                               {
+                                       maskpixels[j+0] = 255;
+                                       maskpixels[j+1] = 255;
+                                       maskpixels[j+2] = 255;
+                                       maskpixels[j+3] = basepixels[j+3];
+                               }
+                       }
+
+                       if (!bumppixels)
+                       {
+                               bumppixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                               bumppixels_width = basepixels_width;
+                               bumppixels_height = basepixels_height;
+                               memcpy(bumppixels, basepixels, bumppixels_width * bumppixels_height * 4);
+                       }
+
+                       if (!nmappixels && bumppixels)
+                       {
+                               nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
+                               nmappixels_width = bumppixels_width;
+                               nmappixels_height = bumppixels_height;
+                               Image_HeightmapToNormalmap(bumppixels, nmappixels, nmappixels_width, nmappixels_height, false, 1);
+                       }
+               }
+
+               if (!detailtexture)
+                       detailtexture = detailtextures[i % NUM_DETAILTEXTURES];
+
+               if (basepixels)
+               {
+                       tx->texture = R_LoadTexture2D (loadmodel->texturepool, tx->name, basepixels_width, basepixels_height, basepixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (nmappixels)
+                               tx->nmaptexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_nmap", tx->name), basepixels_width, basepixels_height, nmappixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (glosspixels)
+                               tx->glosstexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_gloss", tx->name), glosspixels_width, glosspixels_height, glosspixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (glowpixels)
+                               tx->glowtexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_glow", tx->name), glowpixels_width, glowpixels_height, glowpixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (maskpixels)
+                               tx->fogtexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_mask", tx->name), maskpixels_width, maskpixels_height, maskpixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       tx->detailtexture = detailtexture;
+               }
+               else
+               {
+                       // no texture found
+                       tx->width = 16;
+                       tx->height = 16;
+                       tx->texture = r_notexture;
+                       tx->nmaptexture = NULL;
+                       tx->glosstexture = NULL;
+                       tx->glowtexture = NULL;
+                       tx->fogtexture = NULL;
+                       tx->detailtexture = NULL;
+               }
+
+               if (basepixels)
+                       Mem_Free(basepixels);
+               if (bumppixels)
+                       Mem_Free(bumppixels);
+               if (nmappixels)
+                       Mem_Free(nmappixels);
+               if (glosspixels)
+                       Mem_Free(glosspixels);
+               if (glowpixels)
+                       Mem_Free(glowpixels);
+               if (maskpixels)
+                       Mem_Free(maskpixels);
+
+               if (tx->name[0] == '*')
+               {
+                       tx->flags |= SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+                       // LordHavoc: some turbulent textures should be fullbright and solid
+                       if (!strncmp(tx->name,"*lava",5)
+                        || !strncmp(tx->name,"*teleport",9)
+                        || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
+                               tx->flags |= SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA;
+                       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;
+               }
+               else
+               {
+                       tx->flags |= SURF_LIGHTMAP;
+                       if (!tx->fogtexture)
+                               tx->flags |= SURF_SHADOWCAST | SURF_SHADOWLIGHT;
+                       tx->shader = &Cshader_wall_lightmap;
+               }
+
+               // start out with no animation
+               tx->currentframe = tx;
        }
 
-//
-// sequence the animations
-//
+       // sequence the animations
        for (i = 0;i < m->nummiptex;i++)
        {
-               tx = loadmodel->textures[i];
-               if (!tx || tx->name[0] != '+')
+               tx = loadmodel->textures + i;
+               if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
                        continue;
-               if (tx->anim_total)
+               if (tx->anim_total[0] || tx->anim_total[1])
                        continue;       // already sequenced
 
                // find the number of frames in the animation
                memset (anims, 0, sizeof(anims));
                memset (altanims, 0, sizeof(altanims));
-               max = altmax = 0;
 
                for (j = i;j < m->nummiptex;j++)
                {
-                       tx2 = loadmodel->textures[j];
+                       tx2 = loadmodel->textures + j;
                        if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2))
                                continue;
 
@@ -416,38 +541,79 @@ static void Mod_LoadTextures (lump_t *l)
                        else if (num >= 'a' && num <= 'j')
                                altanims[num - 'a'] = tx2;
                        else
-                               Host_Error ("Bad animating texture %s", tx->name);
+                               Con_Printf ("Bad animating texture %s\n", tx->name);
                }
 
+               max = altmax = 0;
                for (j = 0;j < 10;j++)
                {
-                       if (anims[j] != NULL)
+                       if (anims[j])
                                max = j + 1;
-                       if (altanims[j] != NULL)
+                       if (altanims[j])
                                altmax = j + 1;
                }
+               //Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
 
-               // link them all together
+               incomplete = false;
                for (j = 0;j < max;j++)
                {
-                       tx2 = anims[j];
-                       if (!tx2)
-                               Host_Error ("Missing frame %i of %s", j, tx->name);
-                       tx2->anim_total = max;
-                       tx2->alternate_anims = altanims[0]; // NULL if there is no alternate
+                       if (!anims[j])
+                       {
+                               Con_Printf ("Missing frame %i of %s\n", j, tx->name);
+                               incomplete = true;
+                       }
+               }
+               for (j = 0;j < altmax;j++)
+               {
+                       if (!altanims[j])
+                       {
+                               Con_Printf ("Missing altframe %i of %s\n", j, tx->name);
+                               incomplete = true;
+                       }
+               }
+               if (incomplete)
+                       continue;
+
+               if (altmax < 1)
+               {
+                       // if there is no alternate animation, duplicate the primary
+                       // animation into the alternate
+                       altmax = max;
                        for (k = 0;k < 10;k++)
-                               tx2->anim_frames[k] = anims[k];
+                               altanims[k] = anims[k];
                }
 
-               for (j = 0;j < altmax;j++)
+               // link together the primary animation
+               for (j = 0;j < max;j++)
                {
-                       tx2 = altanims[j];
-                       if (!tx2)
-                               Host_Error ("Missing frame %i of %s", j, tx->name);
-                       tx2->anim_total = altmax;
-                       tx2->alternate_anims = anims[0]; // NULL if there is no alternate
+                       tx2 = anims[j];
+                       tx2->animated = true;
+                       tx2->anim_total[0] = max;
+                       tx2->anim_total[1] = altmax;
                        for (k = 0;k < 10;k++)
-                               tx2->anim_frames[k] = altanims[k];
+                       {
+                               tx2->anim_frames[0][k] = anims[k];
+                               tx2->anim_frames[1][k] = altanims[k];
+                       }
+               }
+
+               // if there really is an alternate anim...
+               if (anims[0] != altanims[0])
+               {
+                       // link together the alternate animation
+                       for (j = 0;j < altmax;j++)
+                       {
+                               tx2 = altanims[j];
+                               tx2->animated = true;
+                               // the primary/alternate are reversed here
+                               tx2->anim_total[0] = altmax;
+                               tx2->anim_total[1] = max;
+                               for (k = 0;k < 10;k++)
+                               {
+                                       tx2->anim_frames[0][k] = altanims[k];
+                                       tx2->anim_frames[1][k] = anims[k];
+                               }
+                       }
                }
        }
 }
@@ -460,13 +626,12 @@ Mod_LoadLighting
 static void Mod_LoadLighting (lump_t *l)
 {
        int i;
-       byte *in, *out, *data;
-       byte d;
+       qbyte *in, *out, *data, d;
        char litfilename[1024];
        loadmodel->lightdata = NULL;
-       if (hlbsp) // LordHavoc: load the colored lighting data straight
+       if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight
        {
-               loadmodel->lightdata = Hunk_AllocName ( l->filelen, va("%s lightmaps", loadname));
+               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)
@@ -475,28 +640,39 @@ static void Mod_LoadLighting (lump_t *l)
                strcpy(litfilename, loadmodel->name);
                COM_StripExtension(litfilename, litfilename);
                strcat(litfilename, ".lit");
-               data = (byte*) COM_LoadHunkFile (litfilename, false);
+               data = (qbyte*) COM_LoadFile (litfilename, false);
                if (data)
                {
-                       if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+                       if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
                        {
                                i = LittleLong(((int *)data)[1]);
                                if (i == 1)
                                {
                                        Con_DPrintf("%s loaded", litfilename);
-                                       loadmodel->lightdata = data + 8;
+                                       loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, loadsize - 8);
+                                       memcpy(loadmodel->lightdata, data + 8, loadsize - 8);
+                                       Mem_Free(data);
                                        return;
                                }
                                else
+                               {
                                        Con_Printf("Unknown .lit file version (%d)\n", i);
+                                       Mem_Free(data);
+                               }
                        }
                        else
-                               Con_Printf("Corrupt .lit file (old version?), ignoring\n");
+                       {
+                               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 = Hunk_AllocName ( l->filelen*3, va("%s lightmaps", loadname));
+               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);
@@ -510,6 +686,324 @@ static void Mod_LoadLighting (lump_t *l)
        }
 }
 
+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++)
+                               {
+                                       surf = loadmodel->surfaces + *mark;
+                                       if (surf->number != *mark)
+                                               Con_Printf("%d != %d\n", surf->number, *mark);
+                                       dist = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+                                       if (surf->flags & SURF_PLANEBACK)
+                                               dist = -dist;
+                                       if (dist > 0 && dist < e->cullradius)
+                                       {
+                                               temp[0] = bound(surf->poly_mins[0], e->origin[0], surf->poly_maxs[0]) - e->origin[0];
+                                               temp[1] = bound(surf->poly_mins[1], e->origin[1], surf->poly_maxs[1]) - e->origin[1];
+                                               temp[2] = bound(surf->poly_mins[2], e->origin[2], surf->poly_maxs[2]) - e->origin[2];
+                                               if (DotProduct(temp, temp) < lightradius2)
+                                                       loadmodel->surfacevisframes[*mark] = -2;
+                                       }
+                               }
+                       }
+               }
+               // build list of light receiving surfaces
+               e->numsurfaces = 0;
+               for (j = 0;j < loadmodel->numsurfaces;j++)
+                       if (loadmodel->surfacevisframes[j] == -2)
+                               e->numsurfaces++;
+               e->surfaces = NULL;
+               if (e->numsurfaces > 0)
+               {
+                       e->surfaces = Mem_Alloc(loadmodel->mempool, sizeof(msurface_t *) * e->numsurfaces);
+                       e->numsurfaces = 0;
+                       for (j = 0;j < loadmodel->numsurfaces;j++)
+                               if (loadmodel->surfacevisframes[j] == -2)
+                                       e->surfaces[e->numsurfaces++] = loadmodel->surfaces + j;
+               }
+               // find bounding box and sphere of lit surfaces
+               // (these will be used for creating a shape to clip the light)
+               radius2 = 0;
+               for (j = 0;j < e->numsurfaces;j++)
+               {
+                       surf = e->surfaces[j];
+                       if (j == 0)
+                       {
+                               VectorCopy(surf->poly_verts, e->mins);
+                               VectorCopy(surf->poly_verts, e->maxs);
+                       }
+                       for (k = 0, v = surf->poly_verts;k < surf->poly_numverts;k++, v += 3)
+                       {
+                               if (e->mins[0] > v[0]) e->mins[0] = v[0];if (e->maxs[0] < v[0]) e->maxs[0] = v[0];
+                               if (e->mins[1] > v[1]) e->mins[1] = v[1];if (e->maxs[1] < v[1]) e->maxs[1] = v[1];
+                               if (e->mins[2] > v[2]) e->mins[2] = v[2];if (e->maxs[2] < v[2]) e->maxs[2] = v[2];
+                               VectorSubtract(v, e->origin, temp);
+                               dist = DotProduct(temp, temp);
+                               if (radius2 < dist)
+                                       radius2 = dist;
+                       }
+               }
+               if (e->cullradius2 > radius2)
+               {
+                       e->cullradius2 = radius2;
+                       e->cullradius = sqrt(e->cullradius2);
+               }
+               if (e->mins[0] < e->origin[0] - e->lightradius) e->mins[0] = e->origin[0] - e->lightradius;
+               if (e->maxs[0] > e->origin[0] + e->lightradius) e->maxs[0] = e->origin[0] + e->lightradius;
+               if (e->mins[1] < e->origin[1] - e->lightradius) e->mins[1] = e->origin[1] - e->lightradius;
+               if (e->maxs[1] > e->origin[1] + e->lightradius) e->maxs[1] = e->origin[1] + e->lightradius;
+               if (e->mins[2] < e->origin[2] - e->lightradius) e->mins[2] = e->origin[2] - e->lightradius;
+               if (e->maxs[2] > e->origin[2] + e->lightradius) e->maxs[2] = e->origin[2] + e->lightradius;
+               // clip shadow volumes against eachother to remove unnecessary
+               // polygons (and sections of polygons)
+               {
+                       //vec3_t polymins, polymaxs;
+                       int maxverts = 4;
+                       float *verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                       float f, *v0, *v1, projectdistance;
+
+                       e->shadowvolume = Mod_ShadowMesh_Begin(loadmodel->mempool, 1024);
+#if 0
+                       {
+                       vec3_t outermins, outermaxs, innermins, innermaxs;
+                       innermins[0] = e->mins[0] - 1;
+                       innermins[1] = e->mins[1] - 1;
+                       innermins[2] = e->mins[2] - 1;
+                       innermaxs[0] = e->maxs[0] + 1;
+                       innermaxs[1] = e->maxs[1] + 1;
+                       innermaxs[2] = e->maxs[2] + 1;
+                       outermins[0] = loadmodel->normalmins[0] - 1;
+                       outermins[1] = loadmodel->normalmins[1] - 1;
+                       outermins[2] = loadmodel->normalmins[2] - 1;
+                       outermaxs[0] = loadmodel->normalmaxs[0] + 1;
+                       outermaxs[1] = loadmodel->normalmaxs[1] + 1;
+                       outermaxs[2] = loadmodel->normalmaxs[2] + 1;
+                       // add bounding box around the whole shadow volume set,
+                       // facing inward to limit light area, with an outer bounding box
+                       // facing outward (this is needed by the shadow rendering method)
+                       // X major
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermaxs[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermaxs[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermaxs[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermaxs[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       // X minor
+                       verts[ 0] = innermins[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermins[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       verts[ 0] = outermins[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermins[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       // Y major
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       verts[ 0] = outermins[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermins[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermaxs[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermaxs[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       // Y minor
+                       verts[ 0] = innermins[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermins[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermaxs[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermaxs[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       // Z major
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermaxs[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermaxs[2];
+                       verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermaxs[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermaxs[2];
+                       verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       // Z minor
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermins[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermins[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermins[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermins[2];
+                       Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                       }
+#endif
+                       castshadowcount++;
+                       for (j = 0;j < e->numsurfaces;j++)
+                       {
+                               surf = e->surfaces[j];
+                               if (surf->flags & SURF_SHADOWCAST)
+                                       surf->castshadow = castshadowcount;
+                       }
+                       for (j = 0;j < e->numsurfaces;j++)
+                       {
+                               surf = e->surfaces[j];
+                               if (surf->castshadow != castshadowcount)
+                                       continue;
+                               f = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+                               if (surf->flags & SURF_PLANEBACK)
+                                       f = -f;
+                               projectdistance = e->lightradius;
+                               if (maxverts < surf->poly_numverts)
+                               {
+                                       maxverts = surf->poly_numverts;
+                                       if (verts)
+                                               Mem_Free(verts);
+                                       verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                               }
+                               // copy the original polygon, for the front cap of the volume
+                               for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
+                                       VectorCopy(v0, v1);
+                               Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, surf->poly_numverts, verts);
+                               // project the original polygon, reversed, for the back cap of the volume
+                               for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
+                               {
+                                       VectorSubtract(v0, e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(v0, projectdistance, temp, v1);
+                               }
+                               Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, surf->poly_numverts, verts);
+                               // project the shadow volume sides
+                               for (l = surf->poly_numverts - 1, k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;l = k, k++, v0 = v1, v1 += 3)
+                               {
+                                       if (!surf->neighborsurfaces[l] || surf->neighborsurfaces[l]->castshadow != castshadowcount)
+                                       {
+                                               VectorCopy(v1, &verts[0]);
+                                               VectorCopy(v0, &verts[3]);
+                                               VectorCopy(v0, &verts[6]);
+                                               VectorCopy(v1, &verts[9]);
+                                               VectorSubtract(&verts[6], e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(&verts[6], projectdistance, temp, &verts[6]);
+                                               VectorSubtract(&verts[9], e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(&verts[9], projectdistance, temp, &verts[9]);
+                                               Mod_ShadowMesh_AddPolygon(loadmodel->mempool, e->shadowvolume, 4, verts);
+                                       }
+                               }
+                       }
+                       // build the triangle mesh
+                       e->shadowvolume = Mod_ShadowMesh_Finish(loadmodel->mempool, e->shadowvolume);
+                       {
+                               shadowmesh_t *mesh;
+                               l = 0;
+                               for (mesh = e->shadowvolume;mesh;mesh = mesh->next)
+                                       l += mesh->numtriangles;
+                               Con_Printf("light %i shadow volume built containing %i triangles\n", lnum, l);
+                       }
+               }
+       }
+}
+*/
+
 
 /*
 =================
@@ -518,15 +1012,73 @@ Mod_LoadVisibility
 */
 static void Mod_LoadVisibility (lump_t *l)
 {
+       loadmodel->visdata = NULL;
        if (!l->filelen)
-       {
-               loadmodel->visdata = NULL;
                return;
-       }
-       loadmodel->visdata = Hunk_AllocName ( l->filelen, va("%s visdata", loadname));
+       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)
+{
+       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)
+       {
+               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
+               {
+                       if (loadmodel->ishlbsp)
+                       {
+                               j = 0;
+                               for (i = 0;i < 4096;i++)
+                                       if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
+                                               break;
+                               if (value[i])
+                               {
+                                       for (;i < 4096;i++)
+                                       {
+                                               // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'...
+                                               if (value[i] == '\\' || value[i] == '/' || value[i] == ':')
+                                                       j = i+1;
+                                               else if (value[i] == ';' || value[i] == 0)
+                                               {
+                                                       k = value[i];
+                                                       value[i] = 0;
+                                                       strcpy(wadname, "textures/");
+                                                       strcat(wadname, &value[j]);
+                                                       W_LoadTextureWadFile (wadname, false);
+                                                       j = i+1;
+                                                       if (!k)
+                                                               break;
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+}
+
 /*
 =================
 Mod_LoadEntities
@@ -534,16 +1086,13 @@ Mod_LoadEntities
 */
 static void Mod_LoadEntities (lump_t *l)
 {
+       loadmodel->entities = NULL;
        if (!l->filelen)
-       {
-               loadmodel->entities = NULL;
                return;
-       }
-       loadmodel->entities = Hunk_AllocName ( l->filelen, va("%s entities", loadname));
+       loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen);
        memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
-
-       if (isworldmodel)
-               CL_ParseEntityLump(loadmodel->entities);
+       if (loadmodel->ishlbsp)
+               Mod_ParseWadsFromEntityLump(loadmodel->entities);
 }
 
 
@@ -562,7 +1111,7 @@ static void Mod_LoadVertexes (lump_t *l)
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s vertices", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
        loadmodel->vertexes = out;
        loadmodel->numvertexes = count;
@@ -590,7 +1139,7 @@ static void Mod_LoadSubmodels (lump_t *l)
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s submodels", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
        loadmodel->submodels = out;
        loadmodel->numsubmodels = count;
@@ -627,7 +1176,7 @@ static void Mod_LoadEdges (lump_t *l)
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( (count + 1) * sizeof(*out), va("%s edges", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
        loadmodel->edges = out;
        loadmodel->numedges = count;
@@ -648,101 +1197,403 @@ static void Mod_LoadTexinfo (lump_t *l)
 {
        texinfo_t *in;
        mtexinfo_t *out;
-       int     i, j, k, count;
-       int             miptex;
+       int i, j, k, count, miptex;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s texinfo", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out));
 
        loadmodel->texinfo = out;
        loadmodel->numtexinfo = count;
 
-       for ( i=0 ; i<count ; i++, in++, out++)
+       for (i = 0;i < count;i++, in++, out++)
        {
-               for (k=0 ; k<2 ; k++)
-                       for (j=0 ; j<4 ; j++)
+               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);
 
-               if (!loadmodel->textures)
+               out->texture = NULL;
+               if (loadmodel->textures)
+               {
+                       if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures)
+                               Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
+                       else
+                               out->texture = loadmodel->textures + miptex;
+               }
+               if (out->flags & TEX_SPECIAL)
                {
-                       out->texture = &r_notexture_mip;        // checkerboard texture
-                       out->flags = 0;
+                       // 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);
                }
                else
                {
-                       if (miptex >= loadmodel->numtextures)
-                               Host_Error ("miptex >= loadmodel->numtextures");
-                       out->texture = loadmodel->textures[miptex];
-                       if (!out->texture)
+                       // if texture chosen is NULL, force to notexture
+                       if (out->texture == NULL)
+                               out->texture = loadmodel->textures + (loadmodel->numtextures - 2);
+               }
+       }
+}
+
+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;
+               }
+       }
+}
+
+#if 0
+#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) )
                        {
-                               out->texture = &r_notexture_mip; // checkerboard texture
-                               out->flags = 0;
+                               // clip point
+                               frac = dist[p] / (dist[p] - dist[c]);
+                               front[f][0] = back[b][0] = pv[0] + frac * (cv[0] - pv[0]);
+                               front[f][1] = back[b][1] = pv[1] + frac * (cv[1] - pv[1]);
+                               front[f][2] = back[b][2] = pv[2] + frac * (cv[2] - pv[2]);
+                               f++;
+                               b++;
                        }
                }
+
+               SubdividePolygon (f, front[0]);
+               SubdividePolygon (b, back[0]);
+               return;
+       }
+
+       i1 = subdivpolylookupvert(verts);
+       i2 = subdivpolylookupvert(verts + 3);
+       for (i = 2;i < numverts;i++)
+       {
+               if (subdivpolytriangles >= MAX_SUBDIVPOLYTRIANGLES)
+               {
+                       Con_Printf("SubdividePolygon: ran out of triangles in buffer, please increase your r_subdivide_size\n");
+                       return;
+               }
+
+               i3 = subdivpolylookupvert(verts + i * 3);
+               subdivpolyindex[subdivpolytriangles][0] = i1;
+               subdivpolyindex[subdivpolytriangles][1] = i2;
+               subdivpolyindex[subdivpolytriangles][2] = i3;
+               i2 = i3;
+               subdivpolytriangles++;
        }
 }
 
 /*
 ================
-CalcSurfaceExtents
+Mod_GenerateWarpMesh
 
-Fills in s->texturemins[] and s->extents[]
+Breaks a polygon up along axial 64 unit
+boundaries so that turbulent and sky warps
+can be done reasonably.
 ================
 */
-static void CalcSurfaceExtents (msurface_t *s)
+void Mod_GenerateWarpMesh (msurface_t *surf)
 {
-       float   mins[2], maxs[2], val;
-       int             i,j, e;
-       mvertex_t       *v;
-       mtexinfo_t      *tex;
-       int             bmins[2], bmaxs[2];
+       int i, j;
+       surfvertex_t *v;
+       surfmesh_t *mesh;
+
+       subdivpolytriangles = 0;
+       subdivpolyverts = 0;
+       SubdividePolygon (surf->poly_numverts, surf->poly_verts);
+       if (subdivpolytriangles < 1)
+               Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
+
+       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));
+
+       for (i = 0;i < mesh->numtriangles;i++)
+               for (j = 0;j < 3;j++)
+                       mesh->index[i*3+j] = subdivpolyindex[i][j];
 
-       mins[0] = mins[1] = 999999;
-       maxs[0] = maxs[1] = -99999;
+       for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
+       {
+               VectorCopy(subdivpolyvert[i], v->v);
+               v->st[0] = DotProduct (v->v, surf->texinfo->vecs[0]);
+               v->st[1] = DotProduct (v->v, surf->texinfo->vecs[1]);
+       }
+}
+#endif
 
-       tex = s->texinfo;
+surfmesh_t *Mod_AllocSurfMesh(int numverts, int numtriangles)
+{
+       surfmesh_t *mesh;
+       mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + numtriangles * sizeof(int[6]) + numverts * (4 + 4 + 4 + 4 + 4 + 4 + 4 + 1) * sizeof(float));
+       mesh->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;
 
-       for (i=0 ; i<s->numedges ; i++)
+       smax = surf->extents[0] >> 4;
+       tmax = surf->extents[1] >> 4;
+
+       if (vertexonly)
+       {
+               surf->lightmaptexturestride = 0;
+               surf->lightmaptexture = NULL;
+               uscale = 0;
+               vscale = 0;
+               ubase = 0;
+               vbase = 0;
+       }
+       else
        {
-               e = loadmodel->surfedges[s->firstedge+i];
-               if (e >= 0)
-                       v = &loadmodel->vertexes[loadmodel->edges[e].v[0]];
+               surf->flags |= SURF_LIGHTMAP;
+               if (r_miplightmaps.integer)
+               {
+                       surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
+                       surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
+               }
                else
-                       v = &loadmodel->vertexes[loadmodel->edges[-e].v[1]];
-               
-               for (j=0 ; j<2 ; j++)
                {
-                       val = v->position[0] * tex->vecs[j][0] + 
-                               v->position[1] * tex->vecs[j][1] +
-                               v->position[2] * tex->vecs[j][2] +
-                               tex->vecs[j][3];
-                       if (val < mins[j])
-                               mins[j] = val;
-                       if (val > maxs[j])
-                               maxs[j] = val;
+                       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);
        }
 
-       for (i=0 ; i<2 ; i++)
-       {       
-               bmins[i] = floor(mins[i]/16);
-               bmaxs[i] = ceil(maxs[i]/16);
+       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
 
-               s->texturemins[i] = bmins[i] * 16;
-               s->extents[i] = (bmaxs[i] - bmins[i]) * 16;
-//             if ( !(tex->flags & TEX_SPECIAL) && s->extents[i] > 512)
-               if ((tex->flags & TEX_SPECIAL) == 0 && (s->extents[i]+1) > (256*16))
-                       Host_Error ("Bad surface extents");
+       index = mesh->index;
+       for (i = 0;i < mesh->numtriangles;i++)
+       {
+               *index++ = 0;
+               *index++ = i + 1;
+               *index++ = i + 2;
        }
+       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
+
+       VectorCopy(surf->plane->normal, normal);
+       if (surf->flags & SURF_PLANEBACK)
+               VectorNegate(normal, normal);
+       for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
+       {
+               s = DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
+               t = DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
+               u = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
+               v = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
+               // LordHavoc: calc lightmap data offset for vertex lighting to use
+               iu = (int) u;
+               iv = (int) v;
+               iu = bound(0, iu, smax);
+               iv = bound(0, iv, tmax);
+               u = u * uscale + ubase;
+               v = v * vscale + vbase;
+
+               mesh->verts[i * 4 + 0] = in[0];
+               mesh->verts[i * 4 + 1] = in[1];
+               mesh->verts[i * 4 + 2] = in[2];
+               mesh->str[i * 4 + 0] = s / surf->texinfo->texture->width;
+               mesh->str[i * 4 + 1] = t / surf->texinfo->texture->height;
+               mesh->uvw[i * 4 + 0] = u;
+               mesh->uvw[i * 4 + 1] = v;
+               mesh->abc[i * 4 + 0] = s * (1.0f / 16.0f);
+               mesh->abc[i * 4 + 1] = t * (1.0f / 16.0f);
+               mesh->lightmapoffsets[i] = ((iv * (smax+1) + iu) * 3);
+       }
+       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
 }
 
-void GL_SubdivideSurface (msurface_t *fa);
+void Mod_GenerateVertexMesh (msurface_t *surf)
+{
+       int i, *index;
+       float *in, s, t, normal[3];
+       surfmesh_t *mesh;
+
+       surf->lightmaptexturestride = 0;
+       surf->lightmaptexture = NULL;
+
+       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
+
+       index = mesh->index;
+       for (i = 0;i < mesh->numtriangles;i++)
+       {
+               *index++ = 0;
+               *index++ = i + 1;
+               *index++ = i + 2;
+       }
+       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
+
+       VectorCopy(surf->plane->normal, normal);
+       if (surf->flags & SURF_PLANEBACK)
+               VectorNegate(normal, normal);
+       for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
+       {
+               s = (DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);
+               t = (DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);
+               mesh->verts[i * 4 + 0] = in[0];
+               mesh->verts[i * 4 + 1] = in[1];
+               mesh->verts[i * 4 + 2] = in[2];
+               mesh->str[i * 4 + 0] = s / surf->texinfo->texture->width;
+               mesh->str[i * 4 + 1] = t / surf->texinfo->texture->height;
+               mesh->uvw[i * 4 + 0] = 0;
+               mesh->uvw[i * 4 + 1] = 0;
+               mesh->abc[i * 4 + 0] = s * (1.0f / 16.0f);
+               mesh->abc[i * 4 + 1] = t * (1.0f / 16.0f);
+       }
+       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
+}
+
+void Mod_GenerateSurfacePolygon (msurface_t *surf, int firstedge, int numedges)
+{
+       int i, lindex, j;
+       float *vec, *vert, mins[3], maxs[3], val, *v;
+       mtexinfo_t *tex;
+
+       // convert edges back to a normal polygon
+       surf->poly_numverts = numedges;
+       vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * numedges);
+       for (i = 0;i < numedges;i++)
+       {
+               lindex = loadmodel->surfedges[firstedge + i];
+               if (lindex > 0)
+                       vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position;
+               else
+                       vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
+               VectorCopy (vec, vert);
+               vert += 3;
+       }
+
+       // calculate polygon bounding box and center
+       vert = surf->poly_verts;
+       VectorCopy(vert, mins);
+       VectorCopy(vert, maxs);
+       vert += 3;
+       for (i = 1;i < surf->poly_numverts;i++, vert += 3)
+       {
+               if (mins[0] > vert[0]) mins[0] = vert[0];if (maxs[0] < vert[0]) maxs[0] = vert[0];
+               if (mins[1] > vert[1]) mins[1] = vert[1];if (maxs[1] < vert[1]) maxs[1] = vert[1];
+               if (mins[2] > vert[2]) mins[2] = vert[2];if (maxs[2] < vert[2]) maxs[2] = vert[2];
+       }
+       VectorCopy(mins, surf->poly_mins);
+       VectorCopy(maxs, surf->poly_maxs);
+       surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
+       surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
+       surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
+
+       // generate surface extents information
+       tex = surf->texinfo;
+       mins[0] = maxs[0] = DotProduct(surf->poly_verts, tex->vecs[0]) + tex->vecs[0][3];
+       mins[1] = maxs[1] = DotProduct(surf->poly_verts, tex->vecs[1]) + tex->vecs[1][3];
+       for (i = 1, v = surf->poly_verts + 3;i < surf->poly_numverts;i++, v += 3)
+       {
+               for (j = 0;j < 2;j++)
+               {
+                       val = DotProduct(v, tex->vecs[j]) + tex->vecs[j][3];
+                       if (mins[j] > val)
+                               mins[j] = val;
+                       if (maxs[j] < val)
+                               maxs[j] = val;
+               }
+       }
+       for (i = 0;i < 2;i++)
+       {
+               surf->texturemins[i] = (int) floor(mins[i] / 16) * 16;
+               surf->extents[i] = (int) ceil(maxs[i] / 16) * 16 - surf->texturemins[i];
+       }
+}
 
 /*
 =================
@@ -751,87 +1602,83 @@ Mod_LoadFaces
 */
 static void Mod_LoadFaces (lump_t *l)
 {
-       dface_t         *in;
+       dface_t *in;
        msurface_t      *out;
-       int                     i, count, surfnum;
-       int                     planenum, side;
+       int i, count, surfnum, planenum, ssize, tsize, firstedge, numedges;
 
        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 = Hunk_AllocName ( count*sizeof(*out), va("%s faces", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
        loadmodel->surfaces = out;
        loadmodel->numsurfaces = count;
+       loadmodel->surfacevisframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+       loadmodel->surfacepvsframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+       loadmodel->pvssurflist = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
 
-       for ( surfnum=0 ; surfnum<count ; surfnum++, in++, out++)
+       for (surfnum = 0;surfnum < count;surfnum++, in++, out++)
        {
-               out->firstedge = LittleLong(in->firstedge);
-               out->numedges = LittleShort(in->numedges);
-               out->flags = 0;
+               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);
+
+               i = LittleShort (in->texinfo);
+               if ((unsigned int) i >= (unsigned int) loadmodel->numtexinfo)
+                       Host_Error("Mod_LoadFaces: invalid texinfo index %i (model has %i texinfos)\n", i, loadmodel->numtexinfo);
+               out->texinfo = loadmodel->texinfo + i;
+               out->flags = out->texinfo->texture->flags;
 
                planenum = LittleShort(in->planenum);
-               side = LittleShort(in->side);
-               if (side)
+               if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes)
+                       Host_Error("Mod_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
+
+               if (LittleShort(in->side))
                        out->flags |= SURF_PLANEBACK;
 
                out->plane = loadmodel->planes + planenum;
 
-               out->texinfo = loadmodel->texinfo + LittleShort (in->texinfo);
+               // clear lightmap (filled in later)
+               out->lightmaptexture = NULL;
+
+               // force lightmap upload on first time seeing the surface
+               out->cached_dlight = true;
 
-               CalcSurfaceExtents (out);
+               Mod_GenerateSurfacePolygon(out, firstedge, numedges);
 
-       // lighting info
+               ssize = (out->extents[0] >> 4) + 1;
+               tsize = (out->extents[1] >> 4) + 1;
 
-               for (i=0 ; i<MAXLIGHTMAPS ; i++)
+               // lighting info
+               for (i = 0;i < MAXLIGHTMAPS;i++)
                        out->styles[i] = in->styles[i];
                i = LittleLong(in->lightofs);
                if (i == -1)
                        out->samples = NULL;
-               else if (hlbsp) // LordHavoc: HalfLife map (bsp version 30)
+               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);
 
-       // set the drawing flags flag
-
-//             if (!strncmp(out->texinfo->texture->name,"sky",3))      // sky
-               // LordHavoc: faster check
-               if ((out->texinfo->texture->name[0] == 's' || out->texinfo->texture->name[0] == 'S')
-                && (out->texinfo->texture->name[1] == 'k' || out->texinfo->texture->name[1] == 'K')
-                && (out->texinfo->texture->name[2] == 'y' || out->texinfo->texture->name[2] == 'Y'))
-               {
-                       // LordHavoc: for consistency reasons, mark sky as fullbright and solid as well
-                       out->flags |= (SURF_DRAWSKY | SURF_DRAWTILED | SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID);
-                       GL_SubdivideSurface (out);      // cut up polygon for warps
-                       continue;
-               }
-
-//             if (!strncmp(out->texinfo->texture->name,"*",1))                // turbulent
-               if (out->texinfo->texture->name[0] == '*') // LordHavoc: faster check
+               if (out->texinfo->texture->shader == &Cshader_wall_lightmap)
                {
-                       out->flags |= (SURF_DRAWTURB | SURF_DRAWTILED | SURF_LIGHTBOTHSIDES);
-                       // LordHavoc: some turbulent textures should be fullbright and solid
-                       if (!strncmp(out->texinfo->texture->name,"*lava",5)
-                        || !strncmp(out->texinfo->texture->name,"*teleport",9)
-                        || !strncmp(out->texinfo->texture->name,"*rift",5)) // Scourge of Armagon texture
-                               out->flags |= (SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID);
-                       for (i=0 ; i<2 ; i++)
-                       {
-                               out->extents[i] = 16384;
-                               out->texturemins[i] = -8192;
-                       }
-                       GL_SubdivideSurface (out);      // cut up polygon for warps
-                       continue;
+                       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);
                }
-
-               if (!out->texinfo->texture->transparent)
-                       out->flags |= SURF_CLIPSOLID;
+               else
+                       Mod_GenerateVertexMesh (out);
        }
 }
 
-
 /*
 =================
 Mod_SetParent
@@ -861,7 +1708,7 @@ static void Mod_LoadNodes (lump_t *l)
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s nodes", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
        loadmodel->nodes = out;
        loadmodel->numnodes = count;
@@ -873,13 +1720,13 @@ static void Mod_LoadNodes (lump_t *l)
                        out->mins[j] = LittleShort (in->mins[j]);
                        out->maxs[j] = LittleShort (in->maxs[j]);
                }
-       
+
                p = LittleLong(in->planenum);
                out->plane = loadmodel->planes + p;
 
                out->firstsurface = LittleShort (in->firstface);
                out->numsurfaces = LittleShort (in->numfaces);
-               
+
                for (j=0 ; j<2 ; j++)
                {
                        p = LittleShort (in->children[j]);
@@ -889,7 +1736,7 @@ static void Mod_LoadNodes (lump_t *l)
                                out->children[j] = (mnode_t *)(loadmodel->leafs + (-1 - p));
                }
        }
-       
+
        Mod_SetParent (loadmodel->nodes, NULL); // sets nodes and leafs
 }
 
@@ -908,7 +1755,7 @@ static void Mod_LoadLeafs (lump_t *l)
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s leafs", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
        loadmodel->leafs = out;
        loadmodel->numleafs = count;
@@ -933,20 +1780,12 @@ static void Mod_LoadLeafs (lump_t *l)
                        out->compressed_vis = NULL;
                else
                        out->compressed_vis = loadmodel->visdata + p;
-               
+
                for (j=0 ; j<4 ; j++)
                        out->ambient_sound_level[j] = in->ambient_level[j];
 
-               // gl underwater warp
-               // LordHavoc: disabled underwater warping
-               /*
-               if (out->contents != CONTENTS_EMPTY)
-               {
-                       for (j=0 ; j<out->nummarksurfaces ; j++)
-                               out->firstmarksurface[j]->flags |= SURF_UNDERWATER;
-               }
-               */
-       }       
+               // FIXME: Insert caustics here
+       }
 }
 
 /*
@@ -964,12 +1803,12 @@ static void Mod_LoadClipnodes (lump_t *l)
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s clipnodes", loadname));
+       out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out));
 
        loadmodel->clipnodes = out;
        loadmodel->numclipnodes = count;
 
-       if (hlbsp)
+       if (loadmodel->ishlbsp)
        {
                hull = &loadmodel->hulls[1];
                hull->clipnodes = out;
@@ -982,6 +1821,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 16;
                hull->clip_maxs[1] = 16;
                hull->clip_maxs[2] = 36;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 
                hull = &loadmodel->hulls[2];
                hull->clipnodes = out;
@@ -994,6 +1834,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 32;
                hull->clip_maxs[1] = 32;
                hull->clip_maxs[2] = 32;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 
                hull = &loadmodel->hulls[3];
                hull->clipnodes = out;
@@ -1006,6 +1847,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 16;
                hull->clip_maxs[1] = 16;
                hull->clip_maxs[2] = 18;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
        }
        else
        {
@@ -1020,6 +1862,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 16;
                hull->clip_maxs[1] = 16;
                hull->clip_maxs[2] = 32;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 
                hull = &loadmodel->hulls[2];
                hull->clipnodes = out;
@@ -1032,6 +1875,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 32;
                hull->clip_maxs[1] = 32;
                hull->clip_maxs[2] = 64;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
        }
 
        for (i=0 ; i<count ; i++, out++, in++)
@@ -1055,21 +1899,20 @@ static void Mod_MakeHull0 (void)
 {
        mnode_t         *in;
        dclipnode_t *out;
-       int                     i, count;
+       int                     i;
        hull_t          *hull;
-       
-       hull = &loadmodel->hulls[0];    
+
+       hull = &loadmodel->hulls[0];
 
        in = loadmodel->nodes;
-       count = loadmodel->numnodes;
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s hull0", loadname));
+       out = Mem_Alloc(loadmodel->mempool, loadmodel->numnodes * sizeof(dclipnode_t));
 
        hull->clipnodes = out;
        hull->firstclipnode = 0;
-       hull->lastclipnode = count - 1;
+       hull->lastclipnode = loadmodel->numnodes - 1;
        hull->planes = loadmodel->planes;
 
-       for (i = 0;i < count;i++, out++, in++)
+       for (i = 0;i < loadmodel->numnodes;i++, out++, in++)
        {
                out->planenum = in->plane - loadmodel->planes;
                out->children[0] = in->children[0]->contents < 0 ? in->children[0]->contents : in->children[0] - loadmodel->nodes;
@@ -1084,25 +1927,21 @@ Mod_LoadMarksurfaces
 */
 static void Mod_LoadMarksurfaces (lump_t *l)
 {
-       int             i, j, count;
-       short           *in;
-       msurface_t **out;
+       int i, j;
+       short *in;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s marksurfaces", loadname));
+       loadmodel->nummarksurfaces = l->filelen / sizeof(*in);
+       loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(int));
 
-       loadmodel->marksurfaces = out;
-       loadmodel->nummarksurfaces = count;
-
-       for ( i=0 ; i<count ; i++)
+       for (i = 0;i < loadmodel->nummarksurfaces;i++)
        {
-               j = LittleShort(in[i]);
+               j = (unsigned) LittleShort(in[i]);
                if (j >= loadmodel->numsurfaces)
                        Host_Error ("Mod_ParseMarksurfaces: bad surface number");
-               out[i] = loadmodel->surfaces + j;
+               loadmodel->marksurfaces[i] = j;
        }
 }
 
@@ -1113,20 +1952,17 @@ Mod_LoadSurfedges
 */
 static void Mod_LoadSurfedges (lump_t *l)
 {
-       int             i, count;
-       int             *in, *out;
-       
+       int             i;
+       int             *in;
+
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-       count = l->filelen / sizeof(*in);
-       out = Hunk_AllocName ( count*sizeof(*out), va("%s surfedges", loadname));
-
-       loadmodel->surfedges = out;
-       loadmodel->numsurfedges = count;
+       loadmodel->numsurfedges = l->filelen / sizeof(*in);
+       loadmodel->surfedges = Mem_Alloc(loadmodel->mempool, loadmodel->numsurfedges * sizeof(int));
 
-       for ( i=0 ; i<count ; i++)
-               out[i] = LittleLong (in[i]);
+       for (i = 0;i < loadmodel->numsurfedges;i++)
+               loadmodel->surfedges[i] = LittleLong (in[i]);
 }
 
 
@@ -1137,28 +1973,24 @@ Mod_LoadPlanes
 */
 static void Mod_LoadPlanes (lump_t *l)
 {
-       int                     i, j;
+       int                     i;
        mplane_t        *out;
        dplane_t        *in;
-       int                     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 = Hunk_AllocName ( count*2*sizeof(*out), va("%s planes", loadname));
+               Host_Error ("MOD_LoadBmodel: funny lump size in %s", loadmodel->name);
 
-       loadmodel->planes = out;
-       loadmodel->numplanes = count;
+       loadmodel->numplanes = l->filelen / sizeof(*in);
+       loadmodel->planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->numplanes * sizeof(*out));
 
-       for ( i=0 ; i<count ; i++, in++, out++)
+       for (i = 0;i < loadmodel->numplanes;i++, in++, out++)
        {
-               for (j=0 ; j<3 ; j++)
-                       out->normal[j] = LittleFloat (in->normal[j]);
-
+               out->normal[0] = LittleFloat (in->normal[0]);
+               out->normal[1] = LittleFloat (in->normal[1]);
+               out->normal[2] = LittleFloat (in->normal[2]);
                out->dist = LittleFloat (in->dist);
-               // LordHavoc: recalculated by PlaneClassify, FIXME: validate type and report error if type does not match normal?
-//             out->type = LittleLong (in->type);
+
                PlaneClassify(out);
        }
 }
@@ -1168,7 +2000,8 @@ static void Mod_LoadPlanes (lump_t *l)
 typedef struct
 {
        int numpoints;
-       vec3_t points[8]; // variable sized
+       int padding;
+       double points[8][3]; // variable sized
 }
 winding_t;
 
@@ -1183,10 +2016,10 @@ static winding_t *NewWinding (int points)
        int size;
 
        if (points > MAX_POINTS_ON_WINDING)
-               Host_Error("NewWinding: too many points\n");
+               Sys_Error("NewWinding: too many points\n");
 
-       size = (int)((winding_t *)0)->points[points];
-       w = qmalloc (size);
+       size = sizeof(winding_t) + sizeof(double[3]) * (points - 8);
+       w = Mem_Alloc(loadmodel->mempool, size);
        memset (w, 0, size);
 
        return w;
@@ -1194,7 +2027,7 @@ static winding_t *NewWinding (int points)
 
 static void FreeWinding (winding_t *w)
 {
-       qfree (w);
+       Mem_Free(w);
 }
 
 /*
@@ -1204,13 +2037,14 @@ BaseWindingForPlane
 */
 static winding_t *BaseWindingForPlane (mplane_t *p)
 {
-       vec3_t  org, vright, vup;
-       winding_t       *w;
+       double org[3], vright[3], vup[3], normal[3];
+       winding_t *w;
 
-       VectorVectors(p->normal, vright, vup);
+       VectorCopy(p->normal, normal);
+       VectorVectorsDouble(normal, vright, vup);
 
-       VectorScale (vup, 65536, vup);
-       VectorScale (vright, 65536, vright);
+       VectorScale (vup, 1024.0*1024.0*1024.0, vup);
+       VectorScale (vright, 1024.0*1024.0*1024.0, vright);
 
        // project a really big axis aligned box onto the plane
        w = NewWinding (4);
@@ -1231,7 +2065,7 @@ static winding_t *BaseWindingForPlane (mplane_t *p)
 
        w->numpoints = 4;
 
-       return w;       
+       return w;
 }
 
 /*
@@ -1246,13 +2080,13 @@ it will be clipped away.
 */
 static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
 {
-       vec_t   dists[MAX_POINTS_ON_WINDING + 1];
+       double  dists[MAX_POINTS_ON_WINDING + 1];
        int             sides[MAX_POINTS_ON_WINDING + 1];
        int             counts[3];
-       vec_t   dot;
+       double  dot;
        int             i, j;
-       vec_t   *p1, *p2;
-       vec3_t  mid;
+       double  *p1, *p2;
+       double  mid[3];
        winding_t       *neww;
        int             maxpts;
 
@@ -1285,10 +2119,16 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
                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);
 
        for (i = 0;i < in->numpoints;i++)
        {
+               if (neww->numpoints >= maxpts)
+                       Sys_Error ("ClipWinding: points exceeded estimate");
+
                p1 = in->points[i];
 
                if (sides[i] == SIDE_ON)
@@ -1325,9 +2165,6 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
                neww->numpoints++;
        }
 
-       if (neww->numpoints > maxpts)
-               Host_Error ("ClipWinding: points exceeded estimate");
-
        // free the original winding
        FreeWinding (in);
 
@@ -1347,13 +2184,13 @@ new windings will be created.
 */
 static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t **back)
 {
-       vec_t   dists[MAX_POINTS_ON_WINDING + 1];
+       double  dists[MAX_POINTS_ON_WINDING + 1];
        int             sides[MAX_POINTS_ON_WINDING + 1];
        int             counts[3];
-       vec_t   dot;
+       double  dot;
        int             i, j;
-       vec_t   *p1, *p2;
-       vec3_t  mid;
+       double  *p1, *p2;
+       double  mid[3];
        winding_t       *f, *b;
        int             maxpts;
 
@@ -1388,11 +2225,17 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
 
        maxpts = in->numpoints+4;       // can't use counts[0]+2 because of fp grouping errors
 
+       if (maxpts > MAX_POINTS_ON_WINDING)
+               Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING");
+
        *front = f = NewWinding (maxpts);
        *back = b = NewWinding (maxpts);
 
        for (i = 0;i < in->numpoints;i++)
        {
+               if (f->numpoints >= maxpts || b->numpoints >= maxpts)
+                       Sys_Error ("DivideWinding: points exceeded estimate");
+
                p1 = in->points[i];
 
                if (sides[i] == SIDE_ON)
@@ -1437,16 +2280,13 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
                VectorCopy (mid, b->points[b->numpoints]);
                b->numpoints++;
        }
-
-       if (f->numpoints > maxpts || b->numpoints > maxpts)
-               Host_Error ("DivideWinding: points exceeded estimate");
 }
 
 typedef struct portal_s
 {
        mplane_t plane;
        mnode_t *nodes[2];              // [0] = front side of plane
-       struct portal_s *next[2];       
+       struct portal_s *next[2];
        winding_t *winding;
        struct portal_s *chain; // all portals are linked into a list
 }
@@ -1462,13 +2302,17 @@ AllocPortal
 static portal_t *AllocPortal (void)
 {
        portal_t *p;
-       p = qmalloc(sizeof(portal_t));
-       memset(p, 0, sizeof(portal_t));
+       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
@@ -1500,8 +2344,8 @@ static void Mod_FinalizePortals(void)
        endleaf = leaf + loadmodel->numleafs;
        for (;leaf < endleaf;leaf++)
        {
-               VectorSet( 2000000000,  2000000000,  2000000000, leaf->mins);
-               VectorSet(-2000000000, -2000000000, -2000000000, leaf->maxs);
+               VectorSet(leaf->mins,  2000000000,  2000000000,  2000000000);
+               VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000);
        }
        p = portalchain;
        while(p)
@@ -1526,19 +2370,15 @@ static void Mod_FinalizePortals(void)
                p = p->chain;
        }
 
-//     Hunk_Check();
-
        Mod_RecursiveRecalcNodeBBox(loadmodel->nodes);
 
-//     Hunk_Check();
-
        // 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 the hunk
+               // 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
@@ -1549,9 +2389,9 @@ static void Mod_FinalizePortals(void)
                }
                p = p->chain;
        }
-       loadmodel->portals = Hunk_AllocName(numportals * sizeof(mportal_t), va("%s portals", loadmodel->name));
+       loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
        loadmodel->numportals = numportals;
-       loadmodel->portalpoints = Hunk_AllocName(numpoints * sizeof(mvertex_t), va("%s portals", loadmodel->name));
+       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++)
@@ -1567,7 +2407,7 @@ static void Mod_FinalizePortals(void)
 
                if (p->winding)
                {
-                       // note: this check must match the one below or it will usually corrupt the hunk
+                       // 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
@@ -1619,7 +2459,7 @@ static void Mod_FinalizePortals(void)
                        }
                        FreeWinding(p->winding);
                }
-               qfree(p);
+               FreePortal(p);
                p = pnext;
        }
 }
@@ -1705,8 +2545,6 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
        portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
        winding_t *nodeportalwinding, *frontwinding, *backwinding;
 
-       //      CheckLeafPortalConsistancy (node);
-
        // if a leaf, we're done
        if (node->contents)
                return;
@@ -1725,7 +2563,7 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
 
        nodeportalwinding = BaseWindingForPlane (node->plane);
        side = 0;       // shut up compiler warning
-       for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])     
+       for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
        {
                clipplane = portal->plane;
                if (portal->nodes[0] == portal->nodes[1])
@@ -1818,54 +2656,147 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
        Mod_RecursiveNodePortals(back);
 }
 
-/*
-void Mod_MakeOutsidePortals(mnode_t *node)
-{
-       int                     i, j;
-       portal_t        *p, *portals[6];
-       mnode_t         *outside_node;
 
-       outside_node = Hunk_AllocName(sizeof(mnode_t), loadmodel->name);
-       outside_node->contents = CONTENTS_SOLID;
-       outside_node->portals = NULL;
+static void Mod_MakePortals(void)
+{
+       portalchain = NULL;
+       Mod_RecursiveNodePortals (loadmodel->nodes);
+       Mod_FinalizePortals();
+}
 
-       for (i = 0;i < 3;i++)
+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++)
        {
-               for (j = 0;j < 2;j++)
+               for (vertnum = surf->poly_numverts - 1, vertnum2 = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;vertnum2 < surf->poly_numverts;vertnum = vertnum2, vertnum2++, v0 = v1, v1 += 3)
                {
-                       portals[j*3 + i] = p = AllocPortal ();
-                       memset (&p->plane, 0, sizeof(mplane_t));
-                       p->plane.normal[i] = j ? -1 : 1;
-                       p->plane.dist = -65536;
-                       p->winding = BaseWindingForPlane (&p->plane);
-                       if (j)
-                               AddPortalToNodes (p, outside_node, node);
-                       else
-                               AddPortalToNodes (p, node, outside_node);
+                       if (surf->neighborsurfaces[vertnum])
+                               continue;
+                       surf->neighborsurfaces[vertnum] = NULL;
+                       for (s = surfaces, snum = 0;snum < numsurfaces;s++, snum++)
+                       {
+                               if (s->poly_mins[0] > (surf->poly_maxs[0] + 1) || s->poly_maxs[0] < (surf->poly_mins[0] - 1)
+                                || s->poly_mins[1] > (surf->poly_maxs[1] + 1) || s->poly_maxs[1] < (surf->poly_mins[1] - 1)
+                                || s->poly_mins[2] > (surf->poly_maxs[2] + 1) || s->poly_maxs[2] < (surf->poly_mins[2] - 1)
+                                || s == surf)
+                                       continue;
+                               for (vnum = 0;vnum < s->poly_numverts;vnum++)
+                                       if (s->neighborsurfaces[vnum] == surf)
+                                               break;
+                               if (vnum < s->poly_numverts)
+                                       continue;
+                               for (vnum = s->poly_numverts - 1, vnum2 = 0, v2 = s->poly_verts + (s->poly_numverts - 1) * 3, v3 = s->poly_verts;vnum2 < s->poly_numverts;vnum = vnum2, vnum2++, v2 = v3, v3 += 3)
+                               {
+                                       if (s->neighborsurfaces[vnum] == NULL
+                                        && ((v0[0] == v2[0] && v0[1] == v2[1] && v0[2] == v2[2] && v1[0] == v3[0] && v1[1] == v3[1] && v1[2] == v3[2])
+                                         || (v1[0] == v2[0] && v1[1] == v2[1] && v1[2] == v2[2] && v0[0] == v3[0] && v0[1] == v3[1] && v0[2] == v3[2])))
+                                       {
+                                               surf->neighborsurfaces[vertnum] = s;
+                                               s->neighborsurfaces[vnum] = surf;
+                                               break;
+                                       }
+                               }
+                               if (vnum < s->poly_numverts)
+                                       break;
+                       }
                }
        }
+#endif
+}
 
-       // clip the basewindings by all the other planes
-       for (i = 0;i < 6;i++)
+void Mod_BuildLightmapUpdateChains(mempool_t *mempool, model_t *model)
+{
+       int i, j, stylecounts[256], totalcount, remapstyles[256];
+       msurface_t *surf;
+       memset(stylecounts, 0, sizeof(stylecounts));
+       for (i = 0;i < model->nummodelsurfaces;i++)
+       {
+               surf = model->surfaces + model->firstmodelsurface + i;
+               for (j = 0;j < MAXLIGHTMAPS;j++)
+                       stylecounts[surf->styles[j]]++;
+       }
+       totalcount = 0;
+       model->light_styles = 0;
+       for (i = 0;i < 255;i++)
        {
-               for (j = 0;j < 6;j++)
+               if (stylecounts[i])
                {
-                       if (j == i)
-                               continue;
-                       portals[i]->winding = ClipWinding (portals[i]->winding, &portals[j]->plane, true);
+                       remapstyles[i] = model->light_styles++;
+                       totalcount += stylecounts[i] + 1;
                }
        }
+       if (!totalcount)
+               return;
+       model->light_style = Mem_Alloc(mempool, model->light_styles * sizeof(qbyte));
+       model->light_stylevalue = Mem_Alloc(mempool, model->light_styles * sizeof(int));
+       model->light_styleupdatechains = Mem_Alloc(mempool, model->light_styles * sizeof(msurface_t **));
+       model->light_styleupdatechainsbuffer = Mem_Alloc(mempool, totalcount * sizeof(msurface_t *));
+       model->light_styles = 0;
+       for (i = 0;i < 255;i++)
+               if (stylecounts[i])
+                       model->light_style[model->light_styles++] = i;
+       j = 0;
+       for (i = 0;i < model->light_styles;i++)
+       {
+               model->light_styleupdatechains[i] = model->light_styleupdatechainsbuffer + j;
+               j += stylecounts[model->light_style[i]] + 1;
+       }
+       for (i = 0;i < model->nummodelsurfaces;i++)
+       {
+               surf = model->surfaces + model->firstmodelsurface + i;
+               for (j = 0;j < MAXLIGHTMAPS;j++)
+                       if (surf->styles[j] != 255)
+                               *model->light_styleupdatechains[remapstyles[surf->styles[j]]]++ = surf;
+       }
+       j = 0;
+       for (i = 0;i < model->light_styles;i++)
+       {
+               *model->light_styleupdatechains[i] = NULL;
+               model->light_styleupdatechains[i] = model->light_styleupdatechainsbuffer + j;
+               j += stylecounts[model->light_style[i]] + 1;
+       }
 }
-*/
 
-static void Mod_MakePortals(void)
+void Mod_BuildPVSTextureChains(model_t *model)
 {
-//     Con_Printf("building portals for %s\n", loadmodel->name);
-
-       portalchain = NULL;
-//     Mod_MakeOutsidePortals (loadmodel->nodes);
-       Mod_RecursiveNodePortals (loadmodel->nodes);
-       Mod_FinalizePortals();
+       int i, j;
+       for (i = 0;i < model->numtextures;i++)
+               model->pvstexturechainslength[i] = 0;
+       for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
+       {
+               if (model->surfacepvsframes[j] == model->pvsframecount)
+               {
+                       model->pvssurflist[model->pvssurflistlength++] = j;
+                       model->pvstexturechainslength[model->surfaces[j].texinfo->texture->number]++;
+               }
+       }
+       for (i = 0, j = 0;i < model->numtextures;i++)
+       {
+               if (model->pvstexturechainslength[i])
+               {
+                       model->pvstexturechains[i] = model->pvstexturechainsbuffer + j;
+                       j += model->pvstexturechainslength[i] + 1;
+               }
+               else
+                       model->pvstexturechains[i] = NULL;
+       }
+       for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
+               if (model->surfacepvsframes[j] == model->pvsframecount)
+                       *model->pvstexturechains[model->surfaces[j].texinfo->texture->number]++ = model->surfaces + j;
+       for (i = 0;i < model->numtextures;i++)
+       {
+               if (model->pvstexturechainslength[i])
+               {
+                       *model->pvstexturechains[i] = NULL;
+                       model->pvstexturechains[i] -= model->pvstexturechainslength[i];
+               }
+       }
 }
 
 /*
@@ -1873,33 +2804,49 @@ static void Mod_MakePortals(void)
 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)
 {
-       int                     i, j;
-       dheader_t       *header;
-       dmodel_t        *bm;
-
-       loadmodel->type = mod_brush;
+       int i, j, k;
+       dheader_t *header;
+       dmodel_t *bm;
+       mempool_t *mainmempool;
+       char *loadname;
+       model_t *originalloadmodel;
+       float dist, modelyawradius, modelradius, *vec;
+       msurface_t *surf;
+       surfmesh_t *mesh;
+
+       mod->type = mod_brush;
 
        header = (dheader_t *)buffer;
 
        i = LittleLong (header->version);
        if (i != BSPVERSION && i != 30)
-               Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i or 30 (HalfLife))", mod->name, i, BSPVERSION);
-       hlbsp = i == 30;
-       halflifebsp.value = hlbsp;
+               Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i (Quake) or 30 (HalfLife))", mod->name, i, BSPVERSION);
+       mod->ishlbsp = i == 30;
+       if (loadmodel->isworldmodel)
+       {
+               Cvar_SetValue("halflifebsp", mod->ishlbsp);
+               // until we get a texture for it...
+               R_ResetQuakeSky();
+       }
 
 // swap all the lumps
-       mod_base = (byte *)header;
+       mod_base = (qbyte *)header;
 
-       for (i=0 ; i<sizeof(dheader_t)/4 ; i++)
+       for (i = 0;i < (int) sizeof(dheader_t) / 4;i++)
                ((int *)header)[i] = LittleLong ( ((int *)header)[i]);
 
 // load into heap
 
-       // LordHavoc: had to move entity loading above everything to allow parsing various settings from worldspawn
-       Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
+       // 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]);
@@ -1913,29 +2860,24 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
        Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
        Mod_LoadNodes (&header->lumps[LUMP_NODES]);
        Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-//     Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
        Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
 
        Mod_MakeHull0 ();
-
        Mod_MakePortals();
 
        mod->numframes = 2;             // regular and alternate animation
 
+       mainmempool = mod->mempool;
+       loadname = mod->name;
+
+       Mod_LoadLightList ();
+       originalloadmodel = loadmodel;
+
 //
 // set up the submodels (FIXME: this is confusing)
 //
        for (i = 0;i < mod->numsubmodels;i++)
        {
-               int k, l;
-               float dist, modelyawradius, modelradius, *vec;
-               msurface_t *surf;
-
-               mod->normalmins[0] = mod->normalmins[1] = mod->normalmins[2] = 1000000000.0f;
-               mod->normalmaxs[0] = mod->normalmaxs[1] = mod->normalmaxs[2] = -1000000000.0f;
-               modelyawradius = 0;
-               modelradius = 0;
-
                bm = &mod->submodels[i];
 
                mod->hulls[0].firstclipnode = bm->headnode[0];
@@ -1948,60 +2890,86 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                mod->firstmodelsurface = bm->firstface;
                mod->nummodelsurfaces = bm->numfaces;
 
-               // LordHavoc: calculate bmodel bounding box rather than trusting what it says
-               for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
+               // 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)
                {
-                       for (k = 0;k < surf->numedges;k++)
+                       // LordHavoc: calculate bmodel bounding box rather than trusting what it says
+                       mod->normalmins[0] = mod->normalmins[1] = mod->normalmins[2] = 1000000000.0f;
+                       mod->normalmaxs[0] = mod->normalmaxs[1] = mod->normalmaxs[2] = -1000000000.0f;
+                       modelyawradius = 0;
+                       modelradius = 0;
+                       for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
                        {
-                               l = mod->surfedges[k + surf->firstedge];
-                               if (l > 0)
-                                       vec = mod->vertexes[mod->edges[l].v[0]].position;
-                               else
-                                       vec = mod->vertexes[mod->edges[-l].v[1]].position;
-                               if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0];
-                               if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1];
-                               if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2];
-                               if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0];
-                               if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1];
-                               if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2];
-                               dist = vec[0]*vec[0]+vec[1]*vec[1];
-                               if (modelyawradius < dist)
-                                       modelyawradius = dist;
-                               dist += vec[2]*vec[2];
-                               if (modelradius < dist)
-                                       modelradius = dist;
+                               // we only need to have a drawsky function if it is used (usually only on world model)
+                               if (surf->texinfo->texture->shader == &Cshader_sky)
+                                       mod->DrawSky = R_Model_Brush_DrawSky;
+                               // 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;
                }
-               modelyawradius = sqrt(modelyawradius);
-               modelradius = sqrt(modelradius);
-               mod->yawmins[0] = mod->yawmins[1] = -(mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius);
-               mod->yawmins[2] = mod->normalmins[2];
-               mod->yawmaxs[2] = mod->normalmaxs[2];
-               mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
-               mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
-//             mod->modelradius = modelradius;
-
-//             VectorCopy (bm->maxs, mod->maxs);
-//             VectorCopy (bm->mins, mod->mins);
-
-//             mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
+               else
+               {
+                       // LordHavoc: empty submodel (lacrima.bsp has such a glitch)
+                       Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname);
+               }
+               Mod_BuildSurfaceNeighbors(mod->surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, originalloadmodel->mempool);
 
                mod->numleafs = bm->visleafs;
 
-               mod->SERAddEntity = Mod_Brush_SERAddEntity;
-               mod->DrawEarly = R_DrawBrushModel;
-               mod->DrawLate = NULL;
-               mod->DrawShadow = NULL;
-
-               if (isworldmodel && i < (mod->numsubmodels - 1)) // LordHavoc: only register submodels if it is the world (prevents bsp models from replacing world submodels)
-               {       // duplicate the basic information
+               // 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;
                }
        }
+
+       loadmodel = originalloadmodel;
+       //Mod_ProcessLightList ();
 }
+