quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use globalWarningStream()

Browse Source
This commit is contained in:
Garux 2018-03-21 04:12:06 +03:00
parent 54a98ed5e8
commit b1e2f26124
24 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ufoaiplug/ufoai_filters.cpp
View File

@ -78,7 +78,7 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const {
} }
else else
{ {
globalOutputStream() << "UFO:AI: Warning: no spawnflags for " << m_name << ".\n"; globalWarningStream() << "UFO:AI: Warning: no spawnflags for " << m_name << ".\n";
} }
} }
} }

4
libs/stringio.h
View File

@ -232,9 +232,9 @@ inline bool Tokeniser_getFloat( Tokeniser& tokeniser, float& f ){
if ( token != 0 && string_parse_float( token, f ) ) { if ( token != 0 && string_parse_float( token, f ) ) {
return true; return true;
} }
//fallback for 1.#IND 1.#INF 1.#QNAN cases, happening sometimes after rotating & often scaling with tex lock in BP mode //fallback for 1.#IND 1.#INF 1.#QNAN cases, happening sometimes after texture locking algorithms
else if ( token != 0 && strstr( token, ".#" ) ) { else if ( token != 0 && strstr( token, ".#" ) ) {
globalErrorStream() << "Warning: " << Unsigned( tokeniser.getLine() ) << ":" << Unsigned( tokeniser.getColumn() ) << ": expected parse problem at '" << token << "': wanted '#number'\nProcessing anyway\n"; globalWarningStream() << "Warning: " << Unsigned( tokeniser.getLine() ) << ":" << Unsigned( tokeniser.getColumn() ) << ": expected parse problem at '" << token << "': wanted '#number'\nProcessing anyway\n";
// *strstr( token, ".#" ) = '\0'; // *strstr( token, ".#" ) = '\0';
return true; return true;
} }

2
libs/xml/xmlparser.h
View File

@ -129,7 +129,7 @@ static void characters( void *user_data, const xmlChar *ch, int len ){
static void warning( void *user_data, const char *msg, ... ){ static void warning( void *user_data, const char *msg, ... ){
va_list args; va_list args;
va_start( args, msg ); va_start( args, msg );
globalErrorStream() << "XML WARNING: " << FormattedVA( msg, args ); globalWarningStream() << "XML WARNING: " << FormattedVA( msg, args );
va_end( args ); va_end( args );
} }
static void error( void *user_data, const char *msg, ... ){ static void error( void *user_data, const char *msg, ... ){

2
plugins/archivepak/archive.cpp
View File

@ -92,7 +92,7 @@ PakArchive( const char* name )
PakFileSystem::entry_type& file = m_filesystem[entry.filename]; PakFileSystem::entry_type& file = m_filesystem[entry.filename];
if ( !file.is_directory() ) { if ( !file.is_directory() ) {
globalOutputStream() << "Warning: pak archive " << makeQuoted( m_name.c_str() ) << " contains duplicated file: " << makeQuoted( entry.filename ) << "\n"; globalWarningStream() << "Warning: pak archive " << makeQuoted( m_name.c_str() ) << " contains duplicated file: " << makeQuoted( entry.filename ) << "\n";
} }
else else
{ {

2
plugins/archivezip/archive.cpp
View File

@ -161,7 +161,7 @@ bool read_record(){
{ {
ZipFileSystem::entry_type& file = m_filesystem[filename.data()]; ZipFileSystem::entry_type& file = m_filesystem[filename.data()];
if ( !file.is_directory() ) { if ( !file.is_directory() ) {
globalOutputStream() << "Warning: zip archive " << makeQuoted( m_name.c_str() ) << " contains duplicated file: " << makeQuoted( filename.data() ) << "\n"; globalWarningStream() << "Warning: zip archive " << makeQuoted( m_name.c_str() ) << " contains duplicated file: " << makeQuoted( filename.data() ) << "\n";
} }
else else
{ {

2
plugins/image/jpeg.cpp
View File

@ -356,7 +356,7 @@ static Image* LoadJPGBuff_( const void *src_buffer, int src_size ){
jerr.pub.error_exit = my_jpeg_error_exit; jerr.pub.error_exit = my_jpeg_error_exit;
if ( setjmp( jerr.setjmp_buffer ) ) { //< TODO: use c++ exceptions instead of setjmp/longjmp to handle errors if ( setjmp( jerr.setjmp_buffer ) ) { //< TODO: use c++ exceptions instead of setjmp/longjmp to handle errors
globalErrorStream() << "WARNING: JPEG library error: " << errormsg << "\n"; globalWarningStream() << "WARNING: JPEG library error: " << errormsg << "\n";
jpeg_destroy_decompress( &cinfo ); jpeg_destroy_decompress( &cinfo );
return 0; return 0;
} }

8
plugins/imagehl/sprite.cpp
View File

@ -120,13 +120,13 @@ Image* LoadIDSPBuff( byte *buffer ){
header = (dspriteheader_t *)buffer; header = (dspriteheader_t *)buffer;
if ( header->ident != IDSPRITEHEADER ) { if ( header->ident != IDSPRITEHEADER ) {
globalErrorStream() << "WARNING: IDSP file has wrong header\n"; globalWarningStream() << "WARNING: IDSP file has wrong header\n";
return 0; return 0;
} }
version = header->version; version = header->version;
if ( version != 1 && version != 2 ) { if ( version != 1 && version != 2 ) {
globalErrorStream() << "WARNING: IDSP file has wrong version number " globalWarningStream() << "WARNING: IDSP file has wrong version number "
"(" << version << " should be 1 or 2)\n"; "(" << version << " should be 1 or 2)\n";
return 0; return 0;
} }
@ -149,11 +149,11 @@ Image* LoadIDSPBuff( byte *buffer ){
pframetype = (dspriteframetype_t *)( pinv2 + 1 ); pframetype = (dspriteframetype_t *)( pinv2 + 1 );
break; break;
default: default:
globalErrorStream() << "WARNING: IDSP file has unsupported version\n"; globalWarningStream() << "WARNING: IDSP file has unsupported version\n";
return 0; return 0;
} }
if ( numframes > 1 ) { if ( numframes > 1 ) {
globalErrorStream() << "WARNING: IDSP file has multiple frames, only the first frame will be used.\n"; globalWarningStream() << "WARNING: IDSP file has multiple frames, only the first frame will be used.\n";
} }
// palette = buffer+mipdatasize+2; // palette = buffer+mipdatasize+2;

2
plugins/imagepng/plugin.cpp
View File

@ -34,7 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
void user_warning_fn( png_structp png_ptr, png_const_charp warning_msg ){ void user_warning_fn( png_structp png_ptr, png_const_charp warning_msg ){
globalErrorStream() << "libpng warning: " << warning_msg << "\n"; globalWarningStream() << "libpng warning: " << warning_msg << "\n";
} }
void user_error_fn( png_structp png_ptr, png_const_charp error_msg ){ void user_error_fn( png_structp png_ptr, png_const_charp error_msg ){

18
plugins/mapq3/plugin.cpp
View File

@ -252,15 +252,15 @@ scene::Node& parsePrimitive( Tokeniser& tokeniser ) const {
EBrushType detectedFormat; EBrushType detectedFormat;
if ( string_equal( primitive, "brushDef" ) ) { if ( string_equal( primitive, "brushDef" ) ) {
detectedFormat = eBrushTypeQuake3BP; detectedFormat = eBrushTypeQuake3BP;
globalErrorStream() << "detectedFormat = eBrushTypeQuake3BP\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake3BP\n";
} }
else if ( string_equal( primitive, "(" ) && tokeniser.bufferContains( " [ " ) && tokeniser.bufferContains( " ] " ) ) { else if ( string_equal( primitive, "(" ) && tokeniser.bufferContains( " [ " ) && tokeniser.bufferContains( " ] " ) ) {
detectedFormat = eBrushTypeQuake3Valve220; detectedFormat = eBrushTypeQuake3Valve220;
globalErrorStream() << "detectedFormat = eBrushTypeQuake3Valve220\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake3Valve220\n";
} }
else if ( string_equal( primitive, "(" ) ) { else if ( string_equal( primitive, "(" ) ) {
detectedFormat = eBrushTypeQuake3; detectedFormat = eBrushTypeQuake3;
globalErrorStream() << "detectedFormat = eBrushTypeQuake3\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake3\n";
} }
else{ else{
globalErrorStream() << "Format is not detected\n"; globalErrorStream() << "Format is not detected\n";
@ -329,15 +329,15 @@ scene::Node& parsePrimitive( Tokeniser& tokeniser ) const {
EBrushType detectedFormat; EBrushType detectedFormat;
if ( string_equal( primitive, "brushDef" ) ) { if ( string_equal( primitive, "brushDef" ) ) {
detectedFormat = eBrushTypeQuake3BP; detectedFormat = eBrushTypeQuake3BP;
globalErrorStream() << "detectedFormat = eBrushTypeQuake3BP\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake3BP\n";
} }
else if ( string_equal( primitive, "(" ) && tokeniser.bufferContains( " [ " ) && tokeniser.bufferContains( " ] " ) ) { else if ( string_equal( primitive, "(" ) && tokeniser.bufferContains( " [ " ) && tokeniser.bufferContains( " ] " ) ) {
detectedFormat = eBrushTypeValve220; detectedFormat = eBrushTypeValve220;
globalErrorStream() << "detectedFormat = eBrushTypeValve220\n"; globalWarningStream() << "detectedFormat = eBrushTypeValve220\n";
} }
else if ( string_equal( primitive, "(" ) ) { else if ( string_equal( primitive, "(" ) ) {
detectedFormat = eBrushTypeQuake; detectedFormat = eBrushTypeQuake;
globalErrorStream() << "detectedFormat = eBrushTypeQuake\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake\n";
} }
else{ else{
globalErrorStream() << "Format is not detected\n"; globalErrorStream() << "Format is not detected\n";
@ -447,15 +447,15 @@ scene::Node& parsePrimitive( Tokeniser& tokeniser ) const {
EBrushType detectedFormat; EBrushType detectedFormat;
if ( string_equal( primitive, "brushDef" ) ) { if ( string_equal( primitive, "brushDef" ) ) {
detectedFormat = eBrushTypeQuake3BP; detectedFormat = eBrushTypeQuake3BP;
globalErrorStream() << "detectedFormat = eBrushTypeQuake3BP\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake3BP\n";
} }
else if ( string_equal( primitive, "(" ) && tokeniser.bufferContains( " [ " ) && tokeniser.bufferContains( " ] " ) ) { else if ( string_equal( primitive, "(" ) && tokeniser.bufferContains( " [ " ) && tokeniser.bufferContains( " ] " ) ) {
detectedFormat = eBrushTypeQuake3Valve220; detectedFormat = eBrushTypeQuake3Valve220;
globalErrorStream() << "detectedFormat = eBrushTypeQuake3Valve220\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake3Valve220\n";
} }
else if ( string_equal( primitive, "(" ) ) { else if ( string_equal( primitive, "(" ) ) {
detectedFormat = eBrushTypeQuake2; detectedFormat = eBrushTypeQuake2;
globalErrorStream() << "detectedFormat = eBrushTypeQuake2\n"; globalWarningStream() << "detectedFormat = eBrushTypeQuake2\n";
} }
else{ else{
globalErrorStream() << "Format is not detected\n"; globalErrorStream() << "Format is not detected\n";

2
plugins/model/model.cpp
View File

@ -779,7 +779,7 @@ void add_remap( const char *remap ){
if ( *ch == '\0' ) { if ( *ch == '\0' ) {
// bad remap // bad remap
globalErrorStream() << "WARNING: Shader _remap key found in a model entity without a ; character\n"; globalWarningStream() << "WARNING: Shader _remap key found in a model entity without a ; character\n";
} }
else { else {
pRemap = new remap_t; pRemap = new remap_t;

2
plugins/model/plugin.cpp
View File

@ -61,7 +61,7 @@ void PicoPrintFunc( int level, const char *str ){
break; break;
case PICO_WARNING: case PICO_WARNING:
globalErrorStream() << "PICO_WARNING: " << str << "\n"; globalWarningStream() << "PICO_WARNING: " << str << "\n";
break; break;
case PICO_ERROR: case PICO_ERROR:

2
plugins/shaders/shaders.cpp
View File

@ -1371,7 +1371,7 @@ void ParseShaderFile( Tokeniser& tokeniser, const char* filename ){
// do we already have this shader? // do we already have this shader?
if ( !g_shaderDefinitions.insert( ShaderDefinitionMap::value_type( shaderTemplate->getName(), ShaderDefinition( shaderTemplate.get(), ShaderArguments(), filename ) ) ).second ) { if ( !g_shaderDefinitions.insert( ShaderDefinitionMap::value_type( shaderTemplate->getName(), ShaderDefinition( shaderTemplate.get(), ShaderArguments(), filename ) ) ).second ) {
#ifdef _DEBUG #ifdef _DEBUG
globalOutputStream() << "WARNING: shader " << shaderTemplate->getName() << " is already in memory, definition in " << filename << " ignored.\n"; globalWarningStream() << "WARNING: shader " << shaderTemplate->getName() << " is already in memory, definition in " << filename << " ignored.\n";
#endif #endif
} }
} }

4
plugins/vfspk3/vfs.cpp
View File

@ -103,7 +103,7 @@ static void AddSlash( char *str ){
std::size_t n = strlen( str ); std::size_t n = strlen( str );
if ( n > 0 ) { if ( n > 0 ) {
if ( str[n - 1] != '\\' && str[n - 1] != '/' ) { if ( str[n - 1] != '\\' && str[n - 1] != '/' ) {
globalErrorStream() << "WARNING: directory path does not end with separator: " << str << "\n"; globalWarningStream() << "WARNING: directory path does not end with separator: " << str << "\n";
strcat( str, "/" ); strcat( str, "/" );
} }
} }
@ -114,7 +114,7 @@ static void FixDOSName( char *src ){
return; return;
} }
globalErrorStream() << "WARNING: invalid path separator '\\': " << src << "\n"; globalWarningStream() << "WARNING: invalid path separator '\\': " << src << "\n";
while ( *src ) while ( *src )
{ {

2
radiant/brush.h
View File

@ -1177,7 +1177,7 @@ void snapto( float snap ){
#endif #endif
SceneChangeNotify(); SceneChangeNotify();
if ( !plane3_valid( m_plane.plane3() ) ) { if ( !plane3_valid( m_plane.plane3() ) ) {
globalErrorStream() << "WARNING: invalid plane after snap to grid\n"; globalWarningStream() << "WARNING: invalid plane after snap to grid\n";
} }
} }
} }

10
radiant/brush_primit.cpp
View File

@ -567,11 +567,11 @@ void FaceToBrushPrimitFace( face_t *f ){
strcpy(f->brushprimit_texdef.name,f->texdef.name); */ strcpy(f->brushprimit_texdef.name,f->texdef.name); */
#ifdef DBG_BP #ifdef DBG_BP
if ( f->plane.normal[0] == 0.0f && f->plane.normal[1] == 0.0f && f->plane.normal[2] == 0.0f ) { if ( f->plane.normal[0] == 0.0f && f->plane.normal[1] == 0.0f && f->plane.normal[2] == 0.0f ) {
globalOutputStream() << "Warning : f->plane.normal is (0,0,0) in FaceToBrushPrimitFace\n"; globalWarningStream() << "Warning : f->plane.normal is (0,0,0) in FaceToBrushPrimitFace\n";
} }
// check d_texture // check d_texture
if ( !f->d_texture ) { if ( !f->d_texture ) {
globalOutputStream() << "Warning : f.d_texture is 0 in FaceToBrushPrimitFace\n"; globalWarningStream() << "Warning : f.d_texture is 0 in FaceToBrushPrimitFace\n";
return; return;
} }
#endif #endif
@ -626,10 +626,10 @@ void EmitBrushPrimitTextureCoordinates( face_t * f, Winding * w ){
float T = f->brushprimit_texdef.coords[1][0] * x + f->brushprimit_texdef.coords[1][1] * y + f->brushprimit_texdef.coords[1][2]; float 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.point_at( i )[3] ) > 1e-2 || fabs( T - w.point_at( i )[4] ) > 1e-2 ) { if ( fabs( S - w.point_at( i )[3] ) > 1e-2 || fabs( T - w.point_at( i )[4] ) > 1e-2 ) {
if ( fabs( S - w.point_at( i )[3] ) > 1e-4 || fabs( T - w.point_at( i )[4] ) > 1e-4 ) { if ( fabs( S - w.point_at( i )[3] ) > 1e-4 || fabs( T - w.point_at( i )[4] ) > 1e-4 ) {
globalOutputStream() << "Warning : precision loss in brush -> brush primitive texture computation\n"; globalWarningStream() << "Warning : precision loss in brush -> brush primitive texture computation\n";
} }
else{ else{
globalOutputStream() << "Warning : brush -> brush primitive texture computation bug detected\n"; globalWarningStream() << "Warning : brush -> brush primitive texture computation bug detected\n";
} }
} }
} }
@ -1059,7 +1059,7 @@ void ShiftTextureRelative_Camera( face_t *f, int x, int y ){
// for which the solution is easy (the other one being unknown) // for which the solution is easy (the other one being unknown)
// so this warning could be removed // so this warning could be removed
if ( axis[0] == axis[1] ) { if ( axis[0] == axis[1] ) {
globalOutputStream() << "Warning: degenerate in ShiftTextureRelative_Camera\n"; globalWarningStream() << "Warning: degenerate in ShiftTextureRelative_Camera\n";
} }
// compute the X Y geometric increments // compute the X Y geometric increments

2
radiant/commands.cpp
View File

@ -583,7 +583,7 @@ void visit( const char* name, Accelerator& accelerator ){
} }
else else
{ {
globalOutputStream() << "WARNING: failed to parse user command " << makeQuoted( name ) << ": unknown key " << makeQuoted( value ) << "\n"; globalWarningStream() << "WARNING: failed to parse user command " << makeQuoted( name ) << ": unknown key " << makeQuoted( value ) << "\n";
} }
} }
} }

2
radiant/entity.cpp
View File

@ -618,7 +618,7 @@ const char* misc_model_dialog( GtkWidget* parent ){
// use VFS to get the correct relative path // use VFS to get the correct relative path
const char* relative = path_make_relative( filename, GlobalFileSystem().findRoot( filename ) ); const char* relative = path_make_relative( filename, GlobalFileSystem().findRoot( filename ) );
if ( relative == filename ) { if ( relative == filename ) {
globalOutputStream() << "WARNING: could not extract the relative path, using full path instead\n"; globalWarningStream() << "WARNING: could not extract the relative path, using full path instead\n";
} }
return relative; return relative;
} }

2
radiant/entityinspector.cpp
View File

@ -336,7 +336,7 @@ const char* browse_sound( GtkWidget* parent ){
if ( filename != 0 ) { if ( filename != 0 ) {
const char* relative = path_make_relative( filename, GlobalFileSystem().findRoot( filename ) ); const char* relative = path_make_relative( filename, GlobalFileSystem().findRoot( filename ) );
if ( relative == filename ) { if ( relative == filename ) {
globalOutputStream() << "WARNING: could not extract the relative path, using full path instead\n"; globalWarningStream() << "WARNING: could not extract the relative path, using full path instead\n";
} }
return relative; return relative;
} }

6
radiant/feedback.cpp
View File

@ -61,7 +61,7 @@ void CSelectMsg::saxStartElement( message_info_t *ctx, const xmlChar *name, cons
ASSERT_MESSAGE( string_equal( reinterpret_cast<const char*>( name ), "brush" ), "FEEDBACK PARSE ERROR" ); ASSERT_MESSAGE( string_equal( reinterpret_cast<const char*>( name ), "brush" ), "FEEDBACK PARSE ERROR" );
ASSERT_MESSAGE( ESelectState == SELECT_MESSAGE, "FEEDBACK PARSE ERROR" ); ASSERT_MESSAGE( ESelectState == SELECT_MESSAGE, "FEEDBACK PARSE ERROR" );
ESelectState = SELECT_BRUSH; ESelectState = SELECT_BRUSH;
globalOutputStream() << message.c_str() << '\n'; globalWarningStream() << message.c_str() << '\n';
} }
} }
@ -100,7 +100,7 @@ void CPointMsg::saxStartElement( message_info_t *ctx, const xmlChar *name, const
ASSERT_MESSAGE( string_equal( reinterpret_cast<const char*>( name ), "point" ), "FEEDBACK PARSE ERROR" ); ASSERT_MESSAGE( string_equal( reinterpret_cast<const char*>( name ), "point" ), "FEEDBACK PARSE ERROR" );
ASSERT_MESSAGE( EPointState == POINT_MESSAGE, "FEEDBACK PARSE ERROR" ); ASSERT_MESSAGE( EPointState == POINT_MESSAGE, "FEEDBACK PARSE ERROR" );
EPointState = POINT_POINT; EPointState = POINT_POINT;
globalOutputStream() << message.c_str() << '\n'; globalWarningStream() << message.c_str() << '\n';
} }
} }
@ -158,7 +158,7 @@ void CWindingMsg::saxStartElement( message_info_t *ctx, const xmlChar *name, con
ASSERT_MESSAGE( string_equal( reinterpret_cast<const char*>( name ), "winding" ), "FEEDBACK PARSE ERROR" ); ASSERT_MESSAGE( string_equal( reinterpret_cast<const char*>( name ), "winding" ), "FEEDBACK PARSE ERROR" );
ASSERT_MESSAGE( EPointState == WINDING_MESSAGE, "FEEDBACK PARSE ERROR" ); ASSERT_MESSAGE( EPointState == WINDING_MESSAGE, "FEEDBACK PARSE ERROR" );
EPointState = WINDING_WINDING; EPointState = WINDING_WINDING;
globalOutputStream() << message.c_str() << '\n'; globalWarningStream() << message.c_str() << '\n';
} }
} }

2
radiant/patchdialog.cpp
View File

@ -1109,7 +1109,7 @@ void PatchInspector::GetPatchInfo(){
} }
else else
{ {
//globalOutputStream() << "WARNING: no patch\n"; //globalWarningStream() << "WARNING: no patch\n";
} }
// fill in our internal structs // fill in our internal structs
m_nRow = 0; m_nCol = 0; m_nRow = 0; m_nCol = 0;

2
radiant/preferences.cpp
View File

@ -136,7 +136,7 @@ CGameDescription::CGameDescription( xmlDocPtr pDoc, const CopiedString& gameFile
{ {
GameDescription::iterator i = m_gameDescription.find( "type" ); GameDescription::iterator i = m_gameDescription.find( "type" );
if ( i == m_gameDescription.end() ) { if ( i == m_gameDescription.end() ) {
globalErrorStream() << "Warning, 'type' attribute not found in '" << reinterpret_cast<const char*>( pDoc->URL ) << "'\n"; globalWarningStream() << "Warning, 'type' attribute not found in '" << reinterpret_cast<const char*>( pDoc->URL ) << "'\n";
// default // default
mGameType = "q3"; mGameType = "q3";
} }

2
radiant/qgl.cpp
View File

@ -574,7 +574,7 @@ void QGL_InitVersion(){
inline void extension_not_implemented( const char* extension ){ inline void extension_not_implemented( const char* extension ){
globalErrorStream() << "WARNING: OpenGL driver reports support for " << extension << " but does not implement it\n"; globalWarningStream() << "WARNING: OpenGL driver reports support for " << extension << " but does not implement it\n";
} }
float g_maxTextureAnisotropy; float g_maxTextureAnisotropy;

8
radiant/watchbsp.cpp
View File

@ -308,7 +308,7 @@ static void saxStartElement( message_info_t *data, const xmlChar *name, const xm
} }
else else
{ {
globalErrorStream() << "Warning: ignoring unrecognized node in XML stream (" << reinterpret_cast<const char*>( name ) << ")\n"; globalWarningStream() << "Warning: ignoring unrecognized node in XML stream (" << reinterpret_cast<const char*>( name ) << ")\n";
// we don't recognize this node, jump over it // we don't recognize this node, jump over it
// (NOTE: the ignore mechanism is a bit screwed, only works when starting an ignore at the highest level) // (NOTE: the ignore mechanism is a bit screwed, only works when starting an ignore at the highest level)
data->ignore_depth = data->recurse; data->ignore_depth = data->recurse;
@ -401,7 +401,7 @@ static void saxWarning( void *ctx, const char *msg, ... ){
va_start( args, msg ); va_start( args, msg );
vsprintf( saxMsgBuffer, msg, args ); vsprintf( saxMsgBuffer, msg, args );
va_end( args ); va_end( args );
globalOutputStream() << "XML warning: " << saxMsgBuffer << "\n"; globalWarningStream() << "XML warning: " << saxMsgBuffer << "\n";
} }
static void saxError( void *ctx, const char *msg, ... ){ static void saxError( void *ctx, const char *msg, ... ){
@ -648,8 +648,8 @@ void CWatchBSP::RoutineProcessing(){
int ret = Net_Wait( m_pInSocket, 0, 0 ); int ret = Net_Wait( m_pInSocket, 0, 0 );
if ( ret == -1 ) { if ( ret == -1 ) {
globalOutputStream() << "WARNING: SOCKET_ERROR in CWatchBSP::RoutineProcessing\n"; globalErrorStream() << "SOCKET_ERROR in CWatchBSP::RoutineProcessing\n";
globalOutputStream() << "Terminating the connection.\n"; globalErrorStream() << "Terminating the connection.\n";
EndMonitoringLoop(); EndMonitoringLoop();
return; return;
} }

4
radiant/xywindow.cpp
View File

@ -1719,7 +1719,7 @@ void XYWnd::XY_SnapToGrid( Vector3& point ){
void XYWnd::XY_LoadBackgroundImage( const char *name ){ void XYWnd::XY_LoadBackgroundImage( const char *name ){
const char* relative = path_make_relative( name, GlobalFileSystem().findRoot( name ) ); const char* relative = path_make_relative( name, GlobalFileSystem().findRoot( name ) );
if ( relative == name ) { if ( relative == name ) {
globalOutputStream() << "WARNING: could not extract the relative path, using full path instead\n"; globalWarningStream() << "WARNING: could not extract the relative path, using full path instead\n";
} }
char fileNameWithoutExt[512]; char fileNameWithoutExt[512];
@ -1729,7 +1729,7 @@ void XYWnd::XY_LoadBackgroundImage( const char *name ){
Image *image = QERApp_LoadImage( 0, fileNameWithoutExt ); Image *image = QERApp_LoadImage( 0, fileNameWithoutExt );
if ( !image ) { if ( !image ) {
globalOutputStream() << "Could not load texture " << fileNameWithoutExt << "\n"; globalErrorStream() << "Could not load texture " << fileNameWithoutExt << "\n";
return; return;
} }
g_pParentWnd->ActiveXY()->m_tex = (qtexture_t*)malloc( sizeof( qtexture_t ) ); g_pParentWnd->ActiveXY()->m_tex = (qtexture_t*)malloc( sizeof( qtexture_t ) );