more warning fixes
authorRudolf Polzer <divverent@xonotic.org>
Sun, 5 Jun 2011 17:37:54 +0000 (19:37 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 5 Jun 2011 17:37:54 +0000 (19:37 +0200)
tools/quake3/q3map2/shaders.c
tools/quake3/q3map2/surface_meta.c

index 3bf6cbe..dcbf79d 100644 (file)
@@ -687,7 +687,7 @@ void FinishShader( shaderInfo_t *si )
 {
        int             x, y;
        float   st[ 2 ], o[ 2 ], dist, bestDist;
-       vec4_t  color, bestColor, delta;
+       vec4_t  color, delta;
        
 
        /* don't double-dip */
@@ -727,8 +727,6 @@ void FinishShader( shaderInfo_t *si )
                        dist = delta[ 0 ] * delta[ 0 ] + delta[ 1 ] * delta[ 1 ] + delta[ 2 ] * delta[ 2 ] + delta[ 3 ] * delta[ 3 ];
                        if( dist < bestDist )
                        {
-                               VectorCopy( color, bestColor );
-                               bestColor[ 3 ] = color[ 3 ];
                                si->stFlat[ 0 ] = st[ 0 ];
                                si->stFlat[ 1 ] = st[ 1 ];
                        }
index 0e300dd..8a68485 100644 (file)
@@ -1402,7 +1402,7 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri,
        int                                     i, score, coincident, ai, bi, ci, oldTexRange[ 2 ];
        float                           lmMax;
        vec3_t                          mins, maxs;
-       qboolean                        inTexRange, es, et;
+       qboolean                        inTexRange;
        mapDrawSurface_t        old;
        
        
@@ -1518,9 +1518,6 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri,
        oldTexRange[ 1 ] = ds->texRange[ 1 ];
        inTexRange = CalcSurfaceTextureRange( ds );
        
-       es = (ds->texRange[ 0 ] > oldTexRange[ 0 ]) ? qtrue : qfalse;
-       et = (ds->texRange[ 1 ] > oldTexRange[ 1 ]) ? qtrue : qfalse;
-       
        if( inTexRange == qfalse && ds->numIndexes > 0 )
        {
                memcpy( ds, &old, sizeof( *ds ) );