]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
merged matrix4x4 and matrix3x4 into matrixlib, updated makefiles and dsp, some cleanu...
[xonotic/darkplaces.git] / gl_rsurf.c
index 76493932b656bf953d40cfe6506e8ab999452144..e3429922df8fb731dd812cb674838c570c620009 100644 (file)
@@ -88,26 +88,28 @@ static int R_AddDynamicLights (msurface_t *surf)
                        continue;                                       // not lit by this light
 
                softwareuntransform(r_dlight[lnum].origin, local);
-//             VectorSubtract (r_dlight[lnum].origin, currentrenderentity->origin, local);
                dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 
                // for comparisons to minimum acceptable light
                // compensate for LIGHTOFFSET
                maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET;
 
-               // already clamped, skip this
-               // clamp radius to avoid exceeding 32768 entry division table
-               //if (maxdist > 4194304)
-               //      maxdist = 4194304;
-
                dist2 = dist * dist;
                dist2 += LIGHTOFFSET;
                if (dist2 >= maxdist)
                        continue;
 
-               impact[0] = local[0] - surf->plane->normal[0] * dist;
-               impact[1] = local[1] - surf->plane->normal[1] * dist;
-               impact[2] = local[2] - surf->plane->normal[2] * dist;
+               if (surf->plane->type < 3)
+               {
+                       VectorCopy(local, impact);
+                       impact[surf->plane->type] -= dist;
+               }
+               else
+               {
+                       impact[0] = local[0] - surf->plane->normal[0] * dist;
+                       impact[1] = local[1] - surf->plane->normal[1] * dist;
+                       impact[2] = local[2] - surf->plane->normal[2] * dist;
+               }
 
                impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
                impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
@@ -209,9 +211,17 @@ loc0:
        {
                maxdist3 = maxdist - dist2;
 
-               impact[0] = origin[0] - node->plane->normal[0] * ndist;
-               impact[1] = origin[1] - node->plane->normal[1] * ndist;
-               impact[2] = origin[2] - node->plane->normal[2] * ndist;
+               if (node->plane->type < 3)
+               {
+                       VectorCopy(origin, impact);
+                       impact[node->plane->type] -= ndist;
+               }
+               else
+               {
+                       impact[0] = origin[0] - node->plane->normal[0] * ndist;
+                       impact[1] = origin[1] - node->plane->normal[1] * ndist;
+                       impact[2] = origin[2] - node->plane->normal[2] * ndist;
+               }
 
                for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
                {
@@ -371,12 +381,8 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
        if ((currentrenderentity->effects & EF_FULLBRIGHT) || !cl.worldmodel->lightdata)
        {
                bl = blocklights;
-               for (i = 0;i < size;i++)
-               {
-                       *bl++ = 255*256;
-                       *bl++ = 255*256;
-                       *bl++ = 255*256;
-               }
+               for (i = 0;i < size3;i++)
+                       bl[i] = 255*256;
        }
        else
        {
@@ -402,21 +408,19 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
 
 // add all the lightmaps
                if (lightmap)
-                       for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++)
-                               for (scale = d_lightstylevalue[surf->styles[maps]], bl = blocklights, i = 0;i < size3;i++)
-                                       *bl++ += *lightmap++ * scale;
+               {
+                       bl = blocklights;
+                       for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
+                               for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
+                                       bl[i] += lightmap[i] * scale;
+               }
        }
 
        stain = surf->stainsamples;
-       if (stain)
-               for (bl = blocklights, i = 0;i < size3;i++)
-                       if (stain[i] < 255)
-                               bl[i] = (bl[i] * stain[i]) >> 8;
-
        bl = blocklights;
        out = templight;
        // deal with lightmap brightness scale
-       shift = 7 + lightscalebit;
+       shift = 15 + lightscalebit;
        if (currentrenderentity->model->lightmaprgba)
        {
                stride = (surf->lightmaptexturestride - smax) * 4;
@@ -424,9 +428,9 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
                {
                        for (j = 0;j < smax;j++)
                        {
-                               l = *bl++ >> shift;*out++ = min(l, 255);
-                               l = *bl++ >> shift;*out++ = min(l, 255);
-                               l = *bl++ >> shift;*out++ = min(l, 255);
+                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
                                *out++ = 255;
                        }
                }
@@ -438,9 +442,9 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
                {
                        for (j = 0;j < smax;j++)
                        {
-                               l = *bl++ >> shift;*out++ = min(l, 255);
-                               l = *bl++ >> shift;*out++ = min(l, 255);
-                               l = *bl++ >> shift;*out++ = min(l, 255);
+                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                               l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
                        }
                }
        }
@@ -448,27 +452,6 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
        R_UpdateTexture(surf->lightmaptexture, templight);
 }
 
-/*
-===============
-R_TextureAnimation
-
-Returns the proper texture for a given time and base texture
-===============
-*/
-/*
-// note: this was manually inlined in R_PrepareSurfaces
-static texture_t *R_TextureAnimation (texture_t *base)
-{
-       if (currentrenderentity->frame && base->alternate_anims != NULL)
-               base = base->alternate_anims;
-
-       if (base->anim_total < 2)
-               return base;
-
-       return base->anim_frames[(int)(cl.time * 5.0f) % base->anim_total];
-}
-*/
-
 
 /*
 =============================================================
@@ -485,7 +468,8 @@ static float turbsin[256] =
 };
 #define TURBSCALE (256.0 / (2 * M_PI))
 
-#define MAX_SURFVERTS 1024
+// only need to hold as many verts as the mesh splitter will allow in model_brush.c
+#define MAX_SURFVERTS 3072
 typedef struct
 {
        float v[4];
@@ -503,6 +487,7 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
        float number, length, dir[3], speedscale;
        surfvertex_t *v;
        surfvert_t *sv;
+       surfmesh_t *mesh;
        rmeshinfo_t m;
 
        // LordHavoc: HalfLife maps have freaky skypolys...
@@ -524,26 +509,25 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
                        m.blendfunc1 = GL_ZERO;
                        m.blendfunc2 = GL_ONE;
                        m.depthwrite = true;
-                       m.numtriangles = surf->mesh.numtriangles;
-                       m.numverts = surf->mesh.numverts;
-                       m.index = surf->mesh.index;
-                       //m.cr = 0;
-                       //m.cg = 0;
-                       //m.cb = 0;
-                       //m.ca = 0;
-                       if (softwaretransform_complexity)
-                       {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                                       softwaretransform(v->v, sv->v);
-                       }
-                       else
+                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                        {
-                               m.vertex = &surf->mesh.vertex[0].v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
+                               m.numtriangles = mesh->numtriangles;
+                               m.numverts = mesh->numverts;
+                               m.index = mesh->index;
+                               if (softwaretransform_complexity)
+                               {
+                                       m.vertex = &svert[0].v[0];
+                                       m.vertexstep = sizeof(surfvert_t);
+                                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                                               softwaretransform(v->v, sv->v);
+                               }
+                               else
+                               {
+                                       m.vertex = &mesh->vertex[0].v[0];
+                                       m.vertexstep = sizeof(surfvertex_t);
+                               }
+                               R_Mesh_Draw(&m);
                        }
-                       R_Mesh_Draw(&m);
                }
        }
        else if (skyrenderglquake)
@@ -554,9 +538,6 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
                        m.transparent = false;
                        m.blendfunc1 = GL_ONE;
                        m.blendfunc2 = GL_ZERO;
-                       m.numtriangles = surf->mesh.numtriangles;
-                       m.numverts = surf->mesh.numverts;
-                       m.index = surf->mesh.index;
                        m.vertex = &svert[0].v[0];
                        m.vertexstep = sizeof(surfvert_t);
                        m.cr = 1;
@@ -568,25 +549,31 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
                        m.texcoordstep[0] = sizeof(surfvert_t);
                        speedscale = cl.time * (8.0/128.0);
                        speedscale -= (int)speedscale;
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                        {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract (sv->v, r_origin, dir);
-                               // flatten the sphere
-                               dir[2] *= 3;
-
-                               number = DotProduct(dir, dir);
-                               #if SLOWMATH
-                               length = 3.0f / sqrt(number);
-                               #else
-                               *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1);
-                               length = 3.0f * (length * (1.5f - (number * 0.5f * length * length)));
-                               #endif
-
-                               sv->st[0] = speedscale + dir[0] * length;
-                               sv->st[1] = speedscale + dir[1] * length;
+                               m.numtriangles = mesh->numtriangles;
+                               m.numverts = mesh->numverts;
+                               m.index = mesh->index;
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       softwaretransform(v->v, sv->v);
+                                       VectorSubtract (sv->v, r_origin, dir);
+                                       // flatten the sphere
+                                       dir[2] *= 3;
+
+                                       number = DotProduct(dir, dir);
+                                       #if SLOWMATH
+                                       length = 3.0f / sqrt(number);
+                                       #else
+                                       *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1);
+                                       length = 3.0f * (length * (1.5f - (number * 0.5f * length * length)));
+                                       #endif
+
+                                       sv->st[0] = speedscale + dir[0] * length;
+                                       sv->st[1] = speedscale + dir[1] * length;
+                               }
+                               R_Mesh_Draw(&m);
                        }
-                       R_Mesh_Draw(&m);
                }
        }
        else
@@ -598,26 +585,29 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
                        m.transparent = false;
                        m.blendfunc1 = GL_ONE;
                        m.blendfunc2 = GL_ZERO;
-                       m.numtriangles = surf->mesh.numtriangles;
-                       m.numverts = surf->mesh.numverts;
-                       m.index = surf->mesh.index;
                        m.cr = fogcolor[0];
                        m.cg = fogcolor[1];
                        m.cb = fogcolor[2];
                        m.ca = 1;
-                       if (softwaretransform_complexity)
+                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                        {
-                               m.vertex = &svert[0].v[0];
-                               m.vertexstep = sizeof(surfvert_t);
-                               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                                       softwaretransform(v->v, sv->v);
-                       }
-                       else
-                       {
-                               m.vertex = &surf->mesh.vertex[0].v[0];
-                               m.vertexstep = sizeof(surfvertex_t);
+                               m.numtriangles = mesh->numtriangles;
+                               m.numverts = mesh->numverts;
+                               m.index = mesh->index;
+                               if (softwaretransform_complexity)
+                               {
+                                       m.vertex = &svert[0].v[0];
+                                       m.vertexstep = sizeof(surfvert_t);
+                                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                                               softwaretransform(v->v, sv->v);
+                               }
+                               else
+                               {
+                                       m.vertex = &mesh->vertex[0].v[0];
+                                       m.vertexstep = sizeof(surfvertex_t);
+                               }
+                               R_Mesh_Draw(&m);
                        }
-                       R_Mesh_Draw(&m);
                }
        }
        if (skyrenderglquake)
@@ -628,9 +618,6 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
                        m.transparent = false;
                        m.blendfunc1 = GL_SRC_ALPHA;
                        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-                       m.numtriangles = surf->mesh.numtriangles;
-                       m.numverts = surf->mesh.numverts;
-                       m.index = surf->mesh.index;
                        m.vertex = &svert[0].v[0];
                        m.vertexstep = sizeof(surfvert_t);
                        m.cr = 1;
@@ -642,25 +629,31 @@ static void RSurfShader_Sky(msurface_t *firstsurf)
                        m.texcoordstep[0] = sizeof(surfvert_t);
                        speedscale = cl.time * (16.0/128.0);
                        speedscale -= (int)speedscale;
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                        {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract (sv->v, r_origin, dir);
-                               // flatten the sphere
-                               dir[2] *= 3;
-
-                               number = DotProduct(dir, dir);
-                               #if SLOWMATH
-                               length = 3.0f / sqrt(number);
-                               #else
-                               *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1);
-                               length = 3.0f * (length * (1.5f - (number * 0.5f * length * length)));
-                               #endif
-
-                               sv->st[0] = speedscale + dir[0] * length;
-                               sv->st[1] = speedscale + dir[1] * length;
+                               m.numtriangles = mesh->numtriangles;
+                               m.numverts = mesh->numverts;
+                               m.index = mesh->index;
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       softwaretransform(v->v, sv->v);
+                                       VectorSubtract (sv->v, r_origin, dir);
+                                       // flatten the sphere
+                                       dir[2] *= 3;
+
+                                       number = DotProduct(dir, dir);
+                                       #if SLOWMATH
+                                       length = 3.0f / sqrt(number);
+                                       #else
+                                       *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1);
+                                       length = 3.0f * (length * (1.5f - (number * 0.5f * length * length)));
+                                       #endif
+
+                                       sv->st[0] = speedscale + dir[0] * length;
+                                       sv->st[1] = speedscale + dir[1] * length;
+                               }
+                               R_Mesh_Draw(&m);
                        }
-                       R_Mesh_Draw(&m);
                }
        }
 }
@@ -698,11 +691,12 @@ static int RSurf_Light(int *dlightbits, int numverts)
 
 static void RSurfShader_Water_Pass_Base(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], alpha, ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], alpha, ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
        alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
 
        memset(&m, 0, sizeof(m));
@@ -718,9 +712,6 @@ static void RSurfShader_Water_Pass_Base(msurface_t *surf)
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.vertex = &svert[0].v[0];
        m.vertexstep = sizeof(surfvert_t);
        m.color = &svert[0].c[0];
@@ -728,60 +719,64 @@ static void RSurfShader_Water_Pass_Base(msurface_t *surf)
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        m.texcoords[0] = &svert[0].st[0];
        m.texcoordstep[0] = sizeof(surfvert_t);
-       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               softwaretransform(v->v, sv->v);
-               if (r_waterripple.value)
-                       sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-               if (surf->flags & SURF_DRAWFULLBRIGHT)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
                {
-                       sv->c[0] = 1;
-                       sv->c[1] = 1;
-                       sv->c[2] = 1;
-                       sv->c[3] = alpha;
+                       softwaretransform(v->v, sv->v);
+                       if (r_waterripple.value)
+                               sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
+                       if (surf->flags & SURF_DRAWFULLBRIGHT)
+                       {
+                               sv->c[0] = 1;
+                               sv->c[1] = 1;
+                               sv->c[2] = 1;
+                               sv->c[3] = alpha;
+                       }
+                       else
+                       {
+                               sv->c[0] = 0.5f;
+                               sv->c[1] = 0.5f;
+                               sv->c[2] = 0.5f;
+                               sv->c[3] = alpha;
+                       }
+                       sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                       sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
                }
-               else
+               if (surf->dlightframe == r_framecount && !(surf->flags & SURF_DRAWFULLBRIGHT))
+                       RSurf_Light(surf->dlightbits, m.numverts);
+               if (fogenabled && (surf->flags & SURF_DRAWNOALPHA))
                {
-                       sv->c[0] = 0.5f;
-                       sv->c[1] = 0.5f;
-                       sv->c[2] = 0.5f;
-                       sv->c[3] = alpha;
-               }
-               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-       }
-       if (surf->dlightframe == r_framecount && !(surf->flags & SURF_DRAWFULLBRIGHT))
-               RSurf_Light(surf->dlightbits, m.numverts);
-       if (fogenabled && (surf->flags & SURF_DRAWNOALPHA))
-       {
-               for (i = 0, sv = svert;i < m.numverts;i++, sv++)
-               {
-                       VectorSubtract(sv->v, r_origin, diff);
-                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                       sv->c[0] *= ifog;
-                       sv->c[1] *= ifog;
-                       sv->c[2] *= ifog;
+                       for (i = 0, sv = svert;i < m.numverts;i++, sv++)
+                       {
+                               VectorSubtract(sv->v, r_origin, diff);
+                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                               sv->c[0] *= ifog;
+                               sv->c[1] *= ifog;
+                               sv->c[2] *= ifog;
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Water_Pass_Glow(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], alpha, ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], alpha, ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
        alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
 
        memset(&m, 0, sizeof(m));
        m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.vertex = &svert[0].v[0];
        m.vertexstep = sizeof(surfvert_t);
        m.cr = 1;
@@ -791,56 +786,60 @@ static void RSurfShader_Water_Pass_Glow(msurface_t *surf)
        m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
        m.texcoords[0] = &svert[0].st[0];
        m.texcoordstep[0] = sizeof(surfvert_t);
-       if (fogenabled)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.color = &svert[0].c[0];
-               m.colorstep = sizeof(surfvert_t);
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               if (fogenabled)
                {
-                       softwaretransform(v->v, sv->v);
-                       if (r_waterripple.value)
-                               sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-                       sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       VectorSubtract(sv->v, r_origin, diff);
-                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                       sv->c[0] = m.cr * ifog;
-                       sv->c[1] = m.cg * ifog;
-                       sv->c[2] = m.cb * ifog;
-                       sv->c[3] = m.ca;
+                       m.color = &svert[0].c[0];
+                       m.colorstep = sizeof(surfvert_t);
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       {
+                               softwaretransform(v->v, sv->v);
+                               if (r_waterripple.value)
+                                       sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
+                               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                               VectorSubtract(sv->v, r_origin, diff);
+                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                               sv->c[0] = m.cr * ifog;
+                               sv->c[1] = m.cg * ifog;
+                               sv->c[2] = m.cb * ifog;
+                               sv->c[3] = m.ca;
+                       }
                }
-       }
-       else
-       {
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+               else
                {
-                       softwaretransform(v->v, sv->v);
-                       if (r_waterripple.value)
-                               sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-                       sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       {
+                               softwaretransform(v->v, sv->v);
+                               if (r_waterripple.value)
+                                       sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
+                               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Water_Pass_Fog(msurface_t *surf)
 {
-       int                             i;
-       float                   alpha;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
-       vec3_t                  diff;
+       int i;
+       float alpha;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
+       vec3_t diff;
        alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
 
        memset(&m, 0, sizeof(m));
        m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.vertex = &svert[0].v[0];
        m.vertexstep = sizeof(surfvert_t);
        m.color = &svert[0].c[0];
@@ -849,23 +848,29 @@ static void RSurfShader_Water_Pass_Fog(msurface_t *surf)
        m.texcoords[0] = &svert[0].st[0];
        m.texcoordstep[0] = sizeof(surfvert_t);
 
-       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               softwaretransform(v->v, sv->v);
-               if (r_waterripple.value)
-                       sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
-               if (m.tex[0])
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
                {
-                       sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
-                       sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                       softwaretransform(v->v, sv->v);
+                       if (r_waterripple.value)
+                               sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
+                       if (m.tex[0])
+                       {
+                               sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                               sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
+                       }
+                       VectorSubtract(sv->v, r_origin, diff);
+                       sv->c[0] = fogcolor[0];
+                       sv->c[1] = fogcolor[1];
+                       sv->c[2] = fogcolor[2];
+                       sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff));
                }
-               VectorSubtract(sv->v, r_origin, diff);
-               sv->c[0] = fogcolor[0];
-               sv->c[1] = fogcolor[1];
-               sv->c[2] = fogcolor[2];
-               sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff));
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Water(msurface_t *firstsurf)
@@ -878,17 +883,17 @@ static void RSurfShader_Water(msurface_t *firstsurf)
                        RSurfShader_Water_Pass_Glow(surf);
        if (fogenabled)
                for (surf = firstsurf;surf;surf = surf->chain)
-                       //if (currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value) >= 1.0f)
-                               RSurfShader_Water_Pass_Fog(surf);
+                       RSurfShader_Water_Pass_Fog(surf);
 }
 
 static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
 
        memset(&m, 0, sizeof(m));
        if (currentrenderentity->effects & EF_ADDITIVE)
@@ -909,173 +914,184 @@ static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *surf)
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.cr = m.cg = m.cb = (float) (1 << lightscalebit);
        m.ca = currentrenderentity->alpha;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        m.tex[1] = R_GetTexture(surf->lightmaptexture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
-       m.texcoords[1] = &surf->mesh.vertex->uv[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
        m.texcoordstep[1] = sizeof(surfvertex_t);
-       if (fogenabled)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.color = &svert[0].c[0];
-               m.colorstep = sizeof(surfvert_t);
-               if (softwaretransform_complexity)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               m.texcoords[1] = &mesh->vertex->uv[0];
+               if (fogenabled)
                {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       m.color = &svert[0].c[0];
+                       m.colorstep = sizeof(surfvert_t);
+                       if (softwaretransform_complexity)
                        {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
+                               m.vertex = &svert[0].v[0];
+                               m.vertexstep = sizeof(surfvert_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       softwaretransform(v->v, sv->v);
+                                       VectorSubtract(sv->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] = m.cr * ifog;
+                                       sv->c[1] = m.cg * ifog;
+                                       sv->c[2] = m.cb * ifog;
+                                       sv->c[3] = m.ca;
+                               }
                        }
-               }
-               else
-               {
-                       m.vertex = &surf->mesh.vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       else
                        {
-                               VectorSubtract(v->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
+                               m.vertex = &mesh->vertex->v[0];
+                               m.vertexstep = sizeof(surfvertex_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       VectorSubtract(v->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] = m.cr * ifog;
+                                       sv->c[1] = m.cg * ifog;
+                                       sv->c[2] = m.cb * ifog;
+                                       sv->c[3] = m.ca;
+                               }
                        }
                }
-       }
-       else
-       {
-               if (softwaretransform_complexity)
-               {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                               softwaretransform(v->v, sv->v);
-               }
                else
                {
-                       m.vertex = &surf->mesh.vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
+                       if (softwaretransform_complexity)
+                       {
+                               m.vertex = &svert[0].v[0];
+                               m.vertexstep = sizeof(surfvert_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                                       softwaretransform(v->v, sv->v);
+                       }
+                       else
+                       {
+                               m.vertex = &mesh->vertex->v[0];
+                               m.vertexstep = sizeof(surfvertex_t);
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *surf)
 {
-       int                             i;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
 
        memset(&m, 0, sizeof(m));
        m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer);
        m.ca = 1;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       if (softwaretransform_complexity)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.vertex = &svert[0].v[0];
-               m.vertexstep = sizeof(surfvert_t);
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                       softwaretransform(v->v, sv->v);
-       }
-       else
-       {
-               m.vertex = &surf->mesh.vertex->v[0];
-               m.vertexstep = sizeof(surfvertex_t);
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               if (softwaretransform_complexity)
+               {
+                       m.vertex = &svert[0].v[0];
+                       m.vertexstep = sizeof(surfvert_t);
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               softwaretransform(v->v, sv->v);
+               }
+               else
+               {
+                       m.vertex = &mesh->vertex->v[0];
+                       m.vertexstep = sizeof(surfvertex_t);
+               }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
 
        memset(&m, 0, sizeof(m));
        m.transparent = false;
        m.blendfunc1 = GL_ZERO;
        m.blendfunc2 = GL_SRC_COLOR;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer);
        m.ca = 1;
        m.tex[0] = R_GetTexture(surf->lightmaptexture);
-       m.texcoords[0] = &surf->mesh.vertex->uv[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       if (fogenabled)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.color = &svert[0].c[0];
-               m.colorstep = sizeof(surfvert_t);
-               if (softwaretransform_complexity)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->uv[0];
+               if (fogenabled)
                {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       m.color = &svert[0].c[0];
+                       m.colorstep = sizeof(surfvert_t);
+                       if (softwaretransform_complexity)
                        {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
+                               m.vertex = &svert[0].v[0];
+                               m.vertexstep = sizeof(surfvert_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       softwaretransform(v->v, sv->v);
+                                       VectorSubtract(sv->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] = m.cr * ifog;
+                                       sv->c[1] = m.cg * ifog;
+                                       sv->c[2] = m.cb * ifog;
+                                       sv->c[3] = m.ca;
+                               }
                        }
-               }
-               else
-               {
-                       m.vertex = &surf->mesh.vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       else
                        {
-                               VectorSubtract(v->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
+                               m.vertex = &mesh->vertex->v[0];
+                               m.vertexstep = sizeof(surfvertex_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       VectorSubtract(v->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] = m.cr * ifog;
+                                       sv->c[1] = m.cg * ifog;
+                                       sv->c[2] = m.cb * ifog;
+                                       sv->c[3] = m.ca;
+                               }
                        }
                }
-       }
-       else
-       {
-               if (softwaretransform_complexity)
-               {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                               softwaretransform(v->v, sv->v);
-               }
                else
                {
-                       m.vertex = &surf->mesh.vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
+                       if (softwaretransform_complexity)
+                       {
+                               m.vertex = &svert[0].v[0];
+                               m.vertexstep = sizeof(surfvert_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                                       softwaretransform(v->v, sv->v);
+                       }
+                       else
+                       {
+                               m.vertex = &mesh->vertex->v[0];
+                               m.vertexstep = sizeof(surfvertex_t);
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf)
@@ -1084,6 +1100,7 @@ static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf)
        float c[3], base[3], scale, diff[3], ifog;
        surfvertex_t *v;
        surfvert_t *sv;
+       surfmesh_t *mesh;
        rmeshinfo_t m;
        qbyte *lm;
 
@@ -1110,72 +1127,76 @@ static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf)
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.vertex = &svert[0].v[0];
        m.vertexstep = sizeof(surfvert_t);
        m.color = &svert[0].c[0];
        m.colorstep = sizeof(surfvert_t);
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               softwaretransform(v->v, sv->v);
-               VectorCopy(base, c);
-               if (surf->styles[0] != 255)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
                {
-                       lm = surf->samples + v->lightmapoffset;
-                       scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f);
-                       VectorMA(c, scale, lm, c);
-                       if (surf->styles[1] != 255)
+                       softwaretransform(v->v, sv->v);
+                       VectorCopy(base, c);
+                       if (surf->styles[0] != 255)
                        {
-                               lm += size3;
-                               scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f);
+                               lm = surf->samples + v->lightmapoffset;
+                               scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f);
                                VectorMA(c, scale, lm, c);
-                               if (surf->styles[2] != 255)
+                               if (surf->styles[1] != 255)
                                {
                                        lm += size3;
-                                       scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f);
+                                       scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f);
                                        VectorMA(c, scale, lm, c);
-                                       if (surf->styles[3] != 255)
+                                       if (surf->styles[2] != 255)
                                        {
                                                lm += size3;
-                                               scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f);
+                                               scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f);
                                                VectorMA(c, scale, lm, c);
+                                               if (surf->styles[3] != 255)
+                                               {
+                                                       lm += size3;
+                                                       scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f);
+                                                       VectorMA(c, scale, lm, c);
+                                               }
                                        }
                                }
                        }
+                       sv->c[0] = c[0];
+                       sv->c[1] = c[1];
+                       sv->c[2] = c[2];
+                       sv->c[3] = currentrenderentity->alpha;
                }
-               sv->c[0] = c[0];
-               sv->c[1] = c[1];
-               sv->c[2] = c[2];
-               sv->c[3] = currentrenderentity->alpha;
-       }
-       if (surf->dlightframe == r_framecount)
-               RSurf_Light(surf->dlightbits, m.numverts);
-       if (fogenabled)
-       {
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+               if (surf->dlightframe == r_framecount)
+                       RSurf_Light(surf->dlightbits, m.numverts);
+               if (fogenabled)
                {
-                       VectorSubtract(sv->v, r_origin, diff);
-                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                       sv->c[0] *= ifog;
-                       sv->c[1] *= ifog;
-                       sv->c[2] *= ifog;
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       {
+                               VectorSubtract(sv->v, r_origin, diff);
+                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                               sv->c[0] *= ifog;
+                               sv->c[1] *= ifog;
+                               sv->c[2] *= ifog;
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
 
        memset(&m, 0, sizeof(m));
        if (currentrenderentity->effects & EF_ADDITIVE)
@@ -1196,46 +1217,50 @@ static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf)
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.vertex = &svert[0].v[0];
        m.vertexstep = sizeof(surfvert_t);
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       if (fogenabled)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.color = &svert[0].c[0];
-               m.colorstep = sizeof(surfvert_t);
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               if (fogenabled)
                {
-                       softwaretransform(v->v, sv->v);
-                       VectorSubtract(sv->v, r_origin, diff);
-                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                       sv->c[0] = ifog;
-                       sv->c[1] = ifog;
-                       sv->c[2] = ifog;
-                       sv->c[3] = currentrenderentity->alpha;
+                       m.color = &svert[0].c[0];
+                       m.colorstep = sizeof(surfvert_t);
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       {
+                               softwaretransform(v->v, sv->v);
+                               VectorSubtract(sv->v, r_origin, diff);
+                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                               sv->c[0] = ifog;
+                               sv->c[1] = ifog;
+                               sv->c[2] = ifog;
+                               sv->c[3] = currentrenderentity->alpha;
+                       }
                }
+               else
+               {
+                       m.cr = m.cg = m.cb = 1;
+                       m.ca = currentrenderentity->alpha;
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               softwaretransform(v->v, sv->v);
+               }
+               R_Mesh_Draw(&m);
        }
-       else
-       {
-               m.cr = m.cg = m.cb = 1;
-               m.ca = currentrenderentity->alpha;
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                       softwaretransform(v->v, sv->v);
-       }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Pass_Light(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
 
        memset(&m, 0, sizeof(m));
        if (currentrenderentity->effects & EF_ADDITIVE)
@@ -1246,48 +1271,52 @@ static void RSurfShader_Wall_Pass_Light(msurface_t *surf)
                m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.vertex = &svert[0].v[0];
        m.vertexstep = sizeof(surfvert_t);
        m.color = &svert[0].c[0];
        m.colorstep = sizeof(surfvert_t);
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               softwaretransform(v->v, sv->v);
-               sv->c[0] = 0;
-               sv->c[1] = 0;
-               sv->c[2] = 0;
-               sv->c[3] = currentrenderentity->alpha;
-       }
-       if (RSurf_Light(surf->dlightbits, m.numverts))
-       {
-               if (fogenabled)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
                {
-                       for (i = 0, sv = svert;i < m.numverts;i++, sv++)
+                       softwaretransform(v->v, sv->v);
+                       sv->c[0] = 0;
+                       sv->c[1] = 0;
+                       sv->c[2] = 0;
+                       sv->c[3] = currentrenderentity->alpha;
+               }
+               if (RSurf_Light(surf->dlightbits, m.numverts))
+               {
+                       if (fogenabled)
                        {
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] *= ifog;
-                               sv->c[1] *= ifog;
-                               sv->c[2] *= ifog;
+                               for (i = 0, sv = svert;i < m.numverts;i++, sv++)
+                               {
+                                       VectorSubtract(sv->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] *= ifog;
+                                       sv->c[1] *= ifog;
+                                       sv->c[2] *= ifog;
+                               }
                        }
+                       R_Mesh_Draw(&m);
                }
-               R_Mesh_Draw(&m);
        }
 }
 
 static void RSurfShader_Wall_Pass_Glow(msurface_t *surf)
 {
-       int                             i;
-       float                   diff[3], ifog;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
+       int i;
+       float diff[3], ifog;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       surfmesh_t *mesh;
+       rmeshinfo_t m;
 
        memset(&m, 0, sizeof(m));
        if (currentrenderentity->effects & EF_ADDITIVE)
@@ -1298,75 +1327,79 @@ static void RSurfShader_Wall_Pass_Glow(msurface_t *surf)
                m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.cr = 1;
        m.cg = 1;
        m.cb = 1;
        m.ca = currentrenderentity->alpha;
        m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       if (fogenabled)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.color = &svert[0].c[0];
-               m.colorstep = sizeof(surfvert_t);
-               if (softwaretransform_complexity)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               if (fogenabled)
                {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       m.color = &svert[0].c[0];
+                       m.colorstep = sizeof(surfvert_t);
+                       if (softwaretransform_complexity)
                        {
-                               softwaretransform(v->v, sv->v);
-                               VectorSubtract(sv->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
+                               m.vertex = &svert[0].v[0];
+                               m.vertexstep = sizeof(surfvert_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       softwaretransform(v->v, sv->v);
+                                       VectorSubtract(sv->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] = m.cr * ifog;
+                                       sv->c[1] = m.cg * ifog;
+                                       sv->c[2] = m.cb * ifog;
+                                       sv->c[3] = m.ca;
+                               }
                        }
-               }
-               else
-               {
-                       m.vertex = &surf->mesh.vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+                       else
                        {
-                               VectorSubtract(v->v, r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
-                               sv->c[0] = m.cr * ifog;
-                               sv->c[1] = m.cg * ifog;
-                               sv->c[2] = m.cb * ifog;
-                               sv->c[3] = m.ca;
+                               m.vertex = &mesh->vertex->v[0];
+                               m.vertexstep = sizeof(surfvertex_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                               {
+                                       VectorSubtract(v->v, r_origin, diff);
+                                       ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
+                                       sv->c[0] = m.cr * ifog;
+                                       sv->c[1] = m.cg * ifog;
+                                       sv->c[2] = m.cb * ifog;
+                                       sv->c[3] = m.ca;
+                               }
                        }
                }
-       }
-       else
-       {
-               if (softwaretransform_complexity)
-               {
-                       m.vertex = &svert[0].v[0];
-                       m.vertexstep = sizeof(surfvert_t);
-                       for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
-                               softwaretransform(v->v, sv->v);
-               }
                else
                {
-                       m.vertex = &surf->mesh.vertex->v[0];
-                       m.vertexstep = sizeof(surfvertex_t);
+                       if (softwaretransform_complexity)
+                       {
+                               m.vertex = &svert[0].v[0];
+                               m.vertexstep = sizeof(surfvert_t);
+                               for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                                       softwaretransform(v->v, sv->v);
+                       }
+                       else
+                       {
+                               m.vertex = &mesh->vertex->v[0];
+                               m.vertexstep = sizeof(surfvertex_t);
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Pass_Fog(msurface_t *surf)
 {
-       int                             i;
-       surfvertex_t    *v;
-       surfvert_t              *sv;
-       rmeshinfo_t             m;
-       vec3_t                  diff;
+       int i;
+       surfvertex_t *v;
+       surfvert_t *sv;
+       rmeshinfo_t m;
+       surfmesh_t *mesh;
+       vec3_t diff;
 
        memset(&m, 0, sizeof(m));
        if (currentrenderentity->effects & EF_ADDITIVE)
@@ -1377,42 +1410,45 @@ static void RSurfShader_Wall_Pass_Fog(msurface_t *surf)
                m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.numtriangles = surf->mesh.numtriangles;
-       m.numverts = surf->mesh.numverts;
-       m.index = surf->mesh.index;
        m.color = &svert[0].c[0];
        m.colorstep = sizeof(surfvert_t);
        m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
-       m.texcoords[0] = &surf->mesh.vertex->st[0];
        m.texcoordstep[0] = sizeof(surfvertex_t);
-       if (softwaretransform_complexity)
+       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
-               m.vertex = &svert[0].v[0];
-               m.vertexstep = sizeof(surfvert_t);
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+               m.numtriangles = mesh->numtriangles;
+               m.numverts = mesh->numverts;
+               m.index = mesh->index;
+               m.texcoords[0] = &mesh->vertex->st[0];
+               if (softwaretransform_complexity)
                {
-                       softwaretransform(v->v, sv->v);
-                       VectorSubtract(sv->v, r_origin, diff);
-                       sv->c[0] = fogcolor[0];
-                       sv->c[1] = fogcolor[1];
-                       sv->c[2] = fogcolor[2];
-                       sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
+                       m.vertex = &svert[0].v[0];
+                       m.vertexstep = sizeof(surfvert_t);
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       {
+                               softwaretransform(v->v, sv->v);
+                               VectorSubtract(sv->v, r_origin, diff);
+                               sv->c[0] = fogcolor[0];
+                               sv->c[1] = fogcolor[1];
+                               sv->c[2] = fogcolor[2];
+                               sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
+                       }
                }
-       }
-       else
-       {
-               m.vertex = &surf->mesh.vertex->v[0];
-               m.vertexstep = sizeof(surfvertex_t);
-               for (i = 0, sv = svert, v = surf->mesh.vertex;i < m.numverts;i++, sv++, v++)
+               else
                {
-                       VectorSubtract(v->v, r_origin, diff);
-                       sv->c[0] = fogcolor[0];
-                       sv->c[1] = fogcolor[1];
-                       sv->c[2] = fogcolor[2];
-                       sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
+                       m.vertex = &mesh->vertex->v[0];
+                       m.vertexstep = sizeof(surfvertex_t);
+                       for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+                       {
+                               VectorSubtract(v->v, r_origin, diff);
+                               sv->c[0] = fogcolor[0];
+                               sv->c[1] = fogcolor[1];
+                               sv->c[2] = fogcolor[2];
+                               sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
+                       }
                }
+               R_Mesh_Draw(&m);
        }
-       R_Mesh_Draw(&m);
 }
 
 static void RSurfShader_Wall_Fullbright(msurface_t *firstsurf)
@@ -1895,7 +1931,7 @@ Cshader_t *Cshaders[5] =
 
 void R_PrepareSurfaces(void)
 {
-       int i;
+       int i, entframe, texframe, framecount;
        texture_t *t;
        model_t *model;
        msurface_t *surf;
@@ -1904,6 +1940,8 @@ void R_PrepareSurfaces(void)
                Cshaders[i]->chain = NULL;
 
        model = currentrenderentity->model;
+       entframe = currentrenderentity->frame;
+       texframe = (int)(cl.time * 5.0f);
 
        for (i = 0;i < model->nummodelsurfaces;i++)
        {
@@ -1914,14 +1952,28 @@ void R_PrepareSurfaces(void)
                        {
                                surf->insertframe = r_framecount;
                                c_faces++;
-                               // manually inlined R_TextureAnimation
-                               //t = R_TextureAnimation(surf->texinfo->texture);
                                t = surf->texinfo->texture;
-                               if (t->alternate_anims != NULL && currentrenderentity->frame)
-                                       t = t->alternate_anims;
-                               if (t->anim_total >= 2)
-                                       t = t->anim_frames[(int)(cl.time * 5.0f) % t->anim_total];
-                               surf->currenttexture = t;
+                               if (t->animated)
+                               {
+                                       if (entframe)
+                                       {
+                                               framecount = t->anim_total[1];
+                                               if (framecount >= 2)
+                                                       surf->currenttexture = t->anim_frames[1][texframe % framecount];
+                                               else
+                                                       surf->currenttexture = t->anim_frames[1][0];
+                                       }
+                                       else
+                                       {
+                                               framecount = t->anim_total[0];
+                                               if (framecount >= 2)
+                                                       surf->currenttexture = t->anim_frames[0][texframe % framecount];
+                                               else
+                                                       surf->currenttexture = t->anim_frames[0][0];
+                                       }
+                               }
+                               else
+                                       surf->currenttexture = t;
                        }
 
                        surf->chain = surf->shader->chain;
@@ -1948,38 +2000,14 @@ static float portalpointbuffer[256][3];
 void R_DrawPortals(void)
 {
        int drawportals, i;
-//     mleaf_t *leaf, *endleaf;
        mportal_t *portal, *endportal;
-       mvertex_t *point/*, *endpoint*/;
+       mvertex_t *point;
        rmeshinfo_t m;
        drawportals = r_drawportals.integer;
+
        if (drawportals < 1)
                return;
-       /*
-       leaf = cl.worldmodel->leafs;
-       endleaf = leaf + cl.worldmodel->numleafs;
-       for (;leaf < endleaf;leaf++)
-       {
-               if (leaf->visframe == r_framecount && leaf->portals)
-               {
-                       i = leaf - cl.worldmodel->leafs;
-                       r = (i & 0x0007) << 5;
-                       g = (i & 0x0038) << 2;
-                       b = (i & 0x01C0) >> 1;
-                       portal = leaf->portals;
-                       while (portal)
-                       {
-                               transpolybegin(0, 0, 0, TPOLYTYPE_ALPHA);
-                               point = portal->points + portal->numpoints - 1;
-                               endpoint = portal->points;
-                               for (;point >= endpoint;point--)
-                                       transpolyvertub(point->position[0], point->position[1], point->position[2], 0, 0, r, g, b, 32);
-                               transpolyend();
-                               portal = portal->next;
-                       }
-               }
-       }
-       */
+
        memset(&m, 0, sizeof(m));
        m.transparent = true;
        m.blendfunc1 = GL_SRC_ALPHA;
@@ -2077,10 +2105,6 @@ static void R_SurfMarkLights (void)
                                         || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
                                         || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
                                         || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
-                                       //if (surf->cached_light[0] != d_lightstylevalue[surf->styles[0]]
-                                       // || surf->cached_light[1] != d_lightstylevalue[surf->styles[1]]
-                                       // || surf->cached_light[2] != d_lightstylevalue[surf->styles[2]]
-                                       // || surf->cached_light[3] != d_lightstylevalue[surf->styles[3]])
                                                R_BuildLightMap(surf, false); // base lighting changed
                                        else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
                                                R_BuildLightMap(surf, true); // only dlights
@@ -2141,3 +2165,4 @@ void R_DrawBrushModelNormal (void)
                R_DrawSurfaces(SHADERSTAGE_SKY);
        R_DrawSurfaces(SHADERSTAGE_NORMAL);
 }
+