From 148c7d50d5fd4e27d6b94ad4a6204fdab802b4ae Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 5 Jun 2011 19:37:54 +0200 Subject: [PATCH] more warning fixes --- tools/quake3/q3map2/shaders.c | 4 +--- tools/quake3/q3map2/surface_meta.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c index 3bf6cbe1..dcbf79d2 100644 --- a/tools/quake3/q3map2/shaders.c +++ b/tools/quake3/q3map2/shaders.c @@ -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 ]; } diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c index 0e300dde..8a684855 100644 --- a/tools/quake3/q3map2/surface_meta.c +++ b/tools/quake3/q3map2/surface_meta.c @@ -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 ) ); -- 2.39.2