From 5105fc5db86e5c528ccbdb8cc0aa4b980de41097 Mon Sep 17 00:00:00 2001 From: Pan7 Date: Mon, 16 May 2016 21:20:20 +0200 Subject: [PATCH] Using Sys_FPrintf with SYS_WRN and SYS_ERR --- contrib/bobtoolz/DBrush.cpp | 2 +- contrib/bobtoolz/cportals.cpp | 28 +++++++++---------- contrib/bobtoolz/misc.cpp | 2 +- contrib/camera/misc.cpp | 4 +-- contrib/hydratoolz/plugin.cpp | 2 +- contrib/prtview/portals.cpp | 20 ++++++------- plugins/eclassfgd/plugin.cpp | 8 +++--- plugins/entity/eclassmodel.cpp | 2 +- plugins/entity/entity.cpp | 2 +- plugins/imagehl/lbmlib.cpp | 6 ++-- plugins/map/parse.cpp | 4 +-- plugins/model/cpicosurface.cpp | 6 ++-- plugins/model/miscmodel.cpp | 2 +- plugins/model/plugin.cpp | 4 +-- plugins/shaders/shaders.cpp | 18 ++++++------ plugins/spritemodel/spritemodel.cpp | 2 +- radiant/brush.cpp | 8 +++--- radiant/brush_primit.cpp | 14 +++++----- radiant/camwindow.cpp | 2 +- radiant/eclass.cpp | 2 +- radiant/glinterface.cpp | 4 +-- radiant/groupdialog.cpp | 2 +- radiant/main.cpp | 10 +++---- radiant/mainframe.cpp | 8 +++--- radiant/map.cpp | 4 +-- radiant/parse.cpp | 8 +++--- radiant/patchdialog.cpp | 2 +- radiant/pluginmanager.cpp | 20 ++++++------- radiant/pmesh.cpp | 4 +-- radiant/qe3.cpp | 6 ++-- radiant/select.cpp | 4 +-- radiant/selectedface.cpp | 4 +-- radiant/surfacedialog.cpp | 2 +- radiant/surfaceplugin.cpp | 2 +- radiant/texwindow.cpp | 8 +++--- radiant/ui.cpp | 6 ++-- radiant/undo.cpp | 10 +++---- radiant/watchbsp.cpp | 10 +++---- radiant/xywindow.cpp | 2 +- radiant/zwindow.cpp | 2 +- tools/quake3/common/aselib.c | 2 +- tools/quake3/common/scriplib.c | 2 +- tools/quake3/q3map2/bsp.c | 4 +-- tools/quake3/q3map2/bspfile_abstract.c | 4 +-- tools/quake3/q3map2/convert_ase.c | 2 +- tools/quake3/q3map2/decals.c | 6 ++-- tools/quake3/q3map2/exportents.c | 2 +- tools/quake3/q3map2/image.c | 16 +++++------ tools/quake3/q3map2/light.c | 6 ++-- tools/quake3/q3map2/light_ydnar.c | 8 +++--- tools/quake3/q3map2/lightmaps_ydnar.c | 12 ++++---- tools/quake3/q3map2/main.c | 2 +- tools/quake3/q3map2/map.c | 16 +++++------ tools/quake3/q3map2/model.c | 10 +++---- tools/quake3/q3map2/portals.c | 8 +++--- tools/quake3/q3map2/shaders.c | 26 ++++++++--------- tools/quake3/q3map2/surface.c | 8 +++--- tools/quake3/q3map2/surface_extra.c | 2 +- tools/quake3/q3map2/surface_meta.c | 2 +- tools/quake3/q3map2/vis.c | 4 +-- tools/quake3/q3map2/writebsp.c | 2 +- tools/urt/tools/quake3/q3map2/bsp.c | 4 +-- .../tools/quake3/q3map2/bspfile_abstract.c | 4 +-- tools/urt/tools/quake3/q3map2/convert_ase.c | 2 +- tools/urt/tools/quake3/q3map2/decals.c | 6 ++-- tools/urt/tools/quake3/q3map2/exportents.c | 2 +- tools/urt/tools/quake3/q3map2/image.c | 16 +++++------ tools/urt/tools/quake3/q3map2/light.c | 6 ++-- tools/urt/tools/quake3/q3map2/light_ydnar.c | 8 +++--- .../urt/tools/quake3/q3map2/lightmaps_ydnar.c | 12 ++++---- tools/urt/tools/quake3/q3map2/main.c | 2 +- tools/urt/tools/quake3/q3map2/map.c | 16 +++++------ tools/urt/tools/quake3/q3map2/model.c | 14 +++++----- tools/urt/tools/quake3/q3map2/portals.c | 8 +++--- tools/urt/tools/quake3/q3map2/shaders.c | 26 ++++++++--------- tools/urt/tools/quake3/q3map2/surface.c | 8 +++--- tools/urt/tools/quake3/q3map2/surface_extra.c | 2 +- tools/urt/tools/quake3/q3map2/surface_meta.c | 2 +- tools/urt/tools/quake3/q3map2/vis.c | 4 +-- tools/urt/tools/quake3/q3map2/writebsp.c | 2 +- 80 files changed, 273 insertions(+), 271 deletions(-) diff --git a/contrib/bobtoolz/DBrush.cpp b/contrib/bobtoolz/DBrush.cpp index 3e54e797..01a34330 100644 --- a/contrib/bobtoolz/DBrush.cpp +++ b/contrib/bobtoolz/DBrush.cpp @@ -83,7 +83,7 @@ int DBrush::BuildPoints(){ int pos = PointPosition( pnt ); if ( pos == POINT_IN_BRUSH ) { // ???? shouldn't happen here - Sys_Printf( "ERROR:: Build Brush Points: Point IN brush!!!\n" ); + Sys_FPrintf( SYS_ERR, "ERROR:: Build Brush Points: Point IN brush!!!\n" ); } else if ( pos == POINT_ON_BRUSH ) { // normal point if ( !HasPoint( pnt ) ) { diff --git a/contrib/bobtoolz/cportals.cpp b/contrib/bobtoolz/cportals.cpp index c408eda2..6878a8d2 100644 --- a/contrib/bobtoolz/cportals.cpp +++ b/contrib/bobtoolz/cportals.cpp @@ -122,7 +122,7 @@ void CPortals::Load(){ in = fopen( fn, "rt" ); if ( in == NULL ) { - Sys_Printf( " ERROR - could not open file.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - could not open file.\n" ); return; } @@ -130,7 +130,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -138,7 +138,7 @@ void CPortals::Load(){ if ( strncmp( "PRT1", buf, 4 ) != 0 ) { fclose( in ); - Sys_Printf( " ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); return; } @@ -146,7 +146,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -158,7 +158,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - Extreme number of nodes, aborting.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - Extreme number of nodes, aborting.\n" ); return; } @@ -168,7 +168,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -181,7 +181,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -199,7 +199,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -218,7 +218,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -249,7 +249,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); return; } @@ -262,7 +262,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); return; } @@ -272,7 +272,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); return; } @@ -285,7 +285,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Could not find information for portal number %d of %d.\n", n + 1, p_count ); return; } @@ -298,7 +298,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, p_count ); return; } diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp index ec94f71f..4ae16b42 100644 --- a/contrib/bobtoolz/misc.cpp +++ b/contrib/bobtoolz/misc.cpp @@ -143,7 +143,7 @@ void Sys_ERROR( const char* text, ... ){ vsprintf( buf, text,argptr ); va_end( argptr ); - Sys_Printf( "BobToolz::ERROR->%s", buf ); + Sys_FPrintf( SYS_ERR, "BobToolz::ERROR->%s", buf ); } /*void Sys_Printf (char *text, ...) diff --git a/contrib/camera/misc.cpp b/contrib/camera/misc.cpp index 1fe7509b..75e885de 100644 --- a/contrib/camera/misc.cpp +++ b/contrib/camera/misc.cpp @@ -34,7 +34,7 @@ void Sys_ERROR( char* text, ... ){ vsprintf( buf, text,argptr ); va_end( argptr ); - Sys_Printf( "Camera::ERROR->%s", buf ); + Sys_FPrintf( SYS_ERR, "Camera::ERROR->%s", buf ); } char* UnixToDosPath( char* path ){ @@ -117,7 +117,7 @@ void CDECL Com_Error( int level, const char *error, ... ){ vsprintf( buf, error,argptr ); va_end( argptr ); - Sys_Printf( "Camera::ERROR->%s", buf ); + Sys_FPrintf( SYS_ERR, "Camera::ERROR->%s", buf ); } void CDECL Com_Printf( const char* msg, ... ){ diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp index 4a5de388..79bba252 100644 --- a/contrib/hydratoolz/plugin.cpp +++ b/contrib/hydratoolz/plugin.cpp @@ -305,7 +305,7 @@ void UpdateWadKeyPair( void ){ } else { - Sys_Printf( "HydraToolz: WARNING: could not locate wad file %s\n",(char *)wadlist->data ); + Sys_FPrintf( SYS_WRN, "WARNING: could not locate wad file %s\n",(char *)wadlist->data ); strcat( wads, (char *)wadlist->data ); } } diff --git a/contrib/prtview/portals.cpp b/contrib/prtview/portals.cpp index 288a6c2c..e11dd3bc 100644 --- a/contrib/prtview/portals.cpp +++ b/contrib/prtview/portals.cpp @@ -166,7 +166,7 @@ void CPortals::Load(){ in = fopen( fn, "rt" ); if ( in == NULL ) { - Sys_Printf( " ERROR - could not open file.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - could not open file.\n" ); return; } @@ -174,7 +174,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -182,7 +182,7 @@ void CPortals::Load(){ if ( strncmp( "PRT1", buf, 4 ) != 0 ) { fclose( in ); - Sys_Printf( " ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File header indicates wrong file type (should be \"PRT1\").\n" ); return; } @@ -190,7 +190,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -203,7 +203,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf(" ERROR - Extreme number of nodes, aborting.\n"); + Sys_FPrintf( SYS_ERR, "ERROR - Extreme number of nodes, aborting.\n"); return; } @@ -214,7 +214,7 @@ void CPortals::Load(){ node_count = 0; - Sys_Printf( " ERROR - File ended prematurely.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - File ended prematurely.\n" ); return; } @@ -227,7 +227,7 @@ void CPortals::Load(){ portal_count = 0; node_count = 0; - Sys_Printf( " ERROR - Extreme number of portals, aborting.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - Extreme number of portals, aborting.\n" ); return; } @@ -238,7 +238,7 @@ void CPortals::Load(){ portal_count = 0; node_count = 0; - Sys_Printf( " ERROR - number of portals equals 0, aborting.\n" ); + Sys_FPrintf( SYS_ERR, "ERROR - number of portals equals 0, aborting.\n" ); return; } @@ -260,7 +260,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Could not find information for portal number %d of %d.\n", n + 1, portal_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Could not find information for portal number %d of %d.\n", n + 1, portal_count ); return; } @@ -278,7 +278,7 @@ void CPortals::Load(){ Purge(); - Sys_Printf( " ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, portal_count ); + Sys_FPrintf( SYS_ERR, "ERROR - Information for portal number %d of %d is not formatted correctly.\n", n + 1, portal_count ); return; } diff --git a/plugins/eclassfgd/plugin.cpp b/plugins/eclassfgd/plugin.cpp index baff99ce..13089949 100644 --- a/plugins/eclassfgd/plugin.cpp +++ b/plugins/eclassfgd/plugin.cpp @@ -402,12 +402,12 @@ void EClass_ImportFromClass( eclass_t *e, GSList *l_classes, class_t *bc ){ // make sure we don't request ourself! if ( rbc == bc ) { - Sys_Printf( "WARNING: baseclass '%s' tried to request itself!\n", bclst->data ); + Sys_FPrintf( SYS_WRN, "WARNING: baseclass '%s' tried to request itself!\n", bclst->data ); } else { if ( !rbc ) { - Sys_Printf( "WARNING: could not find the requested baseclass '%s' when building '%s'\n", requestedclass,bc->classname ); + Sys_FPrintf( SYS_WRN, "WARNING: could not find the requested baseclass '%s' when building '%s'\n", requestedclass,bc->classname ); } else { @@ -494,7 +494,7 @@ void EClass_ImportFromClass( eclass_t *e, GSList *l_classes, class_t *bc ){ } else { - Sys_Printf( "WARNING: baseclass '%s' has a spawnflag out of range, ignored!\n", bc->classname ); + Sys_FPrintf( SYS_WRN, "WARNING: baseclass '%s' has a spawnflag out of range, ignored!\n", bc->classname ); } } break; @@ -1015,7 +1015,7 @@ void Eclass_ScanFile( char *filename ){ } else { - Sys_Printf( "%WARNING: Parse error occured in '%s - %s'\n",classnames[newclass->classtype],newclass->classname ); + Sys_FPrintf( SYS_WRN, "WARNING: Parse error occured in '%s - %s'\n",classnames[newclass->classtype],newclass->classname ); Free_Option( newoption ); } diff --git a/plugins/entity/eclassmodel.cpp b/plugins/entity/eclassmodel.cpp index 28670a03..163ffe47 100644 --- a/plugins/entity/eclassmodel.cpp +++ b/plugins/entity/eclassmodel.cpp @@ -152,7 +152,7 @@ void CEntityEclassModel::UpdateCachedData(){ m4x4_pivoted_transform_by_vec3( m_transform, m_translate, m_euler, eXYZ, m_scale, m_pivot ); memcpy( m_inverse_transform, m_transform, sizeof( m4x4_t ) ); if ( m4x4_invert( m_inverse_transform ) == 1 ) { - Sys_Printf( "ERROR: Singular Matrix, cannot invert" ); + Sys_FPrintf( SYS_ERR, "ERROR: Singular Matrix, cannot invert" ); } if ( m_eclass ) { diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp index 35c836fd..7f8df9a7 100644 --- a/plugins/entity/entity.cpp +++ b/plugins/entity/entity.cpp @@ -326,7 +326,7 @@ epair_t** Entity_GetKeyValList( entity_t *e ){ void Entity_SetKeyValList( entity_t *e, epair_t* ep ){ if ( e->epairs ) { - Sys_Printf( "Warning : pe->epairs != NULL in Entity_SetKeyValList, will not set\n" ); + Sys_FPrintf( SYS_WRN, "Warning : pe->epairs != NULL in Entity_SetKeyValList, will not set\n" ); } else { e->epairs = ep; diff --git a/plugins/imagehl/lbmlib.cpp b/plugins/imagehl/lbmlib.cpp index c34c22df..0d1e207f 100644 --- a/plugins/imagehl/lbmlib.cpp +++ b/plugins/imagehl/lbmlib.cpp @@ -148,14 +148,14 @@ static void LoadIDSP( const char *name, byte ** pic, int *width, int *height ){ header = (dspriteheader_t *)buffer; if ( header->ident != IDSPRITEHEADER ) { - Sys_Printf( "WARNING: %s has wrong header\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: %s has wrong header\n" ); vfsFreeFile( buffer ); return; } version = header->version; if ( version != 1 && version != 2 ) { - Sys_Printf( "WARNING: %s has wrong version number " + Sys_FPrintf( SYS_WRN, "WARNING: %s has wrong version number " "(%i should be 1 or 2)\n", name, version ); vfsFreeFile( buffer ); return; @@ -180,7 +180,7 @@ static void LoadIDSP( const char *name, byte ** pic, int *width, int *height ){ break; } if ( numframes > 1 ) { - Sys_Printf( "WARNING: %s has multiple frames, only the first frame will be used.\n", name ); + Sys_FPrintf( SYS_WRN, "WARNING: %s has multiple frames, only the first frame will be used.\n", name ); } // palette = buffer+mipdatasize+2; diff --git a/plugins/map/parse.cpp b/plugins/map/parse.cpp index 01ee011c..4305979a 100644 --- a/plugins/map/parse.cpp +++ b/plugins/map/parse.cpp @@ -338,7 +338,7 @@ void Face_Parse( face_t *face, bool bAlternateTexdef = false ){ else { // using the cache below means that this message is only ever printed out once! - Sys_Printf( "WARNING: could not find \"%s\" in any listed wad files, searching all wad files instead!\n",token ); + Sys_FPrintf( SYS_WRN, "WARNING: could not find \"%s\" in any listed wad files, searching all wad files instead!\n",token ); } // end of half-life specific bit. @@ -390,7 +390,7 @@ void Face_Parse( face_t *face, bool bAlternateTexdef = false ){ } else { - Sys_Printf( "WARNING: could not find \"%s\" in the vfs search path\n",token ); + Sys_FPrintf( SYS_WRN, "WARNING: could not find \"%s\" in the vfs search path\n",token ); str = new char[strlen( token ) + 10]; strcpy( str, "textures/" ); strcpy( str + 9, token ); diff --git a/plugins/model/cpicosurface.cpp b/plugins/model/cpicosurface.cpp index 7aed8c08..2112a02d 100644 --- a/plugins/model/cpicosurface.cpp +++ b/plugins/model/cpicosurface.cpp @@ -38,6 +38,8 @@ CPicoSurface::CPicoSurface( picoSurface_t *pSurface ){ // directory as a fall-back. This is a hack for malformed models. if ( m_shader->IsDefault() ) { + Sys_FPrintf( SYS_WRN, "WARNING: Failed to load shader %s for %s\n", m_shader->getName(), m_pSurface->model->name ); + gchar *dir = g_path_get_dirname( m_pSurface->model->name ); gchar *skin = g_strdup_printf( "%s/skin.tga", dir ); @@ -144,7 +146,7 @@ void CPicoSurface::Draw( int state, IShader *pShader, int rflags ){ g_QglTable.m_pfn_qglEnd();*/ break; - default: Sys_Printf( "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); + default: Sys_FPrintf( SYS_ERR, "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); break; } @@ -203,7 +205,7 @@ bool CPicoSurface::TestRay( const ray_t *ray, vec_t *dist ) const { } break; default: - Sys_Printf( "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); + Sys_FPrintf( SYS_ERR, "ERROR: Unsupported Pico Surface Type: %i", PicoGetSurfaceType( m_pSurface ) ); break; } } diff --git a/plugins/model/miscmodel.cpp b/plugins/model/miscmodel.cpp index a0f52a97..5c46de8c 100644 --- a/plugins/model/miscmodel.cpp +++ b/plugins/model/miscmodel.cpp @@ -317,7 +317,7 @@ void CEntityMiscModel::UpdateCachedData(){ m4x4_pivoted_transform_by_vec3( m_transform, m_translate, m_euler, m_scale, m_pivot ); memcpy( m_inverse_transform, m_transform, sizeof( m4x4_t ) ); if ( m4x4_invert( m_inverse_transform ) == 1 ) { - Sys_Printf( "ERROR: Singular Matrix, cannot invert" ); + Sys_FPrintf( SYS_ERR, "ERROR: Singular Matrix, cannot invert" ); } aabb_clear( &aabb_temp ); diff --git a/plugins/model/plugin.cpp b/plugins/model/plugin.cpp index d5bc6e80..dd3e305e 100644 --- a/plugins/model/plugin.cpp +++ b/plugins/model/plugin.cpp @@ -74,7 +74,7 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_WARNING: - Sys_Printf( "WARNING: %s\n", str ); + Sys_FPrintf( SYS_WRN, "WARNING: %s\n", str ); break; case PICO_ERROR: @@ -82,7 +82,7 @@ void PicoPrintFunc( int level, const char *str ){ break; case PICO_FATAL: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_ERR, "ERROR: %s\n", str ); break; } } diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp index bbe6a531..792b2ad0 100644 --- a/plugins/shaders/shaders.cpp +++ b/plugins/shaders/shaders.cpp @@ -188,7 +188,7 @@ void CShaderArray::operator =( const class CShaderArray & src ){ #ifdef _DEBUG if ( CPtrArray::GetSize() != 0 ) { - Sys_Printf( "WARNING: CShaderArray::operator = expects an empty array\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: CShaderArray::operator = expects an empty array\n" ); } #endif Copy( src ); @@ -239,7 +239,7 @@ char *ShaderNameLookup( patchMesh_t * patch ){ return static_cast < patchEntry_t * >( PatchShaders.GetAt( i ) )->name; } } - Sys_Printf( "ERROR: failed to lookup name in ShaderNameLookup??\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: failed to lookup name in ShaderNameLookup??\n" ); return const_cast(SHADER_NOT_FOUND); } //++timo end clean @@ -420,7 +420,7 @@ int WINAPI QERApp_LoadShadersFromDir( const char *path ){ // check we activated the right shader // NOTE: if there was something else loaded, the size of g_Shaders may have changed and strange behaviours are to be expected if ( pFoo != pShader ) { - Sys_Printf( "WARNING: unexpected pFoo != pShader in QERApp_LoadShadersFromDir\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: unexpected pFoo != pShader in QERApp_LoadShadersFromDir\n" ); } #else pFoo = NULL; // leo: shut up the compiler @@ -606,7 +606,7 @@ void WINAPI QERApp_LoadShaderFile( const char *filename ){ //++timo NOTE: this may a bit slow, we may need to use a map instead of a dumb list if ( g_Shaders.Shader_ForName( pShader->getName() ) != NULL ) { #ifdef _DEBUG - Sys_Printf( "WARNING: shader %s is already in memory, definition in %s ignored.\n", + Sys_FPrintf( SYS_WRN, "WARNING: shader %s is already in memory, definition in %s ignored.\n", pShader->getName(), filename ); #endif delete pShader; @@ -620,7 +620,7 @@ void WINAPI QERApp_LoadShaderFile( const char *filename ){ } else { - Sys_Printf( "Error parsing shader %s\n", pShader->getName() ); + Sys_FPrintf( SYS_ERR, "ERROR: parsing shader %s\n", pShader->getName() ); delete pShader; } } @@ -628,7 +628,7 @@ void WINAPI QERApp_LoadShaderFile( const char *filename ){ } else { - Sys_Printf( "Unable to read shaderfile %s\n", filename ); + Sys_FPrintf( SYS_ERR, "ERROR: Unable to read shaderfile %s\n", filename ); } } @@ -658,7 +658,7 @@ IShader *WINAPI QERApp_CreateShader_ForTextureName( const char *name ){ // Hydra: display an error message, so the user can quickly find a list of missing // textures by looking at the console. if ( !pShader->Activate() ) { - Sys_Printf( "WARNING: Activate shader failed for %s\n",pShader->getName() ); + Sys_FPrintf( SYS_WRN, "WARNING: Activate shader failed for %s\n", pShader->getName() ); } pShader->SetDisplayed( true ); @@ -706,7 +706,7 @@ qtexture_t *WINAPI QERApp_Try_Texture_ForName( const char *name ){ for ( q = g_qeglobals.d_qtextures; q; q = q->next ) { if ( !strcmp( stdName, q->name ) ) { - Sys_Printf( "ERROR: %s is not in texture map, but was found in texture list\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: %s is not in texture map, but was found in texture list\n" ); return q; } } @@ -837,7 +837,7 @@ void WINAPI QERApp_ReloadShaderFile( const char *name ){ // check the shader name is a reletive path // I hacked together a few quick tests to make sure :-) if ( strstr( name, ":\\" ) || !strstr( name, "scripts" ) ) { - Sys_Printf( "WARNING: is %s a reletive path to a shader file? (QERApp_ReloadShaderFile\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: is %s a reletive path to a shader file? (QERApp_ReloadShaderFile\n" ); } #endif diff --git a/plugins/spritemodel/spritemodel.cpp b/plugins/spritemodel/spritemodel.cpp index 28684133..0a2f2041 100644 --- a/plugins/spritemodel/spritemodel.cpp +++ b/plugins/spritemodel/spritemodel.cpp @@ -35,7 +35,7 @@ void LoadSpriteModel( entity_interfaces_t *interfaces, const char *name ){ pShader = QERApp_Shader_ForName( name ); if ( !pShader ) { - Sys_Printf( "ERROR: can't find shader (or image) for: %s\n", name ); + Sys_FPrintf( SYS_ERR, "ERROR: can't find shader (or image) for: %s\n", name ); return; } diff --git a/radiant/brush.cpp b/radiant/brush.cpp index 05ec12fb..2d07acad 100644 --- a/radiant/brush.cpp +++ b/radiant/brush.cpp @@ -341,7 +341,7 @@ void Face_TextureVectors( face_t *f, float STfromXYZ[2][4] ){ #ifdef _DEBUG // this code is not supposed to be used while in BP mode, warning here can help spot the problem if ( g_qeglobals.m_bBrushPrimitMode && !g_qeglobals.bNeedConvert ) { - Sys_Printf( "Warning : illegal call of Face_TextureVectors in brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning : illegal call of Face_TextureVectors in brush primitive mode\n" ); } #endif @@ -867,7 +867,7 @@ void Brush_Build( brush_t *b, bool bSnap, bool bMarkMap, bool bConvert, bool bFi #ifdef _DEBUG if ( !g_qeglobals.m_bBrushPrimitMode && bConvert ) { - Sys_Printf( "Warning : conversion from brush primitive to old brush format not implemented\n" ); + Sys_FPrintf( SYS_WRN, "Warning : conversion from brush primitive to old brush format not implemented\n" ); } #endif @@ -1539,7 +1539,7 @@ const char* Brush_GetKeyValue( brush_t *b, const char *pKey ){ void CheckName( face_t *fa, char *pname ){ if ( !strlen( fa->texdef.GetName() ) ) { #ifdef _DEBUG - Sys_Printf( "WARNING: unexpected texdef.name is empty in Brush.cpp CheckName\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: unexpected texdef.name is empty in Brush.cpp CheckName\n" ); #endif fa->texdef.SetName( SHADER_NOT_FOUND ); strcpy( pname, SHADER_NOT_FOUND ); @@ -1592,7 +1592,7 @@ brush_t *Brush_Create( vec3_t mins, vec3_t maxs, texdef_t *texdef ){ if ( g_qeglobals.m_bBrushPrimitMode ) { // check texdef is empty .. if there are cases it's not we need to write some conversion code if ( texdef->shift[0] != 0 || texdef->shift[1] != 0 || texdef->scale[0] != 0 || texdef->scale[1] != 0 || texdef->rotate != 0 ) { - Sys_Printf( "Warning : non-zero texdef detected in Brush_Create .. need brush primitive conversion\n" ); + Sys_FPrintf( SYS_WRN, "Warning : non-zero texdef detected in Brush_Create .. need brush primitive conversion\n" ); } } #endif diff --git a/radiant/brush_primit.cpp b/radiant/brush_primit.cpp index 322c3b27..a69ab403 100644 --- a/radiant/brush_primit.cpp +++ b/radiant/brush_primit.cpp @@ -103,11 +103,11 @@ void FaceToBrushPrimitFace( face_t *f ){ strcpy(f->brushprimit_texdef.name,f->texdef.name); */ #ifdef DBG_BP if ( f->plane.normal[0] == 0.0f && f->plane.normal[1] == 0.0f && f->plane.normal[2] == 0.0f ) { - Sys_Printf( "Warning : f->plane.normal is (0,0,0) in FaceToBrushPrimitFace\n" ); + Sys_FPrintf( SYS_WRN, "Warning : f->plane.normal is (0,0,0) in FaceToBrushPrimitFace\n" ); } // check d_texture if ( !f->d_texture ) { - Sys_Printf( "Warning : f.d_texture is NULL in FaceToBrushPrimitFace\n" ); + Sys_FPrintf( SYS_WRN, "Warning : f.d_texture is NULL in FaceToBrushPrimitFace\n" ); return; } #endif @@ -162,10 +162,10 @@ void EmitBrushPrimitTextureCoordinates( face_t * f, winding_t * w ){ vec_t T = f->brushprimit_texdef.coords[1][0] * x + f->brushprimit_texdef.coords[1][1] * y + f->brushprimit_texdef.coords[1][2]; if ( fabs( S - w->points[i][3] ) > 1e-2 || fabs( T - w->points[i][4] ) > 1e-2 ) { if ( fabs( S - w->points[i][3] ) > 1e-4 || fabs( T - w->points[i][4] ) > 1e-4 ) { - Sys_Printf( "Warning : precision loss in brush -> brush primitive texture computation\n" ); + Sys_FPrintf( SYS_WRN, "Warning : precision loss in brush -> brush primitive texture computation\n" ); } else{ - Sys_Printf( "Warning : brush -> brush primitive texture computation bug detected\n" ); + Sys_FPrintf( SYS_WRN, "Warning : brush -> brush primitive texture computation bug detected\n" ); } } } @@ -181,14 +181,14 @@ void TexMatToFakeTexCoords( vec_t texMat[2][3], float shift[2], float *rot, floa #ifdef DBG_BP // check this matrix is orthogonal if ( fabs( texMat[0][0] * 1.0L * texMat[0][1] + texMat[1][0] * 1.0L * texMat[1][1] ) > ZERO_EPSILON ) { - Sys_Printf( "Warning : non orthogonal texture matrix in TexMatToFakeTexCoords\n" ); + Sys_FPrintf( SYS_WRN, "Warning : non orthogonal texture matrix in TexMatToFakeTexCoords\n" ); } #endif scale[0] = sqrt( texMat[0][0] * 1.0L * texMat[0][0] + texMat[1][0] * 1.0L * texMat[1][0] ); scale[1] = sqrt( texMat[0][1] * 1.0L * texMat[0][1] + texMat[1][1] * 1.0L * texMat[1][1] ); #ifdef DBG_BP if ( scale[0] < ZERO_EPSILON || scale[1] < ZERO_EPSILON ) { - Sys_Printf( "Warning : unexpected scale==0 in TexMatToFakeTexCoords\n" ); + Sys_FPrintf( SYS_WRN, "Warning : unexpected scale==0 in TexMatToFakeTexCoords\n" ); } #endif // compute rotate value @@ -196,7 +196,7 @@ void TexMatToFakeTexCoords( vec_t texMat[2][3], float shift[2], float *rot, floa #ifdef DBG_BP // check brushprimit_texdef[1][0] is not zero if ( fabs( texMat[1][0] ) < ZERO_EPSILON ) { - Sys_Printf( "Warning : unexpected texdef[1][0]==0 in TexMatToFakeTexCoords\n" ); + Sys_FPrintf( SYS_WRN, "Warning : unexpected texdef[1][0]==0 in TexMatToFakeTexCoords\n" ); } #endif // rotate is +-90 diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 8a952be0..87df69c1 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -1634,7 +1634,7 @@ void CamWnd::Cam_Draw(){ void CamWnd::OnExpose(){ if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: glXMakeCurrent failed..\n " ); + Sys_FPrintf( SYS_ERR, "ERROR: glXMakeCurrent failed..\n " ); Sys_Printf( "Please restart Radiant if the camera view is not working\n" ); } else diff --git a/radiant/eclass.cpp b/radiant/eclass.cpp index df503f4f..4b2e1fbc 100644 --- a/radiant/eclass.cpp +++ b/radiant/eclass.cpp @@ -445,7 +445,7 @@ eclass_t *Eclass_ForName( const char *name, qboolean has_brushes ){ #ifdef _DEBUG // grouping stuff, not an eclass if ( strcmp( name, "group_info" ) == 0 ) { - Sys_Printf( "WARNING: unexpected group_info entity in Eclass_ForName\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: unexpected group_info entity in Eclass_ForName\n" ); } #endif diff --git a/radiant/glinterface.cpp b/radiant/glinterface.cpp index ea86be65..6f6307db 100644 --- a/radiant/glinterface.cpp +++ b/radiant/glinterface.cpp @@ -49,7 +49,7 @@ void WINAPI QERApp_UnHookGL2DWindow( IGL2DWindow* pGLW ){ } } #ifdef _DEBUG - Sys_Printf( "ERROR: IGL2DWindow* not found in QERApp_UnHookGL2DWindow\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: IGL2DWindow* not found in QERApp_UnHookGL2DWindow\n" ); #endif } @@ -73,7 +73,7 @@ void WINAPI QERApp_UnHookGL3DWindow( IGL3DWindow* pGLW ){ } } #ifdef _DEBUG - Sys_Printf( "ERROR: IGL3DWindow* not found in QERApp_UnHookGL3DWindow\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: IGL3DWindow* not found in QERApp_UnHookGL3DWindow\n" ); #endif } diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp index 4b2bb4ee..211eda02 100644 --- a/radiant/groupdialog.cpp +++ b/radiant/groupdialog.cpp @@ -826,7 +826,7 @@ void Group_AddToProperGroup( brush_t *b ){ Group_AddToItem(b, g->itemOwner); #ifdef _DEBUG else - Sys_Printf("WARNING: unexpected Group_ForName not found in Group_AddToProperGroup\n"); + Sys_FPrintf(SYS_WRN, "WARNING: unexpected Group_ForName not found in Group_AddToProperGroup\n"); #endif } else diff --git a/radiant/main.cpp b/radiant/main.cpp index bd095550..725f9b64 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -697,13 +697,13 @@ int main( int argc, char* argv[] ) { chomp++; buf[chomp] = '\0'; if ( strcmp( buf, RADIANT_MAJOR_VERSION ) ) { - Sys_Printf( "ERROR: file RADIANT_MAJOR doesn't match ('%s')\n", buf ); + Sys_FPrintf( SYS_ERR, "ERROR: file RADIANT_MAJOR doesn't match ('%s')\n", buf ); bVerIsGood = false; } } else { - Sys_Printf( "ERROR: can't find RADIANT_MAJOR in '%s'\n", ver_file_name.GetBuffer() ); + Sys_FPrintf( SYS_ERR, "ERROR: can't find RADIANT_MAJOR in '%s'\n", ver_file_name.GetBuffer() ); bVerIsGood = false; } ver_file_name = g_strAppPath; @@ -719,13 +719,13 @@ int main( int argc, char* argv[] ) { chomp++; buf[chomp] = '\0'; if ( strcmp( buf, RADIANT_MINOR_VERSION ) ) { - Sys_Printf( "ERROR: file RADIANT_MINOR doesn't match ('%s')\n", buf ); + Sys_FPrintf( SYS_ERR, "ERROR: file RADIANT_MINOR doesn't match ('%s')\n", buf ); bVerIsGood = false; } } else { - Sys_Printf( "ERROR: can't find RADIANT_MINOR in '%s'\n", ver_file_name.GetBuffer() ); + Sys_FPrintf( SYS_ERR, "ERROR: can't find RADIANT_MINOR in '%s'\n", ver_file_name.GetBuffer() ); bVerIsGood = false; } if ( !bVerIsGood ) { @@ -1098,7 +1098,7 @@ static gboolean RunBsp_CaptureOutput(void *data) { } if ( pid == -1 ) { - Sys_Printf( "Failed to wait for %d: %s\n", process->pid, strerror( errno ) ); + Sys_FPrintf( SYS_ERR, "ERROR: Failed to wait for %d: %s\n", process->pid, strerror( errno ) ); } else { Sys_Printf( "Process %d terminated with status %d\n", process->pid, process->status ); } diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 7167c319..4fb3b198 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -2536,7 +2536,7 @@ void MainFrame::Create(){ gtk_window_set_icon_from_file( GTK_WINDOW( window ), icon.GetBuffer(), &error ); if ( error != NULL ) { - Sys_Printf( "Failed to load icon: %s\n", error->message ); + Sys_FPrintf( SYS_ERR, "ERROR: Failed to load icon: %s\n", error->message ); g_error_free( error ); } } @@ -3203,7 +3203,7 @@ void MainFrame::OnSleep(){ { #ifdef DBG_SLEEP if (ent->md3Class) - Sys_Printf("WARNING: unexpected ent->md3Class!=NULL with ent->eclass->model!=NULL\n"); + Sys_FPrintf(SYS_WRN, "WARNING: unexpected ent->md3Class!=NULL with ent->eclass->model!=NULL\n"); #endif entitymodel_t *model; for (model = ent->eclass->model; model; model=model->pNext) @@ -3216,7 +3216,7 @@ void MainFrame::OnSleep(){ } #ifdef DBG_SLEEP else - Sys_Printf("WARNING: entity %p %s with fixedsize and no model no md3Class\n", ent, ent->eclass->name); + Sys_FPrintf(SYS_WRN, "WARNING: entity %p %s with fixedsize and no model no md3Class\n", ent, ent->eclass->name); #endif } } @@ -3497,7 +3497,7 @@ void MainFrame::LoadCommandMap(){ } } if ( j == g_nKeyCount ) { - Sys_Printf( "WARNING: failed to parse user command %s\n", value ); + Sys_FPrintf( SYS_WRN, "WARNING: failed to parse user command %s\n", value ); continue; } } diff --git a/radiant/map.cpp b/radiant/map.cpp index 078f7719..37cf8e99 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -391,7 +391,7 @@ void Map_ImportEntities( CPtrArray *ents, bool bAddSelected = false ){ } } else{ - Sys_Printf( "WARNING: no terrain shader found for brush\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: no terrain shader found for brush\n" ); } } } @@ -1038,7 +1038,7 @@ void Map_RegionSelectedBrushes( void ){ #ifdef _DEBUG if ( filtered_brushes.next != &filtered_brushes ) { - Sys_Printf( "WARNING: filtered_brushes list may not be empty in Map_RegionSelectedBrushes\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: filtered_brushes list may not be empty in Map_RegionSelectedBrushes\n" ); } #endif diff --git a/radiant/parse.cpp b/radiant/parse.cpp index ecfc4c4b..8ab9e1dd 100644 --- a/radiant/parse.cpp +++ b/radiant/parse.cpp @@ -57,14 +57,14 @@ skipspace: { if ( !*script_p ) { if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [01]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [01]\n",scriptline ); } return false; } if ( *script_p++ == '\n' ) { if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [02]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [02]\n",scriptline ); } scriptline++; } @@ -72,12 +72,12 @@ skipspace: if ( script_p[0] == '/' && script_p[1] == '/' ) { // comment field if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [03]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [03]\n",scriptline ); } while ( *script_p++ != '\n' ) if ( !*script_p ) { if ( !crossline ) { - Sys_Printf( "Warning: Line %i is incomplete [04]\n",scriptline ); + Sys_FPrintf( SYS_WRN, "Warning: Line %i is incomplete [04]\n",scriptline ); } return false; } diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index a7821649..7707afbb 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -694,7 +694,7 @@ void PatchDialog::GetPatchInfo(){ } else{ - Sys_Printf( "WARNING: no patch\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: no patch\n" ); } // fill in our internal structs m_nRow = 0; m_nCol = 0; diff --git a/radiant/pluginmanager.cpp b/radiant/pluginmanager.cpp index 1c77289a..fac90cbf 100644 --- a/radiant/pluginmanager.cpp +++ b/radiant/pluginmanager.cpp @@ -719,7 +719,7 @@ void CPlugInManager::Cleanup(){ //++timo FIXME: for now I leave a leak warning, we'd need a table to keep track of commited patches #ifdef _DEBUG if ( m_PluginPatches.GetSize() != 0 ) { - Sys_Printf( "WARNING: m_PluginPatches.GetSize() != 0 in CPlugInManager::Cleanup, possible leak\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: m_PluginPatches.GetSize() != 0 in CPlugInManager::Cleanup, possible leak\n" ); } #endif @@ -859,7 +859,7 @@ patchMesh_t* CPlugInManager::FindPatchHandle( int index ){ return pb->pPatch; } #ifdef _DEBUG - Sys_Printf( "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); #endif break; case EAllocatedPatches: @@ -868,7 +868,7 @@ patchMesh_t* CPlugInManager::FindPatchHandle( int index ){ return pPatch; } #ifdef _DEBUG - Sys_Printf( "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: out of bounds in CPlugInManager::FindPatchHandle\n" ); #endif break; } @@ -1066,7 +1066,7 @@ _QERFaceData* WINAPI QERApp_GetFaceData( void* pv, int nFaceIndex ){ #ifdef _DEBUG if ( !pBrush->brush_faces ) { - Sys_Printf( "Warning : pBrush->brush_faces is NULL in QERApp_GetFaceData\n" ); + Sys_FPrintf( SYS_WRN, "Warning : pBrush->brush_faces is NULL in QERApp_GetFaceData\n" ); return NULL; } #endif @@ -1500,7 +1500,7 @@ qtexture_t* WINAPI QERApp_Texture_ForName( const char *name ){ gtk_glwidget_make_current( g_qeglobals_gui.d_glBase ); //++timo debugging - Sys_Printf( "WARNING: QERApp_Texture_ForName ... don't call that!!\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: QERApp_Texture_ForName ... don't call that!!\n" ); qtexture_t* qtex = QERApp_Texture_ForName2( name ); return qtex; } @@ -1547,7 +1547,7 @@ void CPlugInManager::CommitEntityHandleToMap( void* vpEntity ){ // fixedsize if ( e->fixedsize ) { if ( pe->brushes.onext != &pe->brushes ) { - Sys_Printf( "Warning : Fixed size entity with brushes in CPlugInManager::CommitEntityHandleToMap\n" ); + Sys_FPrintf( SYS_WRN, "Warning : Fixed size entity with brushes in CPlugInManager::CommitEntityHandleToMap\n" ); } // create a custom brush VectorAdd( e->mins, pe->origin, mins ); @@ -1590,7 +1590,7 @@ void CPlugInManager::CommitEntityHandleToMap( void* vpEntity ){ else { // brush entity if ( pe->brushes.next == &pe->brushes ) { - Sys_Printf( "Warning: Brush entity with no brushes in CPlugInManager::CommitEntityHandleToMap\n" ); + Sys_FPrintf( SYS_WRN, "Warning: Brush entity with no brushes in CPlugInManager::CommitEntityHandleToMap\n" ); } } @@ -1636,7 +1636,7 @@ void CPlugInManager::CommitEntityHandleToMap( void* vpEntity ){ world_entity = pe; } else{ - Sys_Printf( "Warning : unexpected world_entity == NULL in CommitEntityHandleToMap\n" ); + Sys_FPrintf( SYS_WRN, "Warning : unexpected world_entity == NULL in CommitEntityHandleToMap\n" ); } } } @@ -1673,7 +1673,7 @@ patchMesh_t* QERApp_GetSelectedPatch(){ } } #ifdef _DEBUG - Sys_Printf( "WARNING: QERApp_GetSelectedPatchTexdef called with no patch selected\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: QERApp_GetSelectedPatchTexdef called with no patch selected\n" ); #endif return NULL; } @@ -1765,7 +1765,7 @@ void WINAPI QERApp_DeletePatch( int index ){ } } #ifdef _DEBUG - Sys_Printf( "Warning: QERApp_DeletePatch: FindPatchHandle failed\n" ); + Sys_FPrintf( SYS_WRN, "Warning: QERApp_DeletePatch: FindPatchHandle failed\n" ); #endif } diff --git a/radiant/pmesh.cpp b/radiant/pmesh.cpp index aab43c20..041cd7ce 100644 --- a/radiant/pmesh.cpp +++ b/radiant/pmesh.cpp @@ -1378,7 +1378,7 @@ brush_t* Patch_GenericMesh( int nWidth, int nHeight, int nOrientation, bool bDel } if ( !bOverride && !QE_SingleBrush() ) { - Sys_Printf( "Error: you must have a single brush selected\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: you must have a single brush selected\n" ); return NULL; } @@ -4956,7 +4956,7 @@ void Patch_ShiftTextureST( patchMesh_t *p, float fx, float fy ){ #ifdef _DEBUG // NOTE: when called by Patch_ShiftTexture this warning may be bogus if ( ( ABS( fx ) >= 1 ) || ( ABS( fy ) >= 1 ) ) { - Sys_Printf( "WARNING: increments exceed 1 in Patch_ShiftTextureST\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: increments exceed 1 in Patch_ShiftTextureST\n" ); } #endif for ( int w = 0; w < p->width; w++ ) diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp index 358d3939..1904aa41 100644 --- a/radiant/qe3.cpp +++ b/radiant/qe3.cpp @@ -108,7 +108,7 @@ void WINAPI QE_CheckOpenGLForErrors( void ){ } else { - Sys_Printf( "Warning: OpenGL Error %s\n", qgluErrorString( (GLenum)i ) ); + Sys_FPrintf( SYS_WRN, "WARNING: OpenGL Error %s\n", qgluErrorString( (GLenum)i ) ); } } } @@ -802,13 +802,13 @@ qboolean QE_SingleBrush( bool bQuiet ){ if ( ( selected_brushes.next == &selected_brushes ) || ( selected_brushes.next->next != &selected_brushes ) ) { if ( !bQuiet ) { - Sys_Printf( "Error: you must have a single brush selected\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: you must have a single brush selected\n" ); } return false; } if ( selected_brushes.next->owner->eclass->fixedsize ) { if ( !bQuiet ) { - Sys_Printf( "Error: you cannot manipulate fixed size entities\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: you cannot manipulate fixed size entities\n" ); } return false; } diff --git a/radiant/select.cpp b/radiant/select.cpp index de8ea82e..b0584136 100644 --- a/radiant/select.cpp +++ b/radiant/select.cpp @@ -849,7 +849,7 @@ void ComputeAbsolute( face_t* f, vec3_t& p1, vec3_t& p2, vec3_t& p3 ){ #ifdef _DEBUG if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning : illegal call of ComputeAbsolute in brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning : illegal call of ComputeAbsolute in brush primitive mode\n" ); } #endif @@ -898,7 +898,7 @@ void AbsoluteToLocal( plane_t normal2, face_t* f, vec3_t& p1, vec3_t& p2, vec3_t #ifdef _DEBUG if ( g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning : illegal call of AbsoluteToLocal in brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning : illegal call of AbsoluteToLocal in brush primitive mode\n" ); } #endif diff --git a/radiant/selectedface.cpp b/radiant/selectedface.cpp index 0b1ab2e5..f0a90ed5 100644 --- a/radiant/selectedface.cpp +++ b/radiant/selectedface.cpp @@ -56,7 +56,7 @@ int WINAPI QERApp_GetFaceInfo( int iface, _QERFaceData *pFaceData, winding_t *pW return 0; } if ( !g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning: unexpected QERApp_GetFaceInfo out of brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning: unexpected QERApp_GetFaceInfo out of brush primitive mode\n" ); return 0; } face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( iface ) ); @@ -77,7 +77,7 @@ int WINAPI QERApp_SetFaceInfo( int iface, _QERFaceData *pFaceData ){ return 0; } if ( !g_qeglobals.m_bBrushPrimitMode ) { - Sys_Printf( "Warning: unexpected QERApp_SetFaceInfo out of brush primitive mode\n" ); + Sys_FPrintf( SYS_WRN, "Warning: unexpected QERApp_SetFaceInfo out of brush primitive mode\n" ); return 0; } face_t *selFace = reinterpret_cast( g_ptrSelectedFaces.GetAt( iface ) ); diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index fec10311..08f106fe 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -375,7 +375,7 @@ static void OnBtnMatchGrid( GtkWidget *widget, gpointer data ){ hscale = gtk_spin_button_get_value_as_float( GTK_SPIN_BUTTON( g_dlgSurface.GetDlgWidget( "hscale" ) ) ); vscale = gtk_spin_button_get_value_as_float( GTK_SPIN_BUTTON( g_dlgSurface.GetDlgWidget( "vscale" ) ) ); if ( hscale == 0.0f || vscale == 0.0f ) { - Sys_Printf( "ERROR: unexpected scale == 0.0f\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: unexpected scale == 0.0f\n" ); return; } DoSnapTToGrid( hscale, vscale ); diff --git a/radiant/surfaceplugin.cpp b/radiant/surfaceplugin.cpp index 4de5754c..8b215235 100644 --- a/radiant/surfaceplugin.cpp +++ b/radiant/surfaceplugin.cpp @@ -41,7 +41,7 @@ void QERApp_GetTwoSelectedPatch( patchMesh_t **p1, patchMesh_t **p2 ){ } } #ifdef _DEBUG - Sys_Printf( "WARNING: QERApp_GetTwoSelectedPatch failed (did not find two patches)\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: QERApp_GetTwoSelectedPatch failed (did not find two patches)\n" ); #endif return; } diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index a542e4dc..ec20e357 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1086,7 +1086,7 @@ IShader* Texture_NextPos( int *x, int *y ){ nCurrentShader++; pCurrentShader = QERApp_ActiveShader_ForIndex( nCurrentShader ); if ( pCurrentShader == NULL ) { - Sys_Printf( "ERROR: unexpected pCurrentShader == NULL in Texture_NextPos\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: unexpected pCurrentShader == NULL in Texture_NextPos\n" ); return NULL; } current_texture = pCurrentShader->getTexture(); @@ -1285,7 +1285,7 @@ void SelectTexture( int mx, int my, bool bShift, bool bFitScale ){ && my < y && y - my < nHeight + FONT_HEIGHT ) { if ( bShift ) { if ( pCurrentShader->IsDefault() ) { - Sys_Printf( "ERROR: %s is not a shader, it's a texture.\n", pCurrentShader->getName() ); + Sys_FPrintf( SYS_ERR, "ERROR: %s is not a shader, it's a texture.\n", pCurrentShader->getName() ); } else{ ViewShader( pCurrentShader->getShaderFileName(), pCurrentShader->getName() ); @@ -1321,7 +1321,7 @@ void SelectTexture( int mx, int my, bool bShift, bool bFitScale ){ #ifdef _DEBUG // this one is never supposed to be set as current one if ( pAuxShader->IsColor() ) { - Sys_Printf( "ERROR: unexpected pCurrentShader->IsColor() in SelectTexture\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: unexpected pCurrentShader->IsColor() in SelectTexture\n" ); } #endif // NOTE: IsColor is false, IsDefault the only remaining property @@ -1701,7 +1701,7 @@ void TexWnd::OnSize( int cx, int cy ){ void TexWnd::OnExpose() { int nOld = g_qeglobals.d_texturewin.m_nTotalHeight; if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: glXMakeCurrent failed..\n " ); + Sys_FPrintf( SYS_ERR, "ERROR: glXMakeCurrent failed..\n " ); Sys_Printf( "Please restart Radiant if the Texture view is not working\n" ); } else diff --git a/radiant/ui.cpp b/radiant/ui.cpp index 2289bdd6..973f15b7 100644 --- a/radiant/ui.cpp +++ b/radiant/ui.cpp @@ -170,7 +170,7 @@ void WINAPI QERApp_UnHookWindow( IWindowListener* pListen ){ } } #ifdef _DEBUG - Sys_Printf( "WARNING: IWindowListener not found in QERApp_UnHookWindow\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: IWindowListener not found in QERApp_UnHookWindow\n" ); #endif } @@ -198,7 +198,7 @@ bool DispatchOnLButtonUp( guint32 nFlags, int x, int y ){ void WINAPI QERApp_HookListener( IListener* pListen, int Msg ){ #ifdef _DEBUG if ( Msg >= RADIANT_MSGCOUNT ) { - Sys_Printf( "ERROR: bad index in QERApp_HookListener\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: bad index in QERApp_HookListener\n" ); return; } #endif @@ -221,7 +221,7 @@ int WINAPI QERApp_UnHookListener( IListener* pListen ){ void DispatchRadiantMsg( int Msg ){ #ifdef _DEBUG if ( Msg >= RADIANT_MSGCOUNT ) { - Sys_Printf( "ERROR: bad index in DispatchRadiantMsg\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: bad index in DispatchRadiantMsg\n" ); return; } #endif diff --git a/radiant/undo.cpp b/radiant/undo.cpp index f56a65b6..c5e9de70 100644 --- a/radiant/undo.cpp +++ b/radiant/undo.cpp @@ -227,7 +227,7 @@ void Undo_GeneralStart( const char *operation ){ if ( g_lastundo ) { if ( !g_lastundo->done ) { - Sys_Printf( "Undo_Start: WARNING last undo not finished.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING last undo not finished.\n" ); } } @@ -363,7 +363,7 @@ void Undo_AddBrush( brush_t *pBrush ){ return; } if ( g_lastundo->entitylist.next != &g_lastundo->entitylist ) { - Sys_Printf( "Undo_AddBrushList: WARNING adding brushes after entity.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING adding brushes after entity.\n" ); } //if the brush is already in the undo if ( Undo_BrushInUndo( g_lastundo, pBrush ) ) { @@ -406,7 +406,7 @@ void Undo_AddBrushList( brush_t *brushlist ){ return; } if ( g_lastundo->entitylist.next != &g_lastundo->entitylist ) { - Sys_Printf( "Undo_AddBrushList: WARNING adding brushes after entity.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING adding brushes after entity.\n" ); } //copy the brushes to the undo for ( pBrush = brushlist->next ; pBrush != NULL && pBrush != brushlist; pBrush = pBrush->next ) @@ -626,7 +626,7 @@ void Undo_Undo( qboolean bSilent ){ return; } if ( !g_lastundo->done ) { - Sys_Printf( "Undo_Undo: WARNING: last undo not yet finished!\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: last undo not yet finished!\n" ); } // get the last undo undo = g_lastundo; @@ -801,7 +801,7 @@ void Undo_Redo( void ){ } if ( g_lastundo ) { if ( !g_lastundo->done ) { - Sys_Printf( "WARNING: last undo not finished.\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: last undo not finished.\n" ); } } // get the last redo diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp index 31b88d40..0e0c9c87 100644 --- a/radiant/watchbsp.cpp +++ b/radiant/watchbsp.cpp @@ -150,7 +150,7 @@ static void saxEndElement( message_info_t *data, const xmlChar *name ) { } if ( data->recurse == data->stop_depth ) { #ifdef _DEBUG - Sys_Printf( "Received error msg .. shutting down..\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: Received error msg .. shutting down..\n" ); #endif // tell there has been an error if ( g_pParentWnd->GetWatchBSP()->HasBSPPlugin() ) { @@ -358,7 +358,7 @@ void CWatchBSP::Reset(){ bool CWatchBSP::SetupListening(){ #ifdef _DEBUG if ( m_pListenSocket ) { - Sys_Printf( "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n" ); return false; } #endif @@ -442,7 +442,7 @@ void CWatchBSP::RoutineProcessing(){ #ifdef _DEBUG // some debug checks if ( !m_pListenSocket ) { - Sys_Printf( "ERROR: m_pListenSocket == NULL in CWatchBSP::RoutineProcessing EBeginStep state\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: m_pListenSocket == NULL in CWatchBSP::RoutineProcessing EBeginStep state\n" ); Reset(); break; } @@ -462,7 +462,7 @@ void CWatchBSP::RoutineProcessing(){ #ifdef _DEBUG // some debug checks if ( !m_pInSocket ) { - Sys_Printf( "ERROR: m_pInSocket == NULL in CWatchBSP::RoutineProcessing EWatching state\n" ); + Sys_FPrintf( SYS_ERR, "ERROR: m_pInSocket == NULL in CWatchBSP::RoutineProcessing EWatching state\n" ); Reset(); break; } @@ -478,7 +478,7 @@ void CWatchBSP::RoutineProcessing(){ // (no use on windows) ret = select( m_pInSocket->socket + 1, &readfds, NULL, NULL, &tout ); if ( ret == SOCKET_ERROR ) { - Sys_Printf( "WARNING: SOCKET_ERROR in CWatchBSP::RoutineProcessing\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: SOCKET_ERROR in CWatchBSP::RoutineProcessing\n" ); Sys_Printf( "Terminating the connection.\n" ); Reset(); break; diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 72d1c53a..53c58ffe 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -3195,7 +3195,7 @@ void XYWnd::OnCreate(){ void XYWnd::OnExpose(){ bool bPaint = true; if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: glXMakeCurrent failed.. Error:%i\n",qglGetError() ); + Sys_FPrintf( SYS_ERR, "ERROR: glXMakeCurrent failed.. Error:%i\n",qglGetError() ); Sys_Printf( "Please restart Radiant if the Map view is not working\n" ); bPaint = false; } diff --git a/radiant/zwindow.cpp b/radiant/zwindow.cpp index 12e510a1..810ea526 100644 --- a/radiant/zwindow.cpp +++ b/radiant/zwindow.cpp @@ -90,7 +90,7 @@ void ZWnd::OnMouseMove( guint32 nFlags, int pointx, int pointy ){ void ZWnd::OnExpose(){ if ( !MakeCurrent() ) { - Sys_Printf( "ERROR: wglMakeCurrent failed..\n " ); + Sys_FPrintf( SYS_ERR, "ERROR: wglMakeCurrent failed..\n " ); Sys_Printf( "Please restart Radiant if the Z view is not working\n" ); } else diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.c index 8f2493e6..3e49696c 100644 --- a/tools/quake3/common/aselib.c +++ b/tools/quake3/common/aselib.c @@ -217,7 +217,7 @@ polyset_t *ASE_GetSurfaceAnimation( int which, int *pNumFrames, int skipFrameSta { numFramesInAnimation = pObject->anim.numFrames; if ( maxFrames != -1 ) { - Sys_Printf( "WARNING: ASE_GetSurfaceAnimation maxFrames > numFramesInAnimation\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: ASE_GetSurfaceAnimation maxFrames > numFramesInAnimation\n" ); } } diff --git a/tools/quake3/common/scriplib.c b/tools/quake3/common/scriplib.c index 2a18e96f..acd8d5ad 100644 --- a/tools/quake3/common/scriplib.c +++ b/tools/quake3/common/scriplib.c @@ -153,7 +153,7 @@ qboolean EndOfScript( qboolean crossline ){ } if ( script->buffer == NULL ) { - Sys_Printf( "WARNING: Attempt to free already freed script buffer\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Attempt to free already freed script buffer\n" ); } else{ free( script->buffer ); diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c index 5f9faa4a..384933d6 100644 --- a/tools/quake3/q3map2/bsp.c +++ b/tools/quake3/q3map2/bsp.c @@ -188,7 +188,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_FPrintf( SYS_WRN, "WARNING: Cloned entity %s referenced entity without model\n", value2 ); continue; } models = atoi( &value2[ 1 ] ); @@ -847,7 +847,7 @@ int BSPMain( int argc, char **argv ){ Sys_Printf( "-bsp argument unnecessary\n" ); } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c index 524d5cc3..881ea2d5 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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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 0bbb5816..628bec2f 100644 --- a/tools/quake3/q3map2/convert_ase.c +++ b/tools/quake3/q3map2/convert_ase.c @@ -242,7 +242,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_FPrintf( SYS_WRN, "WARNING: NULL shader in BSP\n" ); return; } diff --git a/tools/quake3/q3map2/decals.c b/tools/quake3/q3map2/decals.c index cd5525c7..64244ca5 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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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..b1236608 100644 --- a/tools/quake3/q3map2/exportents.c +++ b/tools/quake3/q3map2/exportents.c @@ -64,7 +64,7 @@ void ExportEntities( void ){ /* sanity check */ if ( bspEntData == NULL || bspEntDataSize == 0 ) { - Sys_Printf( "WARNING: No BSP entity data. aborting...\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP entity data. aborting...\n" ); return; } diff --git a/tools/quake3/q3map2/image.c b/tools/quake3/q3map2/image.c index 2af46a6f..e54bef94 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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); return; } @@ -139,27 +139,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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Unable to create PNG end info struct\n" ); png_destroy_read_struct( &png, &info, NULL ); return; } @@ -172,7 +172,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_FPrintf( SYS_WRN, "WARNING: An error occurred reading PNG image\n" ); png_destroy_read_struct( &png, &info, &end ); return; } @@ -402,7 +402,7 @@ image_t *ImageLoad( const char *filename ){ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 ); if ( size > 0 ) { if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) { - Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); + Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); } } else diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c index 943c88e7..2af9ac49 100644 --- a/tools/quake3/q3map2/light.c +++ b/tools/quake3/q3map2/light.c @@ -426,7 +426,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_FPrintf( SYS_WRN, "WARNING: light at (%i %i %i) has missing target\n", (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] ); } else @@ -1996,7 +1996,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_FPrintf( SYS_WRN, "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); lmCustomSize = game->lightmapSize; } i++; @@ -2249,7 +2249,7 @@ int LightMain( int argc, char **argv ){ /* unhandled args */ else{ - Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c index cb0430ea..8d653e3b 100644 --- a/tools/quake3/q3map2/light_ydnar.c +++ b/tools/quake3/q3map2/light_ydnar.c @@ -1613,7 +1613,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 S vector\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap S vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 0 ] ); @@ -1637,7 +1637,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_FPrintf( SYS_WRN, "WARNING: Spurious lightmap T vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 1 ] ); @@ -1966,7 +1966,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_FPrintf( SYS_WRN, "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); continue; } @@ -3366,7 +3366,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_FPrintf( SYS_WRN, "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 9f8d6bec..2079cbb0 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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", filename, width, height, game->lightmapSize, game->lightmapSize ); } @@ -734,7 +734,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_FPrintf( SYS_WRN, "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); lm->w = lm->h = 0; return qfalse; } @@ -946,7 +946,7 @@ void SetupSurfaceLightmaps( void ){ superSample = 1; } else if ( superSample > 8 ) { - Sys_Printf( "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); + Sys_FPrintf( SYS_WRN, "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 1729773e..3a92b6f5 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -218,7 +218,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_FPrintf( SYS_WRN, "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 9c3041c9..f491b7b7 100644 --- a/tools/quake3/q3map2/map.c +++ b/tools/quake3/q3map2/map.c @@ -1399,13 +1399,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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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; } @@ -1416,7 +1416,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_FPrintf( SYS_WRN, "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; } @@ -1475,7 +1475,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_FPrintf( SYS_WRN, "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; @@ -1555,7 +1555,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ /* 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_FPrintf( SYS_WRN, "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; @@ -1581,7 +1581,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ { /* get initial token */ if ( !GetToken( qtrue ) ) { - Sys_Printf( "WARNING: ParseEntity: EOF without closing brace\n" + Sys_FPrintf( SYS_WRN, "WARNING: ParseEntity: EOF without closing brace\n" "Continuing to process map, but resulting BSP may be invalid.\n" ); return qfalse; } @@ -1603,7 +1603,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ } else if ( !strcmp( token, "terrainDef" ) ) { //% ParseTerrain(); - Sys_Printf( "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ + Sys_FPrintf( SYS_WRN, "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ } else if ( !strcmp( token, "brushDef" ) ) { if ( g_bBrushPrimit == BPRIMIT_OLDBRUSHES ) { @@ -1814,7 +1814,7 @@ void LoadMapFile( char *filename, qboolean onlyLights ){ /* 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_FPrintf( SYS_WRN, "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 a6daedf0..a3028fdb 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_FPrintf( SYS_WRN, "WARNING: %s\n", str ); break; case PICO_ERROR: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_ERR, "ERROR: %s\n", str ); break; case PICO_FATAL: @@ -427,7 +427,7 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade { /* overflow hack */ if ( ( nummapplanes + 64 ) >= ( MAX_MAP_PLANES >> 1 ) ) { - Sys_Printf( "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", + Sys_FPrintf( SYS_WRN, "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", MAX_MAP_PLANES, name ); break; } @@ -609,7 +609,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_FPrintf( SYS_WRN, "WARNING: misc_model at %i %i %i without a model key\n", (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] ); continue; } @@ -680,7 +680,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_FPrintf( SYS_WRN, "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 ff1e9845..c8b5cd27 100644 --- a/tools/quake3/q3map2/portals.c +++ b/tools/quake3/q3map2/portals.c @@ -519,7 +519,7 @@ void MakeTreePortals_r( node_t *node ){ CalcNodeBounds( node ); if ( node->mins[0] >= node->maxs[0] ) { - Sys_Printf( "WARNING: node without a volume\n" ); + Sys_FPrintf( SYS_WRN, "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], node->referencepoint[1], @@ -777,7 +777,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_FPrintf( SYS_WRN, "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); return; } if ( b->portalareas[ 0 ] != -1 ) { @@ -864,7 +864,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_FPrintf( SYS_WRN, "WARNING: cluster %d has area set to -1\n", node->cluster ); } } if ( node->areaportal ) { @@ -872,7 +872,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_FPrintf( SYS_WRN, "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); } } } diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c index f747a27d..978856ef 100644 --- a/tools/quake3/q3map2/shaders.c +++ b/tools/quake3/q3map2/shaders.c @@ -357,7 +357,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; } @@ -755,7 +755,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 ); } } @@ -809,7 +809,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"; } @@ -1042,7 +1042,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 ); } } @@ -1485,7 +1485,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 ); } } @@ -1500,7 +1500,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; @@ -1635,7 +1635,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 ] ); } @@ -1720,7 +1720,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 ); } } @@ -1758,7 +1758,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 ); } } @@ -1848,7 +1848,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 ); } } @@ -1870,7 +1870,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 ); } } } @@ -1932,7 +1932,7 @@ static void ParseCustomInfoParms( void ){ /* 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; } @@ -1958,7 +1958,7 @@ static void ParseCustomInfoParms( void ){ /* 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" ); } } diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c index 061e8ab6..b41375f3 100644 --- a/tools/quake3/q3map2/surface.c +++ b/tools/quake3/q3map2/surface.c @@ -568,7 +568,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_FPrintf( SYS_WRN, "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; @@ -589,7 +589,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_FPrintf( SYS_WRN, "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); } /* ----------------------------------------------------------------- @@ -2450,7 +2450,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_FPrintf( SYS_WRN, "WARNING: %d %s has invalid index %d (%d)\n", numBSPDrawSurfaces, ds->shaderInfo->shader, bspDrawIndexes[ numBSPDrawIndexes ], @@ -3671,7 +3671,7 @@ 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_FPrintf( SYS_WRN, "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 81c195e4..c86058c6 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_FPrintf( SYS_WRN, "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 d4a5018c..3b1db208 100644 --- a/tools/quake3/q3map2/surface_meta.c +++ b/tools/quake3/q3map2/surface_meta.c @@ -1358,7 +1358,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_FPrintf( SYS_WRN, "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 e97144bc..43c9ffaa 100644 --- a/tools/quake3/q3map2/vis.c +++ b/tools/quake3/q3map2/vis.c @@ -203,7 +203,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_FPrintf( SYS_WRN, "WARNING: Leaf portals saw into leaf\n"); // uncompressed[leafnum>>3] |= (1<<(leafnum&7)); @@ -1113,7 +1113,7 @@ int VisMain( int argc, char **argv ){ } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/quake3/q3map2/writebsp.c b/tools/quake3/q3map2/writebsp.c index 8fd073cd..fecd7855 100644 --- a/tools/quake3/q3map2/writebsp.c +++ b/tools/quake3/q3map2/writebsp.c @@ -162,7 +162,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_FPrintf( SYS_WRN, "WARNING: Node brush list corrupted (0x%08X)\n", b ); break; } //% if( b->guard != 0xDEADBEEF ) diff --git a/tools/urt/tools/quake3/q3map2/bsp.c b/tools/urt/tools/quake3/q3map2/bsp.c index 24c49420..500333b6 100644 --- a/tools/urt/tools/quake3/q3map2/bsp.c +++ b/tools/urt/tools/quake3/q3map2/bsp.c @@ -115,7 +115,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_FPrintf( SYS_WRN, "WARNING: Cloned entity %s referenced entity without model\n", value2 ); continue; } models = atoi( &value2[ 1 ] ); @@ -783,7 +783,7 @@ int BSPMain( int argc, char **argv ){ Sys_Printf( "-bsp argument unnecessary\n" ); } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/urt/tools/quake3/q3map2/bspfile_abstract.c b/tools/urt/tools/quake3/q3map2/bspfile_abstract.c index 116f3d33..39935e06 100644 --- a/tools/urt/tools/quake3/q3map2/bspfile_abstract.c +++ b/tools/urt/tools/quake3/q3map2/bspfile_abstract.c @@ -259,7 +259,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_FPrintf( SYS_WRN, "WARNING: GetLumpElements: odd lump size (%d) in lump %d\n", header->lumps[ lump ].length, lump ); return 0; } else{ @@ -303,7 +303,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_FPrintf( SYS_WRN, "WARNING: CopyLump: odd lump size (%d) in lump %d\n", length, lump ); return 0; } else{ diff --git a/tools/urt/tools/quake3/q3map2/convert_ase.c b/tools/urt/tools/quake3/q3map2/convert_ase.c index 0bbb5816..628bec2f 100644 --- a/tools/urt/tools/quake3/q3map2/convert_ase.c +++ b/tools/urt/tools/quake3/q3map2/convert_ase.c @@ -242,7 +242,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_FPrintf( SYS_WRN, "WARNING: NULL shader in BSP\n" ); return; } diff --git a/tools/urt/tools/quake3/q3map2/decals.c b/tools/urt/tools/quake3/q3map2/decals.c index cd5525c7..64244ca5 100644 --- a/tools/urt/tools/quake3/q3map2/decals.c +++ b/tools/urt/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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Decal entity without a valid target, ignoring.\n" ); continue; } diff --git a/tools/urt/tools/quake3/q3map2/exportents.c b/tools/urt/tools/quake3/q3map2/exportents.c index 578f9e42..b1236608 100644 --- a/tools/urt/tools/quake3/q3map2/exportents.c +++ b/tools/urt/tools/quake3/q3map2/exportents.c @@ -64,7 +64,7 @@ void ExportEntities( void ){ /* sanity check */ if ( bspEntData == NULL || bspEntDataSize == 0 ) { - Sys_Printf( "WARNING: No BSP entity data. aborting...\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP entity data. aborting...\n" ); return; } diff --git a/tools/urt/tools/quake3/q3map2/image.c b/tools/urt/tools/quake3/q3map2/image.c index 891bdc9a..39a19854 100644 --- a/tools/urt/tools/quake3/q3map2/image.c +++ b/tools/urt/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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Only DDS texture formats ARGB8888, DXT1, DXT3, and DXT5 are supported (%d)\n", pf ); return; } @@ -139,27 +139,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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Unable to create PNG end info struct\n" ); png_destroy_read_struct( &png, &info, NULL ); return; } @@ -172,7 +172,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_FPrintf( SYS_WRN, "WARNING: An error occurred reading PNG image\n" ); png_destroy_read_struct( &png, &info, &end ); return; } @@ -402,7 +402,7 @@ image_t *ImageLoad( const char *filename ){ size = vfsLoadFile( (const char*) name, (void**) &buffer, 0 ); if ( size > 0 ) { if ( LoadJPGBuff( buffer, size, &image->pixels, &image->width, &image->height ) == -1 && image->pixels != NULL ) { - Sys_Printf( "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); + Sys_FPrintf( SYS_WRN, "WARNING: LoadJPGBuff: %s\n", (unsigned char*) image->pixels ); } } else diff --git a/tools/urt/tools/quake3/q3map2/light.c b/tools/urt/tools/quake3/q3map2/light.c index e4cf8aca..41bbc18e 100644 --- a/tools/urt/tools/quake3/q3map2/light.c +++ b/tools/urt/tools/quake3/q3map2/light.c @@ -424,7 +424,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_FPrintf( SYS_WRN, "WARNING: light at (%i %i %i) has missing target\n", (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] ); } else @@ -2210,7 +2210,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_FPrintf( SYS_WRN, "WARNING: Lightmap size must be a power of 2, greater or equal to 2 pixels.\n" ); lmCustomSize = game->lightmapSize; } i++; @@ -2476,7 +2476,7 @@ int LightMain( int argc, char **argv ){ /* unhandled args */ else{ - Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown argument \"%s\"\n", argv[ i ] ); } } diff --git a/tools/urt/tools/quake3/q3map2/light_ydnar.c b/tools/urt/tools/quake3/q3map2/light_ydnar.c index 94e26e12..674777d1 100644 --- a/tools/urt/tools/quake3/q3map2/light_ydnar.c +++ b/tools/urt/tools/quake3/q3map2/light_ydnar.c @@ -1783,7 +1783,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 S vector\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap S vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 0 ] ); @@ -1807,7 +1807,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_FPrintf( SYS_WRN, "WARNING: Spurious lightmap T vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 1 ] ); @@ -2138,7 +2138,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_FPrintf( SYS_WRN, "WARNING: Hit per-surface style limit (%d)\n", MAX_LIGHTMAPS ); continue; } @@ -3621,7 +3621,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_FPrintf( SYS_WRN, "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/urt/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c index ea276d2c..f434cc41 100644 --- a/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c +++ b/tools/urt/tools/quake3/q3map2/lightmaps_ydnar.c @@ -125,7 +125,7 @@ void ExportLightmaps( void ){ /* sanity check */ if ( bspLightBytes == NULL ) { - Sys_Printf( "WARNING: No BSP lightmap data\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: No BSP lightmap data\n" ); return; } @@ -224,7 +224,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_FPrintf( SYS_WRN, "WARNING: Unable to load image %s\n", filename ); continue; } @@ -235,11 +235,11 @@ int ImportLightmapsMain( int argc, char **argv ){ /* sanity check it */ if ( pixels == NULL ) { - Sys_Printf( "WARNING: Unable to load image %s\n", filename ); + Sys_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "WARNING: Image %s is not the right size (%d, %d) != (%d, %d)\n", filename, width, height, game->lightmapSize, game->lightmapSize ); } @@ -786,7 +786,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_FPrintf( SYS_WRN, "WARNING: ProjectSurfaceLightmap: Chose a 0 valued axis\n" ); lm->w = lm->h = 0; return qfalse; } @@ -1007,7 +1007,7 @@ void SetupSurfaceLightmaps( void ){ superSample = 1; } else if ( superSample > 8 ) { - Sys_Printf( "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); + Sys_FPrintf( SYS_WRN, "WARNING: Insane supersampling amount (%d) detected.\n", superSample ); superSample = 8; } diff --git a/tools/urt/tools/quake3/q3map2/main.c b/tools/urt/tools/quake3/q3map2/main.c index 4000bd38..924881b9 100644 --- a/tools/urt/tools/quake3/q3map2/main.c +++ b/tools/urt/tools/quake3/q3map2/main.c @@ -601,7 +601,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_FPrintf( SYS_WRN, "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/urt/tools/quake3/q3map2/map.c b/tools/urt/tools/quake3/q3map2/map.c index f087784d..203b0b42 100644 --- a/tools/urt/tools/quake3/q3map2/map.c +++ b/tools/urt/tools/quake3/q3map2/map.c @@ -1239,13 +1239,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_FPrintf( SYS_WRN, "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_FPrintf( SYS_WRN, "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; } @@ -1256,7 +1256,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_FPrintf( SYS_WRN, "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; } @@ -1315,7 +1315,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_FPrintf( SYS_WRN, "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; @@ -1395,7 +1395,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ /* 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_FPrintf( SYS_WRN, "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; @@ -1421,7 +1421,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ { /* get initial token */ if ( !GetToken( qtrue ) ) { - Sys_Printf( "WARNING: ParseEntity: EOF without closing brace\n" + Sys_FPrintf( SYS_WRN, "WARNING: ParseEntity: EOF without closing brace\n" "Continuing to process map, but resulting BSP may be invalid.\n" ); return qfalse; } @@ -1443,7 +1443,7 @@ static qboolean ParseMapEntity( qboolean onlyLights ){ } else if ( !strcmp( token, "terrainDef" ) ) { //% ParseTerrain(); - Sys_Printf( "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ + Sys_FPrintf( SYS_WRN, "WARNING: Terrain entity parsing not supported in this build.\n" ); /* ydnar */ } else if ( !strcmp( token, "brushDef" ) ) { if ( g_bBrushPrimit == BPRIMIT_OLDBRUSHES ) { @@ -1654,7 +1654,7 @@ void LoadMapFile( char *filename, qboolean onlyLights ){ /* 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_FPrintf( SYS_WRN, "WARNING: Over 90 percent structural map detected. Compile time may be adversely affected.\n" ); } /* emit some statistics */ diff --git a/tools/urt/tools/quake3/q3map2/model.c b/tools/urt/tools/quake3/q3map2/model.c index f4413b4d..9361c65d 100644 --- a/tools/urt/tools/quake3/q3map2/model.c +++ b/tools/urt/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_FPrintf( SYS_WRN, "WARNING: %s\n", str ); break; case PICO_ERROR: - Sys_Printf( "ERROR: %s\n", str ); + Sys_FPrintf( SYS_ERR, "ERROR: %s\n", str ); break; case PICO_FATAL: @@ -449,7 +449,7 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade { /* overflow hack */ if ( ( nummapplanes + 64 ) >= ( MAX_MAP_PLANES >> 1 ) ) { - Sys_Printf( "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", + Sys_FPrintf( SYS_WRN, "WARNING: MAX_MAP_PLANES (%d) hit generating clip brushes for model %s.\n", MAX_MAP_PLANES, name ); break; } @@ -599,12 +599,12 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade } else { - Sys_Printf( "WARNING: Model %s unable to generate brush - Case 1. %s\n", name,ds->shaderInfo->shader ); + Sys_FPrintf( SYS_WRN, "WARNING: Model %s unable to generate brush - Case 1. %s\n", name,ds->shaderInfo->shader ); } } else { - Sys_Printf( "WARNING: Model %s unable to generate brush - Case 2. %s\n", name,ds->shaderInfo->shader ); + Sys_FPrintf( SYS_WRN, "WARNING: Model %s unable to generate brush - Case 2. %s\n", name,ds->shaderInfo->shader ); } } } @@ -676,7 +676,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_FPrintf( SYS_WRN, "WARNING: misc_model at %i %i %i without a model key\n", (int) origin[ 0 ], (int) origin[ 1 ], (int) origin[ 2 ] ); continue; } @@ -747,7 +747,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_FPrintf( SYS_WRN, "WARNING: Shader _remap key found in misc_model without a ; character\n" ); free( remap ); remap = remap2; continue; diff --git a/tools/urt/tools/quake3/q3map2/portals.c b/tools/urt/tools/quake3/q3map2/portals.c index ff1e9845..c8b5cd27 100644 --- a/tools/urt/tools/quake3/q3map2/portals.c +++ b/tools/urt/tools/quake3/q3map2/portals.c @@ -519,7 +519,7 @@ void MakeTreePortals_r( node_t *node ){ CalcNodeBounds( node ); if ( node->mins[0] >= node->maxs[0] ) { - Sys_Printf( "WARNING: node without a volume\n" ); + Sys_FPrintf( SYS_WRN, "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], node->referencepoint[1], @@ -777,7 +777,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_FPrintf( SYS_WRN, "WARNING: areaportal brush %i touches > 2 areas\n", b->brushNum ); return; } if ( b->portalareas[ 0 ] != -1 ) { @@ -864,7 +864,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_FPrintf( SYS_WRN, "WARNING: cluster %d has area set to -1\n", node->cluster ); } } if ( node->areaportal ) { @@ -872,7 +872,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_FPrintf( SYS_WRN, "WARNING: areaportal brush %i doesn't touch two areas\n", b->brushNum ); } } } diff --git a/tools/urt/tools/quake3/q3map2/shaders.c b/tools/urt/tools/quake3/q3map2/shaders.c index 863a59ef..932c5d07 100644 --- a/tools/urt/tools/quake3/q3map2/shaders.c +++ b/tools/urt/tools/quake3/q3map2/shaders.c @@ -357,7 +357,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; } @@ -754,7 +754,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 ); } } @@ -813,7 +813,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"; } @@ -1046,7 +1046,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 ); } } @@ -1489,7 +1489,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 ); } } @@ -1504,7 +1504,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; @@ -1639,7 +1639,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 ] ); } @@ -1724,7 +1724,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 ); } } @@ -1762,7 +1762,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 ); } } @@ -1852,7 +1852,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 ); } } @@ -1875,7 +1875,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 @@ -1938,7 +1938,7 @@ static void ParseCustomInfoParms( void ){ /* 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; } @@ -1964,7 +1964,7 @@ static void ParseCustomInfoParms( void ){ /* 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" ); } } diff --git a/tools/urt/tools/quake3/q3map2/surface.c b/tools/urt/tools/quake3/q3map2/surface.c index 32a5a9b8..2aec087b 100644 --- a/tools/urt/tools/quake3/q3map2/surface.c +++ b/tools/urt/tools/quake3/q3map2/surface.c @@ -568,7 +568,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_FPrintf( SYS_WRN, "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; @@ -589,7 +589,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_FPrintf( SYS_WRN, "WARNING: Non-planar face (%d): %s\n", ds->planeNum, ds->shaderInfo->shader ); } /* ----------------------------------------------------------------- @@ -2450,7 +2450,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_FPrintf( SYS_WRN, "WARNING: %d %s has invalid index %d (%d)\n", numBSPDrawSurfaces, ds->shaderInfo->shader, bspDrawIndexes[ numBSPDrawIndexes ], @@ -3671,7 +3671,7 @@ 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_FPrintf( SYS_WRN, "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/urt/tools/quake3/q3map2/surface_extra.c b/tools/urt/tools/quake3/q3map2/surface_extra.c index 81c195e4..c86058c6 100644 --- a/tools/urt/tools/quake3/q3map2/surface_extra.c +++ b/tools/urt/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_FPrintf( SYS_WRN, "WARNING: Unable to find surface file %s, using defaults.\n", srfPath ); return; } diff --git a/tools/urt/tools/quake3/q3map2/surface_meta.c b/tools/urt/tools/quake3/q3map2/surface_meta.c index 21a65146..eee5612d 100644 --- a/tools/urt/tools/quake3/q3map2/surface_meta.c +++ b/tools/urt/tools/quake3/q3map2/surface_meta.c @@ -1365,7 +1365,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_FPrintf( SYS_WRN, "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/urt/tools/quake3/q3map2/vis.c b/tools/urt/tools/quake3/q3map2/vis.c index adbefa4b..73420f59 100644 --- a/tools/urt/tools/quake3/q3map2/vis.c +++ b/tools/urt/tools/quake3/q3map2/vis.c @@ -203,7 +203,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_FPrintf( SYS_WRN, "WARNING: Leaf portals saw into leaf\n"); // uncompressed[leafnum>>3] |= (1<<(leafnum&7)); @@ -1119,7 +1119,7 @@ int VisMain( int argc, char **argv ){ } else{ - Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] ); + Sys_FPrintf( SYS_WRN, "WARNING: Unknown option \"%s\"\n", argv[ i ] ); } } diff --git a/tools/urt/tools/quake3/q3map2/writebsp.c b/tools/urt/tools/quake3/q3map2/writebsp.c index 47758f5c..988055d8 100644 --- a/tools/urt/tools/quake3/q3map2/writebsp.c +++ b/tools/urt/tools/quake3/q3map2/writebsp.c @@ -165,7 +165,7 @@ void EmitLeaf( node_t *node ){ { /* something is corrupting brushes */ if ( (int) b < 256 ) { - Sys_Printf( "WARNING: Node brush list corrupted (0x%08X)\n", b ); + Sys_FPrintf( SYS_WRN, "WARNING: Node brush list corrupted (0x%08X)\n", b ); break; } //% if( b->guard != 0xDEADBEEF )