From 968e210f2d8a17bf6c01c1544965458c542b16c7 Mon Sep 17 00:00:00 2001 From: Garux Date: Fri, 16 Mar 2018 20:33:50 +0300 Subject: [PATCH] q3map2 * mark warning messages with respective flag for colorized monitoring output --- tools/quake3/common/inout.c | 12 +++++ tools/quake3/common/inout.h | 1 + tools/quake3/common/scriplib.c | 2 +- tools/quake3/common/threads.c | 2 +- tools/quake3/q3map2/bsp.c | 4 +- tools/quake3/q3map2/bspfile_abstract.c | 4 +- tools/quake3/q3map2/convert_ase.c | 4 +- tools/quake3/q3map2/convert_obj.c | 6 +-- tools/quake3/q3map2/decals.c | 6 +-- tools/quake3/q3map2/exportents.c | 24 +++++----- tools/quake3/q3map2/image.c | 20 ++++---- tools/quake3/q3map2/light.c | 8 ++-- tools/quake3/q3map2/light_ydnar.c | 6 +-- tools/quake3/q3map2/lightmaps_ydnar.c | 12 ++--- tools/quake3/q3map2/main.c | 66 +++++++++++++------------- tools/quake3/q3map2/map.c | 16 +++---- tools/quake3/q3map2/model.c | 14 +++--- tools/quake3/q3map2/portals.c | 14 +++--- tools/quake3/q3map2/prtfile.c | 2 +- tools/quake3/q3map2/shaders.c | 28 +++++------ tools/quake3/q3map2/surface.c | 11 +++-- tools/quake3/q3map2/surface_extra.c | 2 +- tools/quake3/q3map2/surface_meta.c | 10 ++-- tools/quake3/q3map2/vis.c | 4 +- tools/quake3/q3map2/writebsp.c | 2 +- 25 files changed, 148 insertions(+), 132 deletions(-) diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.c index b736280d..e47d7ebb 100644 --- a/tools/quake3/common/inout.c +++ b/tools/quake3/common/inout.c @@ -362,6 +362,18 @@ void Sys_Printf( const char *format, ... ){ FPrintf( SYS_STD, out_buffer ); } +void Sys_Warning( const char *format, ... ){ + char out_buffer[4096]; + va_list argptr; + + va_start( argptr, format ); + sprintf( out_buffer, "WARNING: " ); + vsprintf( out_buffer + strlen( "WARNING: " ), format, argptr ); + va_end( argptr ); + + FPrintf( SYS_WRN, out_buffer ); +} + /* ================= Error diff --git a/tools/quake3/common/inout.h b/tools/quake3/common/inout.h index 396e6c2d..2f76fcac 100644 --- a/tools/quake3/common/inout.h +++ b/tools/quake3/common/inout.h @@ -51,6 +51,7 @@ void Broadcast_Shutdown(); extern qboolean verbose; void Sys_Printf( const char *text, ... ); void Sys_FPrintf( int flag, const char *text, ... ); +void Sys_Warning( const char *format, ... ); #ifdef _DEBUG #define DBG_XML 1 diff --git a/tools/quake3/common/scriplib.c b/tools/quake3/common/scriplib.c index 95a09e94..2cd63d66 100644 --- a/tools/quake3/common/scriplib.c +++ b/tools/quake3/common/scriplib.c @@ -181,7 +181,7 @@ qboolean EndOfScript( qboolean crossline ){ } if ( script->buffer == NULL ) { - Sys_Printf( "WARNING: Attempt to free already freed script buffer\n" ); + Sys_Warning( "Attempt to free already freed script buffer\n" ); } else{ free( script->buffer ); diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.c index 04946dd2..b12310b6 100644 --- a/tools/quake3/common/threads.c +++ b/tools/quake3/common/threads.c @@ -59,7 +59,7 @@ int GetThreadWork( void ){ f = 40 * dispatch / workcount; if ( f < oldf ) { - Sys_Printf( "warning: progress went backwards (should never happen)\n" ); + Sys_Warning( "progress went backwards (should never happen)\n" ); oldf = f; } while ( f > oldf ) diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c index 45cf7276..3d75a839 100644 --- a/tools/quake3/q3map2/bsp.c +++ b/tools/quake3/q3map2/bsp.c @@ -193,7 +193,7 @@ static void SetCloneModelNumbers( void ){ /* get the model num */ value3 = ValueForKey( &entities[ j ], "model" ); if ( value3[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Cloned entity %s referenced entity without model\n", value2 ); + Sys_Warning( "Cloned entity %s referenced entity without model\n", value2 ); continue; } models = atoi( &value3[ 1 ] ); @@ -1006,7 +1006,7 @@ int BSPMain( int argc, char **argv ){ } else { - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_Warning( "Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c index d94a6fa8..7c4b05a9 100644 --- a/tools/quake3/q3map2/bspfile_abstract.c +++ b/tools/quake3/q3map2/bspfile_abstract.c @@ -277,7 +277,7 @@ int GetLumpElements( bspHeader_t *header, int lump, int size ){ /* check for odd size */ if ( header->lumps[ lump ].length % size ) { if ( force ) { - Sys_Printf( "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); + Sys_Warning( "GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); return 0; } else{ @@ -321,7 +321,7 @@ int CopyLump( bspHeader_t *header, int lump, void *dest, int size ){ } if ( length % size ) { if ( force ) { - Sys_Printf( "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump ); + Sys_Warning( "CopyLump: odd lump size (%d) in lump %d\n", length, lump ); return 0; } else{ diff --git a/tools/quake3/q3map2/convert_ase.c b/tools/quake3/q3map2/convert_ase.c index 4a6c7258..15c8a1a7 100644 --- a/tools/quake3/q3map2/convert_ase.c +++ b/tools/quake3/q3map2/convert_ase.c @@ -169,7 +169,7 @@ static void ConvertSurface( FILE *f, bspModel_t *model, int modelNum, bspDrawSur fprintf( f, "\t*MATERIAL_REF\t%d\r\n", ds->lightmapNum[0] + deluxemap ); } else{ - Sys_Printf( "WARNING: lightmap %d out of range, not exporting\n", ds->lightmapNum[0] + deluxemap ); + Sys_Warning( "lightmap %d out of range, not exporting\n", ds->lightmapNum[0] + deluxemap ); } } else{ @@ -253,7 +253,7 @@ static void ConvertShader( FILE *f, bspShader_t *shader, int shaderNum ){ /* get shader */ si = ShaderInfoForShader( shader->shader ); if ( si == NULL ) { - Sys_Printf( "WARNING: NULL shader in BSP\n" ); + Sys_Warning( "NULL shader in BSP\n" ); return; } diff --git a/tools/quake3/q3map2/convert_obj.c b/tools/quake3/q3map2/convert_obj.c index 64b6dcef..a8062e53 100644 --- a/tools/quake3/q3map2/convert_obj.c +++ b/tools/quake3/q3map2/convert_obj.c @@ -76,11 +76,11 @@ static void ConvertSurfaceToOBJ( FILE *f, bspModel_t *model, int modelNum, bspDr objLastShaderNum = ds->lightmapNum[0] + deluxemap; } if ( ds->lightmapNum[0] + (int)deluxemap < firstLightmap ) { - Sys_Printf( "WARNING: lightmap %d out of range (exporting anyway)\n", ds->lightmapNum[0] + deluxemap ); + Sys_Warning( "lightmap %d out of range (exporting anyway)\n", ds->lightmapNum[0] + deluxemap ); firstLightmap = ds->lightmapNum[0] + deluxemap; } if ( ds->lightmapNum[0] > lastLightmap ) { - Sys_Printf( "WARNING: lightmap %d out of range (exporting anyway)\n", ds->lightmapNum[0] + deluxemap ); + Sys_Warning( "lightmap %d out of range (exporting anyway)\n", ds->lightmapNum[0] + deluxemap ); lastLightmap = ds->lightmapNum[0] + deluxemap; } } @@ -160,7 +160,7 @@ static void ConvertShaderToMTL( FILE *f, bspShader_t *shader, int shaderNum ){ /* get shader */ si = ShaderInfoForShader( shader->shader ); if ( si == NULL ) { - Sys_Printf( "WARNING: NULL shader in BSP\n" ); + Sys_Warning( "NULL shader in BSP\n" ); return; } diff --git a/tools/quake3/q3map2/decals.c b/tools/quake3/q3map2/decals.c index 86421b95..bcb4d45d 100644 --- a/tools/quake3/q3map2/decals.c +++ b/tools/quake3/q3map2/decals.c @@ -337,7 +337,7 @@ static int MakeDecalProjector( shaderInfo_t *si, vec4_t projection, float distan /* limit check */ if ( numProjectors >= MAX_PROJECTORS ) { - Sys_Printf( "WARNING: MAX_PROJECTORS (%d) exceeded, no more decal projectors available.\n", MAX_PROJECTORS ); + Sys_Warning( "MAX_PROJECTORS (%d) exceeded, no more decal projectors available.\n", MAX_PROJECTORS ); return -2; } @@ -431,7 +431,7 @@ void ProcessDecals( void ){ /* any patches? */ if ( e->patches == NULL ) { - Sys_Printf( "WARNING: Decal entity without any patch meshes, ignoring.\n" ); + Sys_Warning( "Decal entity without any patch meshes, ignoring.\n" ); e->epairs = NULL; /* fixme: leak! */ continue; } @@ -442,7 +442,7 @@ void ProcessDecals( void ){ /* no target? */ if ( e2 == NULL ) { - Sys_Printf( "WARNING: Decal entity without a valid target, ignoring.\n" ); + Sys_Warning( "Decal entity without a valid target, ignoring.\n" ); continue; } diff --git a/tools/quake3/q3map2/exportents.c b/tools/quake3/q3map2/exportents.c index 578f9e42..00f8357f 100644 --- a/tools/quake3/q3map2/exportents.c +++ b/tools/quake3/q3map2/exportents.c @@ -53,30 +53,30 @@ void ExportEntities( void ){ char filename[ 1024 ]; FILE *file; - + /* note it */ Sys_FPrintf( SYS_VRB, "--- ExportEntities ---\n" ); - + /* do some path mangling */ strcpy( filename, source ); StripExtension( filename ); strcat( filename, ".ent" ); - + /* sanity check */ if ( bspEntData == NULL || bspEntDataSize == 0 ) { - Sys_Printf( "WARNING: No BSP entity data. aborting...\n" ); + Sys_Warning( "No BSP entity data. aborting...\n" ); return; } - + /* write it */ Sys_Printf( "Writing %s\n", filename ); Sys_FPrintf( SYS_VRB, "(%d bytes)\n", bspEntDataSize ); file = fopen( filename, "w" ); - + if ( file == NULL ) { Error( "Unable to open %s for writing", filename ); } - + fprintf( file, "%s\n", bspEntData ); fclose( file ); } @@ -94,19 +94,19 @@ int ExportEntitiesMain( int argc, char **argv ){ Sys_Printf( "Usage: q3map -exportents [-v] \n" ); return 0; } - + /* do some path mangling */ strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); StripExtension( source ); DefaultExtension( source, ".bsp" ); - + /* load the bsp */ Sys_Printf( "Loading %s\n", source ); LoadBSPFile( source ); - + /* export the lightmaps */ ExportEntities(); - + /* return to sender */ return 0; -} \ No newline at end of file +} diff --git a/tools/quake3/q3map2/image.c b/tools/quake3/q3map2/image.c index 60062a17..2904a8c1 100644 --- a/tools/quake3/q3map2/image.c +++ b/tools/quake3/q3map2/image.c @@ -67,13 +67,13 @@ static void LoadDDSBuffer( byte *buffer, int size, byte **pixels, int *width, in /* get dds info */ if ( DDSGetInfo( (ddsBuffer_t*) buffer, &w, &h, &pf ) ) { - Sys_Printf( "WARNING: Invalid DDS texture\n" ); + Sys_Warning( "Invalid DDS texture\n" ); return; } /* only certain types of dds textures are supported */ if ( pf != DDS_PF_ARGB8888 && pf != DDS_PF_DXT1 && pf != DDS_PF_DXT3 && pf != DDS_PF_DXT5 ) { - Sys_Printf( "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); + Sys_Warning( "Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); return; } @@ -140,27 +140,27 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in /* determine if this is a png file */ if ( png_sig_cmp( buffer, 0, 8 ) != 0 ) { - Sys_Printf( "WARNING: Invalid PNG file\n" ); + Sys_Warning( "Invalid PNG file\n" ); return; } /* create png structs */ png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); if ( png == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG read struct\n" ); + Sys_Warning( "Unable to create PNG read struct\n" ); return; } info = png_create_info_struct( png ); if ( info == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG info struct\n" ); + Sys_Warning( "Unable to create PNG info struct\n" ); png_destroy_read_struct( &png, NULL, NULL ); return; } end = png_create_info_struct( png ); if ( end == NULL ) { - Sys_Printf( "WARNING: Unable to create PNG end info struct\n" ); + Sys_Warning( "Unable to create PNG end info struct\n" ); png_destroy_read_struct( &png, &info, NULL ); return; } @@ -174,7 +174,7 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in /* set error longjmp */ if ( setjmp( png_jmpbuf(png) ) ) { - Sys_Printf( "WARNING: An error occurred reading PNG image\n" ); + Sys_Warning( "An error occurred reading PNG image\n" ); png_destroy_read_struct( &png, &info, &end ); return; } @@ -403,7 +403,7 @@ image_t *ImageLoad( const char *filename ){ if ( size > 0 ) { if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) { // On error, LoadJPGBuff might store a pointer to the error message in image->pixels - Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) image->pixels ); + Sys_Warning( "LoadJPGBuff %s %s\n", name, (unsigned char*) image->pixels ); } alphaHack = qtrue; } @@ -464,8 +464,8 @@ image_t *ImageLoad( const char *filename ){ if ( LoadJPGBuff( buffer, size, &pixels, &width, &height ) == -1 ) { if (pixels) { // On error, LoadJPGBuff might store a pointer to the error message in pixels - Sys_Printf( "WARNING: LoadJPGBuff %s %s\n", name, (unsigned char*) pixels ); - } + Sys_Warning( "LoadJPGBuff %s %s\n", name, (unsigned char*) pixels ); + } } else { if ( width == image->width && height == image->height ) { int i; diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c index 8694d8b8..08a977ce 100644 --- a/tools/quake3/q3map2/light.c +++ b/tools/quake3/q3map2/light.c @@ -354,7 +354,7 @@ void CreateEntityLights( void ){ } if ( light->style != LS_NORMAL ) { - Sys_FPrintf( SYS_WRN, "WARNING: Styled light found targeting %s\n **", target ); + Sys_Warning( "Styled light found targeting %s\n **", target ); } /* set light intensity */ @@ -442,7 +442,7 @@ void CreateEntityLights( void ){ /* get target */ e2 = FindTargetEntity( target ); if ( e2 == NULL ) { - Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n", + Sys_Warning( "light at (%i %i %i) has missing target\n", (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] ); light->photons *= pointScale; } @@ -2568,7 +2568,7 @@ int LightMain( int argc, char **argv ){ /* must be a power of 2 and greater than 2 */ if ( ( ( lmCustomSize - 1 ) & lmCustomSize ) || lmCustomSize < 2 ) { - Sys_Printf( "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); + Sys_Warning( "Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); lmCustomSize = game->lightmapSize; } i++; @@ -2942,7 +2942,7 @@ int LightMain( int argc, char **argv ){ /* unhandled args */ else { - Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); + Sys_Warning( "Unknown argument \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c index b4b7841c..2ecf50ba 100644 --- a/tools/quake3/q3map2/light_ydnar.c +++ b/tools/quake3/q3map2/light_ydnar.c @@ -1785,7 +1785,7 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float //% normal2 = SUPER_NORMAL( x, y ); } else{ - Sys_Printf( "WARNING: Spurious lightmap T vector\n" ); + Sys_Warning( "Spurious lightmap T vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 1 ] ); @@ -2215,7 +2215,7 @@ void IlluminateRawLightmap( int rawLightmapNum ){ /* max of MAX_LIGHTMAPS (4) styles allowed to hit a surface/lightmap */ if ( lightmapNum >= MAX_LIGHTMAPS ) { - Sys_Printf( "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); + Sys_Warning( "Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); continue; } @@ -3828,7 +3828,7 @@ void SetupEnvelopes( qboolean forGrid, qboolean fastFlag ){ for ( i = 0; i < 3; i++ ) { if ( mins[ i ] > light->origin[ i ] || maxs[ i ] < light->origin[ i ] ) { - //% Sys_Printf( "WARNING: Light PVS bounds (%.0f, %.0f, %.0f) -> (%.0f, %.0f, %.0f)\ndo not encompass light %d (%f, %f, %f)\n", + //% Sys_Warning( "Light PVS bounds (%.0f, %.0f, %.0f) -> (%.0f, %.0f, %.0f)\ndo not encompass light %d (%f, %f, %f)\n", //% mins[ 0 ], mins[ 1 ], mins[ 2 ], //% maxs[ 0 ], maxs[ 1 ], maxs[ 2 ], //% numLights, light->origin[ 0 ], light->origin[ 1 ], light->origin[ 2 ] ); diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c index 4b179e01..cad5e49c 100644 --- a/tools/quake3/q3map2/lightmaps_ydnar.c +++ b/tools/quake3/q3map2/lightmaps_ydnar.c @@ -127,7 +127,7 @@ void ExportLightmaps( void ){ /* sanity check */ if ( bspLightBytes == NULL ) { - Sys_Printf( "WARNING: No BSP lightmap data\n" ); + Sys_Warning( "No BSP lightmap data\n" ); return; } @@ -226,7 +226,7 @@ int ImportLightmapsMain( int argc, char **argv ){ buffer = NULL; len = vfsLoadFile( filename, (void*) &buffer, -1 ); if ( len < 0 ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_Warning( "Unable to load image %s\n", filename ); continue; } @@ -237,11 +237,11 @@ int ImportLightmapsMain( int argc, char **argv ){ /* sanity check it */ if ( pixels == NULL ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_Warning( "Unable to load image %s\n", filename ); continue; } if ( width != game->lightmapSize || height != game->lightmapSize ) { - Sys_Printf( "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", + Sys_Warning( "Image %s is not the right size (%d, %d) != (%d, %d)\n", filename, width, height, game->lightmapSize, game->lightmapSize ); } @@ -769,7 +769,7 @@ qboolean AddSurfaceToRawLightmap( int num, rawLightmap_t *lm ){ /* check for bogus axis */ if ( faxis[ axisNum ] == 0.0f ) { - Sys_Printf( "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); + Sys_Warning( "ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); lm->w = lm->h = 0; return qfalse; } @@ -988,7 +988,7 @@ void SetupSurfaceLightmaps( void ){ superSample = 1; } else if ( superSample > 8 ) { - Sys_Printf( "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); + Sys_Warning( "Insane supersampling amount (%d) detected.\n", superSample ); superSample = 8; } diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index 913e301e..cad778c3 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -1681,7 +1681,7 @@ void tex2list2( char* texlist, int *texnum, char* EXtex, int *EXtexnum, char* rE char* dot = strrchr( token, '.' ); if ( dot != NULL){ if ( Q_stricmp( dot, ".tga" ) && Q_stricmp( dot, ".jpg" ) && Q_stricmp( dot, ".png" ) ){ - Sys_Printf( "WARNING4: %s : weird or missing extension in shader\n", token ); + Sys_FPrintf( SYS_WRN, "WARNING4: %s : weird or missing extension in shader\n", token ); } else{ *dot = '\0'; @@ -1712,7 +1712,7 @@ void tex2list2( char* texlist, int *texnum, char* EXtex, int *EXtexnum, char* rE void res2list( char* data, int *num ){ int i; if ( strlen( data + (*num)*65 ) > 64 ){ - Sys_Printf( "WARNING6: %s : path too long.\n", data + (*num)*65 ); + Sys_FPrintf( SYS_WRN, "WARNING6: %s : path too long.\n", data + (*num)*65 ); } while ( *( data + (*num)*65 ) == '\\' || *( data + (*num)*65 ) == '/' ){ char* cut = data + (*num)*65 + 1; @@ -1916,7 +1916,7 @@ int pk3BSPMain( int argc, char **argv ){ char *cut = strrchr( exName, '\\' ); char *cut2 = strrchr( exName, '/' ); if ( cut == NULL && cut2 == NULL ){ - Sys_Printf( "WARNING: Unable to load exclusions file.\n" ); + Sys_Warning( "Unable to load exclusions file.\n" ); goto skipEXfile; } if ( cut2 > cut ) cut = cut2; @@ -1927,7 +1927,7 @@ int pk3BSPMain( int argc, char **argv ){ Sys_Printf( "Loading %s\n", exName ); size = TryLoadFile( exName, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to find exclusions file %s.\n", exName ); + Sys_Warning( "Unable to find exclusions file %s.\n", exName ); goto skipEXfile; } @@ -2147,10 +2147,10 @@ skipEXfile: break; } if ( !strcmp( token, "{" ) ) { - Sys_Printf( "WARNING9: %s : line %d : opening brace inside shader stage\n", temp, scriptline ); + Sys_FPrintf( SYS_WRN, "WARNING9: %s : line %d : opening brace inside shader stage\n", temp, scriptline ); } if ( !Q_stricmp( token, "mapComp" ) || !Q_stricmp( token, "mapNoComp" ) || !Q_stricmp( token, "animmapcomp" ) || !Q_stricmp( token, "animmapnocomp" ) ){ - Sys_Printf( "WARNING7: %s : line %d : unsupported '%s' map directive\n", temp, scriptline, token ); + Sys_FPrintf( SYS_WRN, "WARNING7: %s : line %d : unsupported '%s' map directive\n", temp, scriptline, token ); } /* skip the shader */ if ( !wantShader ) continue; @@ -2201,7 +2201,7 @@ skipEXfile: } } else if ( !Q_strncasecmp( token, "implicit", 8 ) ){ - Sys_Printf( "WARNING5: %s : line %d : unsupported %s shader\n", temp, scriptline, token ); + Sys_FPrintf( SYS_WRN, "WARNING5: %s : line %d : unsupported %s shader\n", temp, scriptline, token ); } /* skip the shader */ else if ( !wantShader ) continue; @@ -2292,7 +2292,7 @@ skipEXfile: Sys_Printf( "\n" ); for ( i = 0; i < pk3ShadersN; i++ ){ if ( *( pk3Shaders + i*65 ) != '\0' && ( ExReasonShader[i] != NULL || ExReasonShaderFile[i] != NULL ) ){ - Sys_Printf( " !FAIL! %s\n", pk3Shaders + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Shaders + i*65 ); packFAIL = qtrue; if ( ExReasonShader[i] != NULL ){ Sys_Printf( " reason: is located in %s,\n containing restricted shader %s\n", ExReasonShaderFile[i], ExReasonShader[i] ); @@ -2361,7 +2361,7 @@ skipEXfile: Sys_Printf( "++%s\n", temp ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Textures + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Textures + i*65 ); packFAIL = qtrue; } @@ -2391,7 +2391,7 @@ skipEXfile: Sys_Printf( " ~fail %s\n", pk3Shaders + i*65 ); } else{ - Sys_Printf( " !FAIL! %s\n", pk3Shaders + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Shaders + i*65 ); packFAIL = qtrue; } } @@ -2406,7 +2406,7 @@ skipEXfile: Sys_Printf( "++%s\n", temp ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Shaders + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Shaders + i*65 ); packFAIL = qtrue; } } @@ -2419,7 +2419,7 @@ skipEXfile: Sys_Printf( "++%s\n", pk3Sounds + i*65 ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Sounds + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Sounds + i*65 ); packFAIL = qtrue; } } @@ -2431,7 +2431,7 @@ skipEXfile: Sys_Printf( "++%s\n", pk3Videos + i*65 ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Videos + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Videos + i*65 ); packFAIL = qtrue; } @@ -2443,7 +2443,7 @@ skipEXfile: Sys_Printf( "++%s\n", temp ); } else{ - Sys_Printf( " !FAIL! %s\n", temp ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", temp ); packFAIL = qtrue; } @@ -2533,7 +2533,7 @@ int repackBSPMain( int argc, char **argv ){ char *cut = strrchr( exName, '\\' ); char *cut2 = strrchr( exName, '/' ); if ( cut == NULL && cut2 == NULL ){ - Sys_Printf( "WARNING: Unable to load exclusions file.\n" ); + Sys_Warning( "Unable to load exclusions file.\n" ); goto skipEXfile; } if ( cut2 > cut ) cut = cut2; @@ -2544,7 +2544,7 @@ int repackBSPMain( int argc, char **argv ){ Sys_Printf( "Loading %s\n", exName ); size = TryLoadFile( exName, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to find exclusions file %s.\n", exName ); + Sys_Warning( "Unable to find exclusions file %s.\n", exName ); goto skipEXfile; } @@ -2631,7 +2631,7 @@ skipEXfile: cut = strrchr( exName, '\\' ); cut2 = strrchr( exName, '/' ); if ( cut == NULL && cut2 == NULL ){ - Sys_Printf( "WARNING: Unable to load repack exclusions file.\n" ); + Sys_Warning( "Unable to load repack exclusions file.\n" ); goto skipEXrefile; } if ( cut2 > cut ) cut = cut2; @@ -2641,7 +2641,7 @@ skipEXfile: Sys_Printf( "Loading %s\n", exName ); size = TryLoadFile( exName, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to find repack exclusions file %s.\n", exName ); + Sys_Warning( "Unable to find repack exclusions file %s.\n", exName ); goto skipEXrefile; } @@ -2712,7 +2712,7 @@ skipEXrefile: Sys_Printf( "Loading %s\n", source ); size = TryLoadFile( source, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to open bsps paths list file %s.\n", source ); + Sys_Warning( "Unable to open bsps paths list file %s.\n", source ); } /* parse the file */ @@ -3044,7 +3044,7 @@ skipEXrefile: strcpy( shaderText, token ); if ( strchr( token, '\\') != NULL ){ - Sys_Printf( "WARNING1: %s : %s : shader name with backslash\n", pk3Shaderfiles + i*65, token ); + Sys_FPrintf( SYS_WRN, "WARNING1: %s : %s : shader name with backslash\n", pk3Shaderfiles + i*65, token ); } /* do wanna le shader? */ @@ -3059,7 +3059,7 @@ skipEXrefile: if ( wantShader ){ for ( j = 0; j < rExTexturesN ; j++ ){ if ( !Q_stricmp( pk3Shaders + shader*65, rExTextures + j*65 ) ){ - Sys_Printf( "WARNING3: %s : about to include shader for excluded texture\n", pk3Shaders + shader*65 ); + Sys_FPrintf( SYS_WRN, "WARNING3: %s : about to include shader for excluded texture\n", pk3Shaders + shader*65 ); break; } } @@ -3105,7 +3105,7 @@ skipEXrefile: } if ( !strcmp( token, "{" ) ) { strcat( shaderText, "\n\t{" ); - Sys_Printf( "WARNING9: %s : line %d : opening brace inside shader stage\n", temp, scriptline ); + Sys_FPrintf( SYS_WRN, "WARNING9: %s : line %d : opening brace inside shader stage\n", temp, scriptline ); } /* skip the shader */ if ( !wantShader ) continue; @@ -3176,7 +3176,7 @@ skipEXrefile: j = 0; } else if ( !Q_stricmp( token, "mapComp" ) || !Q_stricmp( token, "mapNoComp" ) || !Q_stricmp( token, "animmapcomp" ) || !Q_stricmp( token, "animmapnocomp" ) ){ - Sys_Printf( "WARNING7: %s : %s shader\n", pk3Shaders + shader*65, token ); + Sys_FPrintf( SYS_WRN, "WARNING7: %s : %s shader\n", pk3Shaders + shader*65, token ); hasmap = qtrue; if ( line == scriptline ){ strcat( shaderText, " " ); @@ -3248,7 +3248,7 @@ skipEXrefile: strcat( shaderText, token ); } else if ( !Q_strncasecmp( token, "implicit", 8 ) ){ - Sys_Printf( "WARNING5: %s : %s shader\n", pk3Shaders + shader*65, token ); + Sys_FPrintf( SYS_WRN, "WARNING5: %s : %s shader\n", pk3Shaders + shader*65, token ); hasmap = qtrue; if ( line == scriptline ){ strcat( shaderText, " " ); @@ -3290,7 +3290,7 @@ skipEXrefile: } } if ( wantShader && !hasmap ){ - Sys_Printf( "WARNING8: %s : shader has no known maps\n", pk3Shaders + shader*65 ); + Sys_FPrintf( SYS_WRN, "WARNING8: %s : shader has no known maps\n", pk3Shaders + shader*65 ); wantShader = qfalse; *( pk3Shaders + shader*65 ) = '\0'; } @@ -3310,7 +3310,7 @@ skipEXrefile: for ( i = 0; i < pk3ShadersN; i++ ){ if ( *( pk3Shaders + i*65 ) != '\0' ){ if ( strchr( pk3Shaders + i*65, '\\') != NULL ){ - Sys_Printf( "WARNING2: %s : bsp shader path with backslash\n", pk3Shaders + i*65 ); + Sys_FPrintf( SYS_WRN, "WARNING2: %s : bsp shader path with backslash\n", pk3Shaders + i*65 ); FixDOSName( pk3Shaders + i*65 ); //what if theres properly slashed one in the list? for ( j = 0; j < pk3ShadersN; j++ ){ @@ -3395,7 +3395,7 @@ skipEXrefile: Sys_Printf( "++%s\n", temp ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Textures + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Textures + i*65 ); } Sys_Printf( "\n\tPure textures....\n" ); @@ -3419,7 +3419,7 @@ skipEXrefile: Sys_Printf( "++%s\n", temp ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Shaders + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Shaders + i*65 ); } } @@ -3431,7 +3431,7 @@ skipEXrefile: Sys_Printf( "++%s\n", pk3Sounds + i*65 ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Sounds + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Sounds + i*65 ); } } @@ -3442,7 +3442,7 @@ skipEXrefile: Sys_Printf( "++%s\n", pk3Videos + i*65 ); continue; } - Sys_Printf( " !FAIL! %s\n", pk3Videos + i*65 ); + Sys_FPrintf( SYS_WRN, " !FAIL! %s\n", pk3Videos + i*65 ); } Sys_Printf( "\nSaved to %s\n", packname ); @@ -3655,7 +3655,7 @@ int ConvertBSPMain( int argc, char **argv ){ if ( force_map || ( !force_bsp && !Q_stricmp( ext, "map" ) && map_allowed ) ) { if ( !map_allowed ) { - Sys_Printf( "WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n" ); + Sys_Warning( "the requested conversion should not be done from .map files. Compile a .bsp first.\n" ); } StripExtension( source ); DefaultExtension( source, ".map" ); @@ -3724,7 +3724,7 @@ int main( int argc, char **argv ){ /* -help */ if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" ) || !strcmp( argv[ i ], "-help" ) ) { - HelpMain(argv[i+1]); + HelpMain( argv[i+1] ); return 0; } @@ -3847,7 +3847,7 @@ int main( int argc, char **argv ){ /* vlight */ else if ( !strcmp( argv[ 1 ], "-vlight" ) ) { - Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); + Sys_Warning( "VLight is no longer supported, defaulting to -light -fast instead\n\n" ); argv[ 1 ] = "-fast"; /* eek a hack */ r = LightMain( argc, argv ); } diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c index b9e97599..3938d2a4 100644 --- a/tools/quake3/q3map2/map.c +++ b/tools/quake3/q3map2/map.c @@ -1542,13 +1542,13 @@ void LoadEntityIndexMap( entity_t *e ){ value = ValueForKey( e, "layers" ); } if ( value[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has missing \"_layers\" or \"layers\" key\n", indexMapFilename ); + Sys_Warning( "Entity with index/alpha map \"%s\" has missing \"_layers\" or \"layers\" key\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } numLayers = atoi( value ); if ( numLayers < 1 ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has < 1 layer (%d)\n", indexMapFilename, numLayers ); + Sys_Warning( "Entity with index/alpha map \"%s\" has < 1 layer (%d)\n", indexMapFilename, numLayers ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } @@ -1559,7 +1559,7 @@ void LoadEntityIndexMap( entity_t *e ){ value = ValueForKey( e, "shader" ); } if ( value[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" has missing \"_shader\" or \"shader\" key\n", indexMapFilename ); + Sys_Warning( "Entity with index/alpha map \"%s\" has missing \"_shader\" or \"shader\" key\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); return; } @@ -1618,7 +1618,7 @@ void LoadEntityIndexMap( entity_t *e ){ /* the index map must be at least 2x2 pixels */ if ( w < 2 || h < 2 ) { - Sys_Printf( "WARNING: Entity with index/alpha map \"%s\" is smaller than 2x2 pixels\n", indexMapFilename ); + Sys_Warning( "Entity with index/alpha map \"%s\" is smaller than 2x2 pixels\n", indexMapFilename ); Sys_Printf( "Entity will not be textured properly. Check your keys/values.\n" ); free( pixels ); return; @@ -1699,7 +1699,7 @@ static qboolean ParseMapEntity( qboolean onlyLights, qboolean noCollapseGroups ) /* conformance check */ if ( strcmp( token, "{" ) ) { - Sys_Printf( "WARNING: ParseEntity: { not found, found %s on line %d - last entity was at: <%4.2f, %4.2f, %4.2f>...\n" + Sys_Warning( "ParseEntity: { not found, found %s on line %d - last entity was at: <%4.2f, %4.2f, %4.2f>...\n" "Continuing to process map, but resulting BSP may be invalid.\n", token, scriptline, entities[ numEntities ].origin[ 0 ], entities[ numEntities ].origin[ 1 ], entities[ numEntities ].origin[ 2 ] ); return qfalse; @@ -1723,7 +1723,7 @@ static qboolean ParseMapEntity( qboolean onlyLights, qboolean noCollapseGroups ) { /* get initial token */ if ( !GetToken( qtrue ) ) { - Sys_Printf( "WARNING: ParseEntity: EOF without closing brace\n" + Sys_Warning( "ParseEntity: EOF without closing brace\n" "Continuing to process map, but resulting BSP may be invalid.\n" ); return qfalse; } @@ -1745,7 +1745,7 @@ static qboolean ParseMapEntity( qboolean onlyLights, qboolean noCollapseGroups ) } else if ( !strcmp( token, "terrainDef" ) ) { //% ParseTerrain(); - Sys_Printf( "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ + Sys_Warning( "Terrain entity parsing not supported in this build.\n" ); /* ydnar */ } else if ( !strcmp( token, "brushDef" ) ) { if ( g_brushType == BPRIMIT_UNDEFINED ) { @@ -2011,7 +2011,7 @@ void LoadMapFile( char *filename, qboolean onlyLights, qboolean noCollapseGroups /* get brush counts */ numMapBrushes = CountBrushList( entities[ 0 ].brushes ); if ( (float) c_detail / (float) numMapBrushes < 0.10f && numMapBrushes > 500 ) { - Sys_Printf( "WARNING: Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); + Sys_Warning( "Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); } /* emit some statistics */ diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c index a60bcee9..a1f77267 100644 --- a/tools/quake3/q3map2/model.c +++ b/tools/quake3/q3map2/model.c @@ -58,11 +58,11 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_WARNING: - Sys_Printf( "WARNING: %s\n", str ); + Sys_Warning( "%s\n", str ); break; case PICO_ERROR: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_WRN, "ERROR: %s\n", str ); /* let it be a warning, since radiant stops monitoring on error message flag */ break; case PICO_FATAL: @@ -1240,7 +1240,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap } else { - Sys_Printf( "WARNING: triangle (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) of %s was not autoclipped\n", points[0][0], points[0][1], points[0][2], points[1][0], points[1][1], points[1][2], points[2][0], points[2][1], points[2][2], name ); + Sys_Warning( "triangle (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) of %s was not autoclipped\n", points[0][0], points[0][1], points[0][2], points[1][0], points[1][1], points[1][2], points[2][0], points[2][1], points[2][2], name ); free( buildBrush ); continue; } @@ -1317,7 +1317,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap entities[ mapEntityNum ].numBrushes++; } else{ - Sys_Printf( "WARNING: triangle (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) of %s was not autoclipped\n", points[0][0], points[0][1], points[0][2], points[1][0], points[1][1], points[1][2], points[2][0], points[2][1], points[2][2], name ); + Sys_Warning( "triangle (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) of %s was not autoclipped\n", points[0][0], points[0][1], points[0][2], points[1][0], points[1][1], points[1][2], points[2][0], points[2][1], points[2][2], name ); free( buildBrush ); } } @@ -1325,7 +1325,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap normalEpsilon = normalEpsilon_save; } else if ( spawnFlags & 8090 ){ - Sys_Printf( "WARNING: nonexistent clipping mode selected\n" ); + Sys_Warning( "nonexistent clipping mode selected\n" ); } } } @@ -1414,7 +1414,7 @@ void AddTriangleModels( entity_t *e ){ /* get model name */ model = ValueForKey( e2, "model" ); if ( model[ 0 ] == '\0' ) { - Sys_Printf( "WARNING: misc_model at %i %i %i without a model key\n", + Sys_Warning( "misc_model at %i %i %i without a model key\n", (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] ); continue; } @@ -1491,7 +1491,7 @@ void AddTriangleModels( entity_t *e ){ /* split the string */ split = strchr( remap->from, ';' ); if ( split == NULL ) { - Sys_Printf( "WARNING: Shader _remap key found in misc_model without a ; character\n" ); + Sys_Warning( "Shader _remap key found in misc_model without a ; character\n" ); free( remap ); remap = remap2; continue; diff --git a/tools/quake3/q3map2/portals.c b/tools/quake3/q3map2/portals.c index c1963e7c..fdf1ba03 100644 --- a/tools/quake3/q3map2/portals.c +++ b/tools/quake3/q3map2/portals.c @@ -519,9 +519,11 @@ void MakeTreePortals_r( node_t *node ){ CalcNodeBounds( node ); if ( node->mins[0] >= node->maxs[0] ) { - Sys_Printf( "WARNING: node without a volume\n" ); - Sys_Printf( "node has %d tiny portals\n", node->tinyportals ); - Sys_Printf( "node reference point %1.2f %1.2f %1.2f\n", node->referencepoint[0], + Sys_Warning( "node without a volume\n" + "node has %d tiny portals\n" + "node reference point %1.2f %1.2f %1.2f\n", + node->tinyportals, + node->referencepoint[0], node->referencepoint[1], node->referencepoint[2] ); } @@ -811,7 +813,7 @@ void FloodAreas_r( node_t *node ){ // note the current area as bounding the portal if ( b->portalareas[ 1 ] != -1 ) { - Sys_Printf( "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); + Sys_Warning( "areaportal brush %i touches > 2 areas\n", b->brushNum ); return; } if ( b->portalareas[ 0 ] != -1 ) { @@ -898,7 +900,7 @@ void CheckAreas_r( node_t *node ){ if ( node->cluster != -1 ) { if ( node->area == -1 ) { - Sys_Printf( "WARNING: cluster %d has area set to -1\n", node->cluster ); + Sys_Warning( "cluster %d has area set to -1\n", node->cluster ); } } if ( node->areaportal ) { @@ -906,7 +908,7 @@ void CheckAreas_r( node_t *node ){ // check if the areaportal touches two areas if ( b->portalareas[0] == -1 || b->portalareas[1] == -1 ) { - Sys_Printf( "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); + Sys_Warning( "areaportal brush %i doesn't touch two areas\n", b->brushNum ); } } } diff --git a/tools/quake3/q3map2/prtfile.c b/tools/quake3/q3map2/prtfile.c index 514d255f..d1a81c31 100644 --- a/tools/quake3/q3map2/prtfile.c +++ b/tools/quake3/q3map2/prtfile.c @@ -288,7 +288,7 @@ void NumberLeafs_r( node_t *node, int c ){ if ( node->has_structural_children ) { #if 0 if ( c >= 0 ) { - Sys_FPrintf( SYS_ERR,"THIS CANNOT HAPPEN\n" ); + Sys_FPrintf( SYS_ERR, "THIS CANNOT HAPPEN\n" ); } #endif NumberLeafs_r( node->children[0], c ); diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c index 82be170a..ebf404a8 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_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_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_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_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_Warning( "Unknown surfaceparm: \"%s\"\n", token ); } } @@ -1573,7 +1573,7 @@ static void ParseShaderFile( const char *filename ){ } else { - Sys_Printf( "WARNING: Unknown value for lightmap axis: %s\n", token ); + Sys_Warning( "Unknown value for lightmap axis: %s\n", token ); VectorClear( si->lightmapAxis ); } } @@ -1588,7 +1588,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_Warning( "Non power-of-two lightmap size specified (%d, %d)\n", si->lmCustomWidth, si->lmCustomHeight ); si->lmCustomWidth = lmCustomSize; si->lmCustomHeight = lmCustomSize; @@ -1733,7 +1733,7 @@ static void ParseShaderFile( const char *filename ){ } else { - Sys_Printf( "WARNING: Unknown q3map_tcGen method: %s\n", token ); + Sys_Warning( "Unknown q3map_tcGen method: %s\n", token ); VectorClear( si->vecs[ 0 ] ); VectorClear( si->vecs[ 1 ] ); } @@ -1835,7 +1835,7 @@ static void ParseShaderFile( const char *filename ){ /* unknown */ else{ - Sys_Printf( "WARNING: Unknown colorMod method: %s\n", token ); + Sys_Warning( "Unknown colorMod method: %s\n", token ); } } @@ -1873,7 +1873,7 @@ static void ParseShaderFile( const char *filename ){ TCModRotate( si->mod, a ); } else{ - Sys_Printf( "WARNING: Unknown q3map_tcMod method: %s\n", token ); + Sys_Warning( "Unknown q3map_tcMod method: %s\n", token ); } } @@ -1963,7 +1963,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_Warning( "Unknown material \"%s\"\n", token ); } } @@ -1986,7 +1986,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_Warning( "Unknown q3map_* directive \"%s\"\n", token ); } } #endif @@ -2049,7 +2049,7 @@ static void ParseCustomInfoParms( void ){ /* any content? */ if ( !parsedContent ) { - Sys_Printf( "WARNING: Couldn't find valid custom contentsflag section\n" ); + Sys_Warning( "Couldn't find valid custom contentsflag section\n" ); return; } @@ -2075,7 +2075,7 @@ static void ParseCustomInfoParms( void ){ /* any content? */ if ( !parsedContent ) { - Sys_Printf( "WARNING: Couldn't find valid custom surfaceflag section\n" ); + Sys_Warning( "Couldn't find valid custom surfaceflag section\n" ); } } diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c index daf72a37..3654beec 100644 --- a/tools/quake3/q3map2/surface.c +++ b/tools/quake3/q3map2/surface.c @@ -569,7 +569,7 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){ if ( fabs( dist ) > PLANAR_EPSILON ) { //% if( ds->planeNum >= 0 ) //% { - //% Sys_Printf( "WARNING: Planar surface marked unplanar (%f > %f)\n", fabs( dist ), PLANAR_EPSILON ); + //% Sys_Warning( "Planar surface marked unplanar (%f > %f)\n", fabs( dist ), PLANAR_EPSILON ); //% ds->verts[ i ].color[ 0 ][ 0 ] = ds->verts[ i ].color[ 0 ][ 2 ] = 0; //% } ds->planar = qfalse; @@ -590,7 +590,7 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds ){ ds->planeNum = -1; VectorClear( ds->lightmapVecs[ 2 ] ); //% if( ds->type == SURF_META || ds->type == SURF_FACE ) - //% Sys_Printf( "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); + //% Sys_Warning( "Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); } /* ----------------------------------------------------------------- @@ -2123,7 +2123,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node ){ si->mins[ 2 ] != 0.0f || si->maxs[ 2 ] != 0.0f ) ) { static qboolean warned = qfalse; if ( !warned ) { - Sys_Printf( "WARNING: this map uses the deformVertexes move hack\n" ); + Sys_Warning( "this map uses the deformVertexes move hack\n" ); warned = qtrue; } @@ -2520,7 +2520,7 @@ void EmitDrawIndexes( mapDrawSurface_t *ds, bspDrawSurface_t *out ){ /* validate the index */ if ( ds->type != SURFACE_PATCH ) { if ( bspDrawIndexes[ numBSPDrawIndexes ] < 0 || bspDrawIndexes[ numBSPDrawIndexes ] >= ds->numVerts ) { - Sys_Printf( "WARNING: %d %s has invalid index %d (%d)\n", + Sys_Warning( "%d %s has invalid index %d (%d)\n", numBSPDrawSurfaces, ds->shaderInfo->shader, bspDrawIndexes[ numBSPDrawIndexes ], @@ -3755,7 +3755,8 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree ){ bspDrawSurface_t *out; out = &bspDrawSurfaces[ numBSPDrawSurfaces - 1 ]; if ( out->numVerts == 3 && out->numIndexes > 3 ) { - Sys_Printf( "\nWARNING: Potentially bad %s surface (%d: %d, %d)\n %s\n", + Sys_Printf( "\n" ); + Sys_Warning( "Potentially bad %s surface (%d: %d, %d)\n %s\n", surfaceTypes[ ds->type ], numBSPDrawSurfaces - 1, out->numVerts, out->numIndexes, si->shader ); } diff --git a/tools/quake3/q3map2/surface_extra.c b/tools/quake3/q3map2/surface_extra.c index 291cce26..4f9eaf13 100644 --- a/tools/quake3/q3map2/surface_extra.c +++ b/tools/quake3/q3map2/surface_extra.c @@ -340,7 +340,7 @@ void LoadSurfaceExtraFile( const char *path ){ Sys_Printf( "Loading %s\n", srfPath ); size = LoadFile( srfPath, (void**) &buffer ); if ( size <= 0 ) { - Sys_Printf( "WARNING: Unable to find surface file %s, using defaults.\n", srfPath ); + Sys_Warning( "Unable to find surface file %s, using defaults.\n", srfPath ); return; } diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c index e0cc6b12..9233c1e3 100644 --- a/tools/quake3/q3map2/surface_meta.c +++ b/tools/quake3/q3map2/surface_meta.c @@ -459,9 +459,9 @@ int MaxAreaIndexes( bspDrawVert_t *vert, int cnt, int *indexes ){ shiftWidth = sqrt( A ) * 0.0125; /* 3->1 6->2 12->3 ... */ if ( A - ceil( log( cnt / 1.5 ) / log( 2 ) ) * V * shiftWidth * 2 < 0 ) { - /* printf("Small triangle detected (area %f, circumference %f), adjusting shiftWidth from %f to ", A, V, shiftWidth); */ + /* Sys_FPrintf( SYS_WRN, "Small triangle detected (area %f, circumference %f), adjusting shiftWidth from %f to ", A, V, shiftWidth ); */ shiftWidth = A / ( ceil( log( cnt / 1.5 ) / log( 2 ) ) * V * 2 ); - /* printf("%f\n", shiftWidth); */ + /* Sys_FPrintf( SYS_WRN, "%f\n", shiftWidth ); */ } /* find the triangle with highest area */ @@ -489,8 +489,8 @@ int MaxAreaIndexes( bspDrawVert_t *vert, int cnt, int *indexes ){ } /* - if(bestV < 0) - printf("value was REALLY bad\n"); + if(bestV < 0) + Sys_FPrintf( SYS_WRN, "value was REALLY bad\n" ); */ for ( try = 0; try < MAXAREA_MAXTRIES; ++try ) @@ -1595,7 +1595,7 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri, ( bi == ds->indexes[ i ] && ci == ds->indexes[ i + 2 ] && ai == ds->indexes[ i + 1 ] ) || ( ci == ds->indexes[ i ] && ai == ds->indexes[ i + 2 ] && bi == ds->indexes[ i + 1 ] ) ) { /* warn about it */ - Sys_Printf( "WARNING: Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n", + Sys_Warning( "Flipped triangle: (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f) (%6.0f %6.0f %6.0f)\n", ds->verts[ ai ].xyz[ 0 ], ds->verts[ ai ].xyz[ 1 ], ds->verts[ ai ].xyz[ 2 ], ds->verts[ bi ].xyz[ 0 ], ds->verts[ bi ].xyz[ 1 ], ds->verts[ bi ].xyz[ 2 ], ds->verts[ ci ].xyz[ 0 ], ds->verts[ ci ].xyz[ 1 ], ds->verts[ ci ].xyz[ 2 ] ); diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.c index fd3df83e..8c1cd641 100644 --- a/tools/quake3/q3map2/vis.c +++ b/tools/quake3/q3map2/vis.c @@ -204,7 +204,7 @@ void ClusterMerge( int leafnum ){ numvis = LeafVectorFromPortalVector( portalvector, uncompressed ); // if (uncompressed[leafnum>>3] & (1<<(leafnum&7))) -// Sys_Printf ("WARNING: Leaf portals saw into leaf\n"); +// Sys_Warning ("Leaf portals saw into leaf\n"); // uncompressed[leafnum>>3] |= (1<<(leafnum&7)); @@ -1167,7 +1167,7 @@ int VisMain( int argc, char **argv ){ else { - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_Warning( "Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/writebsp.c b/tools/quake3/q3map2/writebsp.c index 6b4ea592..34af521e 100644 --- a/tools/quake3/q3map2/writebsp.c +++ b/tools/quake3/q3map2/writebsp.c @@ -169,7 +169,7 @@ void EmitLeaf( node_t *node ){ { /* something is corrupting brushes */ if ( (size_t) b < 256 ) { - Sys_Printf( "WARNING: Node brush list corrupted (0x%08X)\n", b ); + Sys_Warning( "Node brush list corrupted (0x%08X)\n", b ); break; } //% if( b->guard != 0xDEADBEEF )