Remove -Wno-pedantic

[xonotic/netradiant.git] / tools / quake3 / q3map2 / shaders.c

diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c
index 75cab6b0d771503ddf24f9d4fa6fe34c40c89085..166319aa930862279da2abee60d3f9c0d9176969 100644 (file)
--- a/tools/quake3/q3map2/shaders.c
+++ b/tools/quake3/q3map2/shaders.c
@@ -383,7 +383,7 @@ void WriteMapShaderFile( void ){
        /* open shader file */
        file = fopen( mapShaderFile, "w" );
        if ( file == NULL ) {
-               Sys_Printf( "WARNING: Unable to open map shader file %s for writing\n", mapShaderFile );
+               Sys_FPrintf( SYS_WRN, "WARNING: Unable to open map shader file %s for writing\n", mapShaderFile );
                return;
        }
 
@@ -773,7 +773,7 @@ static void LoadShaderImages( shaderInfo_t *si ){
                if ( si->shaderImage == NULL ) {
                        si->shaderImage = ImageLoad( DEFAULT_IMAGE );
                        if ( warnImage && strcmp( si->shader, "noshader" ) ) {
-                               Sys_Printf( "WARNING: Couldn't find image for shader %s\n", si->shader );
+                               Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find image for shader %s\n", si->shader );
                        }
                }
 
@@ -839,7 +839,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
 
        /* dummy check */
        if ( shaderName == NULL || shaderName[ 0 ] == '\0' ) {
-               Sys_Printf( "WARNING: Null or empty shader name\n" );
+               Sys_FPrintf( SYS_WRN, "WARNING: Null or empty shader name\n" );
                shaderName = "missing";
        }
 
@@ -861,7 +861,7 @@ shaderInfo_t *ShaderInfoForShader( const char *shaderName ){
                                /* increase deprecation depth */
                                deprecationDepth++;
                                if ( deprecationDepth == MAX_SHADER_DEPRECATION_DEPTH ) {
-                                       Sys_Printf( "WARNING: Max deprecation depth of %i is reached on shader '%s'\n", MAX_SHADER_DEPRECATION_DEPTH, shader );
+                                       Sys_FPrintf( SYS_WRN, "WARNING: Max deprecation depth of %i is reached on shader '%s'\n", MAX_SHADER_DEPRECATION_DEPTH, shader );
                                }
                                /* search again from beginning */
                                i = -1;
@@ -1088,7 +1088,7 @@ static void ParseShaderFile( const char *filename ){
                        else if ( !Q_stricmp( token, "surfaceparm" ) ) {
                                GetTokenAppend( shaderText, qfalse );
                                if ( ApplySurfaceParm( token, &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) {
-                                       Sys_Printf( "WARNING: Unknown surfaceparm: \"%s\"\n", token );
+                                       Sys_FPrintf( SYS_WRN, "WARNING: Unknown surfaceparm: \"%s\"\n", token );
                                }
                        }
 
@@ -1569,7 +1569,7 @@ static void ParseShaderFile( const char *filename ){
                                        }
                                        else
                                        {
-                                               Sys_Printf( "WARNING: Unknown value for lightmap axis: %s\n", token );
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Unknown value for lightmap axis: %s\n", token );
                                                VectorClear( si->lightmapAxis );
                                        }
                                }
@@ -1584,7 +1584,7 @@ static void ParseShaderFile( const char *filename ){
                                        /* must be a power of 2 */
                                        if ( ( ( si->lmCustomWidth - 1 ) & si->lmCustomWidth ) ||
                                                 ( ( si->lmCustomHeight - 1 ) & si->lmCustomHeight ) ) {
-                                               Sys_Printf( "WARNING: Non power-of-two lightmap size specified (%d, %d)\n",
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Non power-of-two lightmap size specified (%d, %d)\n",
                                                                        si->lmCustomWidth, si->lmCustomHeight );
                                                si->lmCustomWidth = lmCustomSize;
                                                si->lmCustomHeight = lmCustomSize;
@@ -1729,7 +1729,7 @@ static void ParseShaderFile( const char *filename ){
                                        }
                                        else
                                        {
-                                               Sys_Printf( "WARNING: Unknown q3map_tcGen method: %s\n", token );
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_tcGen method: %s\n", token );
                                                VectorClear( si->vecs[ 0 ] );
                                                VectorClear( si->vecs[ 1 ] );
                                        }
@@ -1831,7 +1831,7 @@ static void ParseShaderFile( const char *filename ){
 
                                        /* unknown */
                                        else{
-                                               Sys_Printf( "WARNING: Unknown colorMod method: %s\n", token );
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Unknown colorMod method: %s\n", token );
                                        }
                                }
 
@@ -1869,7 +1869,7 @@ static void ParseShaderFile( const char *filename ){
                                                TCModRotate( si->mod, a );
                                        }
                                        else{
-                                               Sys_Printf( "WARNING: Unknown q3map_tcMod method: %s\n", token );
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_tcMod method: %s\n", token );
                                        }
                                }
 
@@ -1959,7 +1959,7 @@ static void ParseShaderFile( const char *filename ){
                                        GetTokenAppend( shaderText, qfalse );
                                        sprintf( temp, "*mat_%s", token );
                                        if ( ApplySurfaceParm( temp, &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) {
-                                               Sys_Printf( "WARNING: Unknown material \"%s\"\n", token );
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Unknown material \"%s\"\n", token );
                                        }
                                }
 
@@ -1982,7 +1982,7 @@ static void ParseShaderFile( const char *filename ){
                                {
                                        Sys_FPrintf( SYS_VRB, "Attempting to match %s with a known surfaceparm\n", token );
                                        if ( ApplySurfaceParm( &token[ 6 ], &si->contentFlags, &si->surfaceFlags, &si->compileFlags ) == qfalse ) {
-                                               Sys_Printf( "WARNING: Unknown q3map_* directive \"%s\"\n", token );
+                                               Sys_FPrintf( SYS_WRN, "WARNING: Unknown q3map_* directive \"%s\"\n", token );
                                        }
                                }
 #endif
@@ -2039,13 +2039,13 @@ static void ParseCustomInfoParms( void ){
                custSurfaceParms[ numCustSurfaceParms ].name = safe_malloc( MAX_OS_PATH );
                strcpy( custSurfaceParms[ numCustSurfaceParms ].name, token );
                GetToken( qfalse );
-               sscanf( token, "%x", &custSurfaceParms[ numCustSurfaceParms ].contentFlags );
+               sscanf( token, "%x", (unsigned int *) &custSurfaceParms[ numCustSurfaceParms ].contentFlags );
                numCustSurfaceParms++;
        }
 
        /* any content? */
        if ( !parsedContent ) {
-               Sys_Printf( "WARNING: Couldn't find valid custom contentsflag section\n" );
+               Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find valid custom contentsflag section\n" );
                return;
        }
 
@@ -2065,13 +2065,13 @@ static void ParseCustomInfoParms( void ){
                custSurfaceParms[ numCustSurfaceParms ].name = safe_malloc( MAX_OS_PATH );
                strcpy( custSurfaceParms[ numCustSurfaceParms ].name, token );
                GetToken( qfalse );
-               sscanf( token, "%x", &custSurfaceParms[ numCustSurfaceParms ].surfaceFlags );
+               sscanf( token, "%x", (unsigned int *) &custSurfaceParms[ numCustSurfaceParms ].surfaceFlags );
                numCustSurfaceParms++;
        }
 
        /* any content? */
        if ( !parsedContent ) {
-               Sys_Printf( "WARNING: Couldn't find valid custom surfaceflag section\n" );
+               Sys_FPrintf( SYS_WRN, "WARNING: Couldn't find valid custom surfaceflag section\n" );
        }
 }