diff --git a/contrib/bobtoolz/DPlane.cpp b/contrib/bobtoolz/DPlane.cpp index 46990854..cb1f9c9b 100644 --- a/contrib/bobtoolz/DPlane.cpp +++ b/contrib/bobtoolz/DPlane.cpp @@ -160,7 +160,7 @@ DWinding* DPlane::BaseWindingForPlane(){ } } if ( x == -1 ) { - globalOutputStream() << "BaseWindingForPlane: no axis found"; + globalWarningStream() << "BaseWindingForPlane: no axis found"; } VectorCopy( vec3_origin, vup ); diff --git a/contrib/bobtoolz/DTrainDrawer.cpp b/contrib/bobtoolz/DTrainDrawer.cpp index da7edcc1..426ec519 100644 --- a/contrib/bobtoolz/DTrainDrawer.cpp +++ b/contrib/bobtoolz/DTrainDrawer.cpp @@ -187,7 +187,7 @@ void operator()( scene::Instance& instance ) const { if ( !strcmp( classname, "info_train_spline_main" ) ) { if ( !targetname ) { - globalOutputStream() << "info_train_spline_main with no targetname"; + globalWarningStream() << "info_train_spline_main with no targetname"; return; } @@ -220,7 +220,7 @@ void operator()( scene::Instance& instance ) const { } else if ( !strcmp( classname, "info_train_spline_control" ) ) { if ( !targetname ) { - globalOutputStream() << "info_train_spline_control with no targetname"; + globalWarningStream() << "info_train_spline_control with no targetname"; return; } @@ -239,7 +239,7 @@ void DTrainDrawer::BuildPaths() { controlPoint_t* pTarget = FindControlPoint( pSP->strTarget ); if ( !pTarget ) { - globalOutputStream() << "couldn't find target " << pSP->strTarget; + globalWarningStream() << "couldn't find target " << pSP->strTarget; return; // continue; } @@ -250,7 +250,7 @@ void DTrainDrawer::BuildPaths() { for ( std::list::iterator cp = pSP->m_pointList.begin(); cp != pSP->m_pointList.end(); cp++ ) { controlPoint_t* pControl = FindControlPoint( ( *cp ).strName ); if ( !pControl ) { - globalOutputStream() << "couldn't find control " << ( *cp ).strName; + globalWarningStream() << "couldn't find control " << ( *cp ).strName; return; } diff --git a/contrib/bobtoolz/DWinding.cpp b/contrib/bobtoolz/DWinding.cpp index c3d81180..ae0714cf 100644 --- a/contrib/bobtoolz/DWinding.cpp +++ b/contrib/bobtoolz/DWinding.cpp @@ -188,12 +188,12 @@ void DWinding::CheckWinding(){ vec3_t dir, edgenormal; if ( numpoints < 3 ) { - globalOutputStream() << "CheckWinding: " << numpoints << " points\n"; + globalWarningStream() << "CheckWinding: " << numpoints << " points\n"; } vec_t area = WindingArea(); if ( area < 1 ) { - globalOutputStream() << "CheckWinding: " << area << " area\n"; + globalWarningStream() << "CheckWinding: " << area << " area\n"; } DPlane* wPlane = WindingPlane(); @@ -205,7 +205,7 @@ void DWinding::CheckWinding(){ int j; for ( j = 0; j < 3; j++ ) if ( p1[j] > BOGUS_RANGE || p1[j] < -BOGUS_RANGE ) { - globalOutputStream() << "CheckFace: BOGUS_RANGE: " << p1[j] << "\n"; + globalWarningStream() << "CheckFace: BOGUS_RANGE: " << p1[j] << "\n"; } j = i + 1 == numpoints ? 0 : i + 1; @@ -213,7 +213,7 @@ void DWinding::CheckWinding(){ // check the point is on the face plane vec_t d = DotProduct( p1, wPlane->normal ) - wPlane->_d; if ( d < -ON_EPSILON || d > ON_EPSILON ) { - globalOutputStream() << "CheckWinding: point off plane\n"; + globalWarningStream() << "CheckWinding: point off plane\n"; } // check the edge isnt degenerate @@ -221,7 +221,7 @@ void DWinding::CheckWinding(){ VectorSubtract( p2, p1, dir ); if ( VectorLength( dir ) < ON_EPSILON ) { - globalOutputStream() << "CheckWinding: degenerate edge\n"; + globalWarningStream() << "CheckWinding: degenerate edge\n"; } CrossProduct( wPlane->normal, dir, edgenormal ); @@ -237,7 +237,7 @@ void DWinding::CheckWinding(){ d = DotProduct( p[j], edgenormal ); if ( d > ( edgedist + ON_EPSILON ) ) { - globalOutputStream() << "CheckWinding: non-convex\n"; + globalWarningStream() << "CheckWinding: non-convex\n"; } } } @@ -344,10 +344,10 @@ bool DWinding::ChopWindingInPlace( DPlane* chopPlane, vec_t epsilon ){ } if ( f->numpoints > maxpts ) { - globalOutputStream() << "ClipWinding: points exceeded estimate\n"; + globalWarningStream() << "ClipWinding: points exceeded estimate\n"; } if ( f->numpoints > MAX_POINTS_ON_WINDING ) { - globalOutputStream() << "ClipWinding: MAX_POINTS_ON_WINDING\n"; + globalWarningStream() << "ClipWinding: MAX_POINTS_ON_WINDING\n"; } delete[] p; @@ -463,10 +463,10 @@ void DWinding::ClipWindingEpsilon( DPlane* chopPlane, vec_t epsilon, DWinding ** } if ( f->numpoints > maxpts || b->numpoints > maxpts ) { - globalOutputStream() << "ClipWinding: points exceeded estimate\n"; + globalWarningStream() << "ClipWinding: points exceeded estimate\n"; } if ( f->numpoints > MAX_POINTS_ON_WINDING || b->numpoints > MAX_POINTS_ON_WINDING ) { - globalOutputStream() << "ClipWinding: MAX_POINTS_ON_WINDING\n"; + globalWarningStream() << "ClipWinding: MAX_POINTS_ON_WINDING\n"; } } diff --git a/contrib/bobtoolz/cportals.cpp b/contrib/bobtoolz/cportals.cpp index 073c979d..7a7d229c 100644 --- a/contrib/bobtoolz/cportals.cpp +++ b/contrib/bobtoolz/cportals.cpp @@ -125,7 +125,7 @@ void CPortals::Load(){ in = fopen( fn, "rt" ); if ( in == NULL ) { - globalOutputStream() << " ERROR - could not open file.\n"; + globalErrorStream() << " ERROR - could not open file.\n"; return; } @@ -133,7 +133,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -141,7 +141,7 @@ void CPortals::Load(){ if ( strncmp( "PRT1", buf, 4 ) != 0 ) { fclose( in ); - globalOutputStream() << " ERROR - File header indicates wrong file type (should be \"PRT1\").\n"; + globalErrorStream() << " ERROR - File header indicates wrong file type (should be \"PRT1\").\n"; return; } @@ -149,7 +149,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -161,7 +161,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - Extreme number of nodes, aborting.\n"; + globalErrorStream() << " ERROR - Extreme number of nodes, aborting.\n"; return; } @@ -171,7 +171,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -184,7 +184,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -202,7 +202,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -221,7 +221,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -252,7 +252,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Could not find information for portal number " << n + 1 << " of " << p_count << ".\n"; + globalErrorStream() << " ERROR - Could not find information for portal number " << n + 1 << " of " << p_count << ".\n"; return; } @@ -265,7 +265,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Information for portal number " << n + 1 << " of " << p_count << " is not formatted correctly.\n"; + globalErrorStream() << " ERROR - Information for portal number " << n + 1 << " of " << p_count << " is not formatted correctly.\n"; return; } @@ -275,7 +275,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Information for portal number " << n + 1 << " of " << p_count << " is not formatted correctly.\n"; + globalErrorStream() << " ERROR - Information for portal number " << n + 1 << " of " << p_count << " is not formatted correctly.\n"; return; } @@ -288,7 +288,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Could not find information for portal number " << n + 1 << " of " << p_count << ".\n"; + globalErrorStream() << " ERROR - Could not find information for portal number " << n + 1 << " of " << p_count << ".\n"; return; } @@ -301,7 +301,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Information for portal number " << n + 1 << " of " << p_count << " is not formatted correctly.\n"; + globalErrorStream() << " ERROR - Information for portal number " << n + 1 << " of " << p_count << " is not formatted correctly.\n"; return; } diff --git a/contrib/bobtoolz/funchandlers-GTK.cpp b/contrib/bobtoolz/funchandlers-GTK.cpp index 84a6dda4..a5c1d4cd 100644 --- a/contrib/bobtoolz/funchandlers-GTK.cpp +++ b/contrib/bobtoolz/funchandlers-GTK.cpp @@ -376,15 +376,15 @@ void DoPathPlotter(){ if( GlobalSelectionSystem().countSelected() != 1 ) { //DoMessageBox("Invalid number of brushes selected, choose 1 only", "Error", eMB_OK); - globalOutputStream() << "bobToolz PathPlotter: Invalid number of entities selected, choose 1 trigger_push entity only.\n"; + globalErrorStream() << "bobToolz PathPlotter: Invalid number of entities selected, choose 1 trigger_push entity only.\n"; return; } */ Entity* entity = Node_getEntity( GlobalSelectionSystem().ultimateSelected().path().top() ); - if ( entity != 0 ) { + if ( entity != 0 ) DBobView_setEntity( *entity, rs.fMultiplier, rs.nPoints, rs.fGravity, rs.bNoUpdate, rs.bShowExtra ); - } - else{ globalErrorStream() << "bobToolz PathPlotter: No trigger_push entitity selected, select 1 only (Use list to select it).\n"; } + else + globalErrorStream() << "bobToolz PathPlotter: No trigger_push entitity selected, select 1 only (Use list to select it).\n"; return; } diff --git a/contrib/prtview/portals.cpp b/contrib/prtview/portals.cpp index 9bc7c41e..6ae0ba9b 100644 --- a/contrib/prtview/portals.cpp +++ b/contrib/prtview/portals.cpp @@ -171,7 +171,7 @@ void CPortals::Load(){ in = fopen( fn, "rt" ); if ( in == NULL ) { - globalOutputStream() << " ERROR - could not open file.\n"; + globalErrorStream() << " ERROR - could not open file.\n"; return; } @@ -179,7 +179,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -187,7 +187,7 @@ void CPortals::Load(){ if ( strncmp( "PRT1", buf, 4 ) != 0 ) { fclose( in ); - globalOutputStream() << " ERROR - File header indicates wrong file type (should be \"PRT1\").\n"; + globalErrorStream() << " ERROR - File header indicates wrong file type (should be \"PRT1\").\n"; return; } @@ -195,7 +195,7 @@ void CPortals::Load(){ if ( !fgets( buf, LINE_BUF, in ) ) { fclose( in ); - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -208,7 +208,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - Extreme number of nodes, aborting.\n"; + globalErrorStream() << " ERROR - Extreme number of nodes, aborting.\n"; return; } @@ -219,7 +219,7 @@ void CPortals::Load(){ node_count = 0; - globalOutputStream() << " ERROR - File ended prematurely.\n"; + globalErrorStream() << " ERROR - File ended prematurely.\n"; return; } @@ -232,7 +232,7 @@ void CPortals::Load(){ portal_count = 0; node_count = 0; - globalOutputStream() << " ERROR - Extreme number of portals, aborting.\n"; + globalErrorStream() << " ERROR - Extreme number of portals, aborting.\n"; return; } @@ -243,7 +243,7 @@ void CPortals::Load(){ portal_count = 0; node_count = 0; - globalOutputStream() << " ERROR - number of portals equals 0, aborting.\n"; + globalErrorStream() << " ERROR - number of portals equals 0, aborting.\n"; return; } @@ -265,7 +265,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Could not find information for portal number " << n + 1 << " of " << portal_count << ".\n"; + globalErrorStream() << " ERROR - Could not find information for portal number " << n + 1 << " of " << portal_count << ".\n"; return; } @@ -283,7 +283,7 @@ void CPortals::Load(){ Purge(); - globalOutputStream() << " ERROR - Information for portal number " << n + 1 << " of " << portal_count << " is not formatted correctly.\n"; + globalErrorStream() << " ERROR - Information for portal number " << n + 1 << " of " << portal_count << " is not formatted correctly.\n"; return; } diff --git a/contrib/sunplug/sunplug.cpp b/contrib/sunplug/sunplug.cpp index dc2f202c..dfaa7c34 100644 --- a/contrib/sunplug/sunplug.cpp +++ b/contrib/sunplug/sunplug.cpp @@ -426,7 +426,7 @@ void MapCoordinator(){ gtk_table_attach_defaults( GTK_TABLE( table ), button, 2, 3, 3, 4 ); // insert button into table } else { - globalOutputStream() << "SunPlug: no worldspawn found!\n"; // output error to console + globalErrorStream() << "SunPlug: no worldspawn found!\n"; // output error to console label = gtk_label_new( "ERROR: No worldspawn was found in the map!\nIn order to use this tool the map must have at least one brush in the worldspawn. " ); // create a label gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT ); // text align left diff --git a/contrib/ufoaiplug/ufoai_filters.cpp b/contrib/ufoaiplug/ufoai_filters.cpp index 00903076..25274d72 100644 --- a/contrib/ufoaiplug/ufoai_filters.cpp +++ b/contrib/ufoaiplug/ufoai_filters.cpp @@ -105,13 +105,13 @@ void visit( Face& face ) const { m_surfaceFlagsVis = face.getShader().m_flags.m_surfaceFlags; } else if ( m_surfaceFlagsVis >= 0 && m_surfaceFlagsVis != face.getShader().m_flags.m_surfaceFlags ) { - globalOutputStream() << "Faces with different surfaceflags at brush\n"; + globalWarningStream() << "Faces with different surfaceflags at brush\n"; } if ( m_contentFlagsVis < 0 ) { m_contentFlagsVis = face.getShader().m_flags.m_contentFlags; } else if ( m_contentFlagsVis >= 0 && m_contentFlagsVis != face.getShader().m_flags.m_contentFlags ) { - globalOutputStream() << "Faces with different contentflags at brush\n"; + globalWarningStream() << "Faces with different contentflags at brush\n"; } #else m_surfaceFlagsVis = face.getShader().m_flags.m_surfaceFlags; diff --git a/contrib/ufoaiplug/ufoai_level.cpp b/contrib/ufoaiplug/ufoai_level.cpp index c7554e4d..50c3cb87 100644 --- a/contrib/ufoaiplug/ufoai_level.cpp +++ b/contrib/ufoaiplug/ufoai_level.cpp @@ -139,7 +139,7 @@ void assign_default_values_to_worldspawn( bool override, char **returnMsg ){ worldspawn = Scene_FindEntityByClass( "worldspawn" ); if ( !worldspawn ) { - globalOutputStream() << "UFO:AI: Could not find worldspawn.\n"; + globalWarningStream() << "UFO:AI: Could not find worldspawn.\n"; *returnMsg = "Could not find worldspawn"; return; } @@ -200,7 +200,7 @@ void check_map_values( char **returnMsg ){ worldspawn = Scene_FindEntityByClass( "worldspawn" ); if ( !worldspawn ) { - globalOutputStream() << "UFO:AI: Could not find worldspawn.\n"; + globalWarningStream() << "UFO:AI: Could not find worldspawn.\n"; *returnMsg = "Could not find worldspawn"; return; } diff --git a/libs/gtkutil/clipboard.cpp b/libs/gtkutil/clipboard.cpp index c8073aba..d496c9cc 100644 --- a/libs/gtkutil/clipboard.cpp +++ b/libs/gtkutil/clipboard.cpp @@ -59,7 +59,7 @@ void clipboard_copy( ClipboardCopyFunc copy ){ } if ( !bClipped ) { - globalOutputStream() << "Unable to register Windows clipboard formats, copy/paste between editors will not be possible\n"; + globalWarningStream() << "Unable to register Windows clipboard formats, copy/paste between editors will not be possible\n"; } } diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp index dcd95e87..8ea30d07 100644 --- a/libs/gtkutil/glfont.cpp +++ b/libs/gtkutil/glfont.cpp @@ -126,7 +126,7 @@ void renderString( const char *s, const GLuint& tex, const unsigned int colour[3 if ( log_rect.width > 0 && log_rect.height > 0 ) { hei = bitmap.rows = PANGO_PIXELS_CEIL( log_rect.height );//m_pixelAscent + m_pixelDescent; wid = bitmap.width = PANGO_PIXELS_CEIL( log_rect.width ); -// globalOutputStream() << width << " " << height << "rendering\n"; +// globalOutputStream() << width << " " << height << " rendering\n"; bitmap.pitch = bitmap.width; unsigned char *boo = (unsigned char *) malloc( bitmap.rows * bitmap.width ); memset( boo, 0, bitmap.rows * bitmap.width ); diff --git a/libs/modulesystem/singletonmodule.h b/libs/modulesystem/singletonmodule.h index 6dd9c52a..2ca8600d 100644 --- a/libs/modulesystem/singletonmodule.h +++ b/libs/modulesystem/singletonmodule.h @@ -110,7 +110,7 @@ void capture(){ } else { - globalOutputStream() << "Module Dependencies Failed: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n"; + globalErrorStream() << "Module Dependencies Failed: '" << typename Type::Name() << "' '" << APIConstructor::getName() << "'\n"; } m_cycleCheck = true; } diff --git a/plugins/imagehl/sprite.cpp b/plugins/imagehl/sprite.cpp index b5fba04e..3811d1c4 100644 --- a/plugins/imagehl/sprite.cpp +++ b/plugins/imagehl/sprite.cpp @@ -171,7 +171,7 @@ Image* LoadIDSPBuff( byte *buffer ){ } else { - globalOutputStream() << "Bleh!\n"; // <-- we always get this, wtf! + globalWarningStream() << "Bleh!\n"; // <-- we always get this, wtf! } #endif diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp index c9f56c7e..19383851 100644 --- a/plugins/shaders/shaders.cpp +++ b/plugins/shaders/shaders.cpp @@ -1438,7 +1438,7 @@ void LoadShaderFile( const char* filename ){ } else { - globalOutputStream() << "Unable to read shaderfile " << filename << "\n"; + globalWarningStream() << "Unable to read shaderfile " << filename << "\n"; } } @@ -1462,7 +1462,7 @@ void loadGuideFile( const char* filename ){ } else { - globalOutputStream() << "Unable to read guide file " << fullname.c_str() << "\n"; + globalWarningStream() << "Unable to read guide file " << fullname.c_str() << "\n"; } } diff --git a/radiant/commands.cpp b/radiant/commands.cpp index b77b2d7e..7817fbc7 100644 --- a/radiant/commands.cpp +++ b/radiant/commands.cpp @@ -64,7 +64,7 @@ void GlobalShortcuts_reportUnregistered(){ for ( Shortcuts::iterator i = g_shortcuts.begin(); i != g_shortcuts.end(); ++i ) { if ( ( *i ).second.first.key != 0 && !( *i ).second.second ) { - globalOutputStream() << "shortcut not registered: " << ( *i ).first.c_str() << "\n"; + globalWarningStream() << "shortcut not registered: " << ( *i ).first.c_str() << "\n"; } } } @@ -619,11 +619,11 @@ void LoadCommandMap( const char* path ){ } else { - globalOutputStream() << "commands import: data version " << dataVersion << " is not compatible with code version " << version << "\n"; + globalWarningStream() << "commands import: data version " << dataVersion << " is not compatible with code version " << version << "\n"; } } else { - globalOutputStream() << "failed to load custom shortcuts from " << makeQuoted( strINI.c_str() ) << "\n"; + globalWarningStream() << "failed to load custom shortcuts from " << makeQuoted( strINI.c_str() ) << "\n"; } } diff --git a/radiant/csg.cpp b/radiant/csg.cpp index e1462ea2..572872a9 100644 --- a/radiant/csg.cpp +++ b/radiant/csg.cpp @@ -721,7 +721,7 @@ void CSG_Subtract(){ GlobalSceneGraph().traverse( BrushGatherSelected( selected_brushes ) ); if ( selected_brushes.empty() ) { - globalOutputStream() << "CSG Subtract: No brushes selected.\n"; + globalWarningStream() << "CSG Subtract: No brushes selected.\n"; } else { @@ -926,12 +926,12 @@ void CSG_Merge( void ){ GlobalSceneGraph().traverse( BrushGatherSelected( selected_brushes ) ); if ( selected_brushes.empty() ) { - globalOutputStream() << "CSG Merge: No brushes selected.\n"; + globalWarningStream() << "CSG Merge: No brushes selected.\n"; return; } if ( selected_brushes.size() < 2 ) { - globalOutputStream() << "CSG Merge: At least two brushes have to be selected.\n"; + globalWarningStream() << "CSG Merge: At least two brushes have to be selected.\n"; return; } @@ -945,7 +945,7 @@ void CSG_Merge( void ){ Brush* brush = Node_getBrush( node ); // if the new brush would not be convex if ( !Brush_merge( *brush, selected_brushes, true ) ) { - globalOutputStream() << "CSG Merge: Failed - result would not be convex.\n"; + globalWarningStream() << "CSG Merge: Failed - result would not be convex.\n"; } else { diff --git a/radiant/environment.cpp b/radiant/environment.cpp index ee6bceee..d255908c 100644 --- a/radiant/environment.cpp +++ b/radiant/environment.cpp @@ -215,7 +215,7 @@ const char* getexename( char *buf ){ int ret = readlink( LINK_NAME, buf, PATH_MAX ); if ( ret == -1 ) { - globalOutputStream() << "getexename: falling back to argv[0]: " << makeQuoted( g_argv[0] ); + globalWarningStream() << "getexename: falling back to argv[0]: " << makeQuoted( g_argv[0] ); const char* path = realpath( g_argv[0], buf ); if ( path == 0 ) { /* In case of an error, leave the handling up to the caller */ diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index d418958d..2d1e5f37 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -851,7 +851,7 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos, int length ) FILE *f = fopen( filename, "r" ); if ( f == 0 ) { - globalOutputStream() << "Unable to load file " << filename << " in shader editor.\n"; + globalWarningStream() << "Unable to load file " << filename << " in shader editor.\n"; gtk_widget_hide( text_editor ); } else @@ -1152,7 +1152,7 @@ void DoTextEditor( const char* filename, int cursorpos, int length, bool externa // ShExecInfo.hInstApp = NULL; // ShellExecuteEx(&ShExecInfo); #else - globalOutputStream() << "Failed to open '" << goodpath->c_str() << "'\nSet Shader Editor Command in preferences\n"; + globalWarningStream() << "Failed to open '" << goodpath->c_str() << "'\nSet Shader Editor Command in preferences\n"; #endif } else{ @@ -1162,7 +1162,7 @@ void DoTextEditor( const char* filename, int cursorpos, int length, bool externa globalOutputStream() << "Launching: " << strEditCommand.c_str() << "\n"; // note: linux does not return false if the command failed so it will assume success if ( Q_Exec( 0, const_cast( strEditCommand.c_str() ), 0, true, false ) == false ) { - globalOutputStream() << "Failed to execute " << strEditCommand.c_str() << "\n"; + globalErrorStream() << "Failed to execute " << strEditCommand.c_str() << "\n"; } else { @@ -1176,6 +1176,6 @@ void DoTextEditor( const char* filename, int cursorpos, int length, bool externa } } else{ - globalOutputStream() << "Failed to open '" << filename << "'\nOne sits in .pk3 most likely!\n"; + globalWarningStream() << "Failed to open '" << filename << "'\nOne sits in .pk3 most likely!\n"; } } diff --git a/radiant/help.cpp b/radiant/help.cpp index d5319f30..3e67349a 100644 --- a/radiant/help.cpp +++ b/radiant/help.cpp @@ -103,12 +103,12 @@ void process_xlink( const char* filename, const char *menu_name, const char *bas } else { - globalOutputStream() << "'" << filename << "' parse failed\n"; + globalWarningStream() << "'" << filename << "' parse failed\n"; } } else { - globalOutputStream() << "'" << filename << "' not found\n"; + globalWarningStream() << "'" << filename << "' not found\n"; } } diff --git a/radiant/map.cpp b/radiant/map.cpp index 5ec4f064..b5869c64 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -2000,7 +2000,7 @@ public: } else { - globalOutputStream() << "failed - did not find two selected nodes.\n"; + globalWarningStream() << "failed - did not find two selected nodes.\n"; } } diff --git a/radiant/points.cpp b/radiant/points.cpp index 70feea2a..7daa7ae6 100644 --- a/radiant/points.cpp +++ b/radiant/points.cpp @@ -293,7 +293,7 @@ void Pointfile_Parse( CPointfile& pointfile ){ { Vector3 v; if ( sscanf( data,"%f %f %f", &v[0], &v[1], &v[2] ) != 3 ) { - globalOutputStream() << "Corrupt point file, line " << line << "\n"; + globalWarningStream() << "Corrupt point file, line " << line << "\n"; break; } @@ -307,7 +307,7 @@ void Pointfile_Parse( CPointfile& pointfile ){ // deal with zhlt style point files. if ( *data == '-' ) { if ( sscanf( data,"- %f %f %f", &v[0], &v[1], &v[2] ) != 3 ) { - globalOutputStream() << "Corrupt point file, line " << line << "\n"; + globalWarningStream() << "Corrupt point file, line " << line << "\n"; break; } diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 878f8dd6..8116d17e 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -917,7 +917,7 @@ void Preferences_Load(){ globalOutputStream() << "loading local preferences from " << g_Preferences.m_inipath->str << "\n"; if ( !Preferences_Load( g_preferences, g_Preferences.m_inipath->str, g_GamesDialog.m_sGameFile.c_str() ) ) { - globalOutputStream() << "failed to load local preferences from " << g_Preferences.m_inipath->str << "\n"; + globalWarningStream() << "failed to load local preferences from " << g_Preferences.m_inipath->str << "\n"; } } @@ -931,7 +931,7 @@ void Preferences_Save(){ globalOutputStream() << "saving local preferences to " << g_Preferences.m_inipath->str << "\n"; if ( !Preferences_Save_Safe( g_preferences, g_Preferences.m_inipath->str ) ) { - globalOutputStream() << "failed to save local preferences to " << g_Preferences.m_inipath->str << "\n"; + globalWarningStream() << "failed to save local preferences to " << g_Preferences.m_inipath->str << "\n"; } } diff --git a/radiant/renderstate.cpp b/radiant/renderstate.cpp index 4913f8b0..397ad04d 100644 --- a/radiant/renderstate.cpp +++ b/radiant/renderstate.cpp @@ -1402,7 +1402,7 @@ void extensionsInitialised(){ ); if ( !lightingSupported() ) { - globalOutputStream() << "Lighting mode requires OpenGL features not supported by your graphics drivers:\n"; + globalWarningStream() << "Lighting mode requires OpenGL features not supported by your graphics drivers:\n"; if ( !GlobalOpenGL().GL_1_3() ) { globalOutputStream() << " GL version 1.3 or better\n"; } diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index b41ef088..0bbbbe24 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -418,7 +418,7 @@ static void OnBtnMatchGrid( GtkWidget *widget, gpointer data ){ vscale = static_cast( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_vscaleIncrement.m_spin ) ); if ( hscale == 0.0f || vscale == 0.0f ) { - globalOutputStream() << "ERROR: unexpected scale == 0.0f\n"; + globalErrorStream() << "ERROR: unexpected scale == 0.0f\n"; return; } diff --git a/radiant/texmanip.cpp b/radiant/texmanip.cpp index bd25d58f..6fec694b 100644 --- a/radiant/texmanip.cpp +++ b/radiant/texmanip.cpp @@ -93,7 +93,7 @@ void R_ResampleTextureLerpLine( const byte *in, byte *out, int inwidth, int outw } else { - globalOutputStream() << "R_ResampleTextureLerpLine: unsupported bytesperpixel " << bytesperpixel << "\n"; + globalWarningStream() << "R_ResampleTextureLerpLine: unsupported bytesperpixel " << bytesperpixel << "\n"; } } @@ -302,7 +302,7 @@ void R_ResampleTexture( const void *indata, int inwidth, int inheight, void *out } else { - globalOutputStream() << "R_ResampleTexture: unsupported bytesperpixel " << bytesperpixel << "\n"; + globalWarningStream() << "R_ResampleTexture: unsupported bytesperpixel " << bytesperpixel << "\n"; } } diff --git a/radiant/textures.cpp b/radiant/textures.cpp index 7f5e5a94..d0bb7e59 100644 --- a/radiant/textures.cpp +++ b/radiant/textures.cpp @@ -115,7 +115,7 @@ void SetTexParameters( ETexturesMode mode ){ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); break; default: - globalOutputStream() << "invalid texture mode\n"; + globalErrorStream() << "invalid texture mode\n"; } } diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 8886eda0..aa4fff58 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -788,7 +788,7 @@ void TextureDirectory_loadTexture( const char* directory, const char* texture ){ } if ( !shader_valid( name.c_str() ) ) { - globalOutputStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n"; + globalWarningStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n"; return; } @@ -1047,7 +1047,7 @@ void TextureBrowser_Selection_MouseUp( TextureBrowser& textureBrowser, guint32 f IShader* shader = Texture_At( textureBrowser, pointx, textureBrowser.height - 1 - pointy ); if ( shader != 0 ) { if ( shader->IsDefault() ) { - globalOutputStream() << "ERROR: " << shader->getName() << " is not a shader, it's a texture.\n"; + globalWarningStream() << shader->getName() << " is not a shader, it's a texture.\n"; } else{ ViewShader( shader->getShaderFileName(), shader->getName(), ( flags & GDK_CONTROL_MASK ) != 0 ); @@ -2086,7 +2086,7 @@ void TextureBrowser_checkTagFile(){ } else { - globalOutputStream() << "Unable to find default tag file " << default_filename.c_str() << ". No tag support. Plugins -> ShaderPlug -> Create tag file: to start using tags\n"; + globalWarningStream() << "Unable to find default tag file " << default_filename.c_str() << ". No tag support. Plugins -> ShaderPlug -> Create tag file: to start using texture tags\n"; } } } diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp index 16afd5b9..c9d1e079 100644 --- a/radiant/watchbsp.cpp +++ b/radiant/watchbsp.cpp @@ -340,7 +340,7 @@ static void saxEndElement( message_info_t *data, const xmlChar *name ){ if ( data->recurse == data->stop_depth ) { message_flush( data ); #ifdef _DEBUG - globalOutputStream() << "Received error msg .. shutting down..\n"; + globalWarningStream() << "Received error msg .. shutting down..\n"; #endif GetWatchBSP()->EndMonitoringLoop(); // tell there has been an error @@ -492,7 +492,7 @@ void CWatchBSP::Reset(){ bool CWatchBSP::SetupListening(){ #ifdef _DEBUG if ( m_pListenSocket ) { - globalOutputStream() << "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n"; + globalErrorStream() << "ERROR: m_pListenSocket != NULL in CWatchBSP::SetupListening\n"; return false; } #endif