quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more warning fixes

Browse Source
This commit is contained in:
Rudolf Polzer
2011-06-05 19:37:54 +02:00
parent 098472b067
commit 148c7d50d5
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/quake3/q3map2/shaders.c
View 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 ];
}

5
tools/quake3/q3map2/surface_meta.c
View 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 ) );