X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fshaders.c;h=3c26a1cda270a3064cd4d495b751344af8590861;hb=fcb70e8e9cf76dd4993312a762e2ee255c1402a0;hp=a4453374a24f5d8e255cbee49c4e71ec3498d22f;hpb=bf6dd1f2d186c799adf11f1e744a1ff57aa8d335;p=xonotic%2Fnetradiant.git diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c index a4453374..3c26a1cd 100644 --- 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; } @@ -776,7 +776,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 ); } } @@ -844,7 +844,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"; } @@ -866,7 +866,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; @@ -1092,7 +1092,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 ); } } @@ -1276,8 +1276,7 @@ static void ParseShaderFile( const char *filename ){ else if ( !Q_stricmp( token, "sun" ) /* sof2 */ || !Q_stricmp( token, "q3map_sun" ) || !Q_stricmp( token, "q3map_sunExt" ) ) { float a, b; sun_t *sun; - qboolean ext; - + qboolean ext = qfalse; /* ydnar: extended sun directive? */ if ( !Q_stricmp( token, "q3map_sunext" ) ) { @@ -1285,8 +1284,7 @@ static void ParseShaderFile( const char *filename ){ } /* allocate sun */ - sun = safe_malloc( sizeof( *sun ) ); - memset( sun, 0, sizeof( *sun ) ); + sun = safe_malloc0( sizeof( *sun ) ); /* set style */ sun->style = si->lightStyle; @@ -1386,8 +1384,7 @@ static void ParseShaderFile( const char *filename ){ surfaceModel_t *model; /* allocate new model and attach it */ - model = safe_malloc( sizeof( *model ) ); - memset( model, 0, sizeof( *model ) ); + model = safe_malloc0( sizeof( *model ) ); model->next = si->surfaceModel; si->surfaceModel = model; @@ -1420,8 +1417,7 @@ static void ParseShaderFile( const char *filename ){ /* allocate new foliage struct and attach it */ - foliage = safe_malloc( sizeof( *foliage ) ); - memset( foliage, 0, sizeof( *foliage ) ); + foliage = safe_malloc0( sizeof( *foliage ) ); foliage->next = si->foliage; si->foliage = foliage; @@ -1573,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 ); } } @@ -1588,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; @@ -1733,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 ] ); } @@ -1751,8 +1747,7 @@ static void ParseShaderFile( const char *filename ){ alpha = ( !Q_stricmp( token, "q3map_alphaGen" ) || !Q_stricmp( token, "q3map_alphaMod" ) ) ? 1 : 0; /* allocate new colormod */ - cm = safe_malloc( sizeof( *cm ) ); - memset( cm, 0, sizeof( *cm ) ); + cm = safe_malloc0( sizeof( *cm ) ); /* attach to shader */ if ( si->colorMod == NULL ) { @@ -1835,7 +1830,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 ); } } @@ -1873,7 +1868,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 ); } } @@ -1963,7 +1958,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 ); } } @@ -1986,7 +1981,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 @@ -2043,13 +2038,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; } @@ -2069,13 +2064,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" ); } }