diff options
| author | /dev/humancontroller <devhc@example.com> | 2013-04-14 18:33:26 +0200 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-05-31 23:10:57 +0100 |
| commit | 83b6cff2d632f941389998bdbb95df9bb76bcf9d (patch) | |
| tree | af7f2f0c0940c0be15d7795a2ab23bc21295e967 | |
| parent | 89fe33daec9bde09702c12dca1391a801b6265a3 (diff) | |
reduce the amount of compiler warnings for variable shadowing
| -rw-r--r-- | src/client/cl_parse.c | 1 | ||||
| -rw-r--r-- | src/client/snd_mix.c | 1 | ||||
| -rw-r--r-- | src/renderergl1/tr_model_iqm.c | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_model_iqm.c | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_world.c | 2 | ||||
| -rw-r--r-- | src/server/sv_world.c | 1 |
6 files changed, 2 insertions, 7 deletions
diff --git a/src/client/cl_parse.c b/src/client/cl_parse.c index d69af295..e09e7f02 100644 --- a/src/client/cl_parse.c +++ b/src/client/cl_parse.c @@ -780,7 +780,6 @@ void CL_ParseVoip ( msg_t *msg ) { } for (i = 0; i < frames; i++) { - char encoded[256]; const int len = MSG_ReadByte(msg); if (len < 0) { Com_DPrintf("VoIP: Short packet!\n"); diff --git a/src/client/snd_mix.c b/src/client/snd_mix.c index 682e03ce..80c892f5 100644 --- a/src/client/snd_mix.c +++ b/src/client/snd_mix.c @@ -165,7 +165,6 @@ void S_TransferPaintBuffer(int endtime) if ( s_testsound->integer ) { int i; - int count; // write a fixed sine wave count = (endtime - s_paintedtime); diff --git a/src/renderergl1/tr_model_iqm.c b/src/renderergl1/tr_model_iqm.c index 0661eb7a..9b7ff7f6 100644 --- a/src/renderergl1/tr_model_iqm.c +++ b/src/renderergl1/tr_model_iqm.c @@ -207,7 +207,7 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na } vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays); for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) { - int j, n, *intPtr; + int n, *intPtr; if( vertexarray->size <= 0 || vertexarray->size > 4 ) { return qfalse; diff --git a/src/renderergl2/tr_model_iqm.c b/src/renderergl2/tr_model_iqm.c index a06e3be7..e949fb10 100644 --- a/src/renderergl2/tr_model_iqm.c +++ b/src/renderergl2/tr_model_iqm.c @@ -206,7 +206,7 @@ qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_na } vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays); for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) { - int j, n, *intPtr; + int n, *intPtr; if( vertexarray->size <= 0 || vertexarray->size > 4 ) { return qfalse; diff --git a/src/renderergl2/tr_world.c b/src/renderergl2/tr_world.c index cbce8157..dcf0bf00 100644 --- a/src/renderergl2/tr_world.c +++ b/src/renderergl2/tr_world.c @@ -158,7 +158,6 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) { if ( surf->cullinfo.type & CULLINFO_PLANE ) { - int i; for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) { if ( ! ( dlightBits & ( 1 << i ) ) ) { continue; @@ -239,7 +238,6 @@ static int R_PshadowSurface( msurface_t *surf, int pshadowBits ) { if ( surf->cullinfo.type & CULLINFO_PLANE ) { - int i; for ( i = 0 ; i < tr.refdef.num_pshadows ; i++ ) { if ( ! ( pshadowBits & ( 1 << i ) ) ) { continue; diff --git a/src/server/sv_world.c b/src/server/sv_world.c index c0109df8..a30ea7a2 100644 --- a/src/server/sv_world.c +++ b/src/server/sv_world.c @@ -258,7 +258,6 @@ void SV_LinkEntity( sharedEntity_t *gEnt ) { if ( gEnt->r.bmodel && (angles[0] || angles[1] || angles[2]) ) { // expand for rotation float max; - int i; max = RadiusFromBounds( gEnt->r.mins, gEnt->r.maxs ); for (i=0 ; i<3 ; i++) { |