UNMERGE

remove more unused code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10488 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=88f0fcbd983dae9880e48b6bc457eabd9bd7017d

diff --git a/gl_rmain.c b/gl_rmain.c
index 4f3aeade523e7b6860a722af72163d3d3582c39d..5a072b2ad29d35975d955b86aa58d73f4e5f2cc8 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -8383,8 +8383,12 @@ void R_Water_AddWaterPlane(msurface_t *surface, int entno)
        vec3_t normal;
        vec3_t center;
        mplane_t plane;
+       int cam_ent;
        r_waterstate_waterplane_t *p;
        texture_t *t = R_GetCurrentTexture(surface->texture);
+       cam_ent = t->camera_entity;
+       if(!(t->currentmaterialflags & MATERIALFLAG_CAMERA))
+               cam_ent = 0;
 
        // just use the first triangle with a valid normal for any decisions
        VectorClear(normal);
@@ -11053,6 +11057,7 @@ void RSurf_PrepareVerticesForBatch(int batchneed, int texturenumsurfaces, const
        int surfacefirstvertex;
        int surfaceendvertex;
        int surfacenumvertices;
+       int surfaceadjustvertex;
        int needsupdate;
        int i, j;
        qboolean gaps;
@@ -11382,6 +11387,7 @@ void RSurf_PrepareVerticesForBatch(int batchneed, int texturenumsurfaces, const
                        surfacefirstvertex = texturesurfacelist[i]->num_firstvertex;
                        surfacenumvertices = texturesurfacelist[i]->num_vertices;
                        surfacefirsttriangle = texturesurfacelist[i]->num_firsttriangle;
+                       surfaceadjustvertex = numvertices - surfacefirstvertex;
                        surfacenumtriangles = texturesurfacelist[i]->num_triangles;
                        // copy only the data requested
                        if ((batchneed & BATCHNEED_VERTEXPOSITION) && rsurface.modelvertexposition)

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 44e4554489f4d1ffd1941253f437d02211f8a921..bd084c162aba448d2def27aadf258cc24435e1a4 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -1199,8 +1199,10 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
        const msurface_t *surface;
        int i, k, kend, l, endsurface, batchnumsurfaces, texturenumsurfaces;
        const msurface_t **texturesurfacelist;
+       const int *element3i;
        texture_t *tex;
        CHECKGLERROR
+       element3i = rsurface.modelelement3i;
        // this is a double loop because non-visible surface skipping has to be
        // fast, and even if this is not the world model (and hence no visibility
        // checking) the input surface list and batch buffer are different formats