diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 8970cc26..828977e1 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -1647,7 +1647,7 @@ const image_t *ImageLoad( const char *name ); /* shaders.c */ -void ColorMod( const colorMod_t *am, int numVerts, bspDrawVert_t *drawVerts ); +void ColorMod( const colorMod_t *colormod, int numVerts, bspDrawVert_t *drawVerts ); void TCMod( const tcMod_t& mod, Vector2& st ); diff --git a/tools/quake3/q3map2/shaders.cpp b/tools/quake3/q3map2/shaders.cpp index 52900a42..9291e729 100644 --- a/tools/quake3/q3map2/shaders.cpp +++ b/tools/quake3/q3map2/shaders.cpp @@ -45,9 +45,9 @@ static int numCustSurfaceParms; routines for dealing with vertex color/alpha modification */ -void ColorMod( const colorMod_t *cm, int numVerts, bspDrawVert_t *drawVerts ){ +void ColorMod( const colorMod_t *colormod, int numVerts, bspDrawVert_t *drawVerts ){ /* dummy check */ - if ( cm == NULL || numVerts < 1 || drawVerts == NULL ) { + if ( colormod == NULL || numVerts < 1 || drawVerts == NULL ) { return; } @@ -56,7 +56,7 @@ void ColorMod( const colorMod_t *cm, int numVerts, bspDrawVert_t *drawVerts ){ for ( bspDrawVert_t& dv : Span( drawVerts, numVerts ) ) { /* walk colorMod list */ - for ( ; cm != NULL; cm = cm->next ) + for ( const colorMod_t *cm = colormod; cm != NULL; cm = cm->next ) { float c; /* default */