mirror of
https://github.com/Garux/netradiant-custom.git
synced 2026-09-28 00:00:03 +02:00
more Quoted use
This commit is contained in:
@@ -195,7 +195,7 @@ const char* QERPlug_GetCommandTitleList(){
|
||||
|
||||
|
||||
void QERPlug_Dispatch( const char* p, float* vMin, float* vMax, bool bSingleBrush ){
|
||||
globalOutputStream() << MSG_PREFIX "Command \"" << p << "\"\n";
|
||||
globalOutputStream() << MSG_PREFIX "Command " << Quoted( p ) << '\n';
|
||||
|
||||
if ( !strcmp( p, Q3R_CMD_ABOUT ) ) {
|
||||
DoAboutDlg();
|
||||
|
||||
@@ -55,7 +55,7 @@ scene::Node& createPrimitive( const char* name ){
|
||||
return GlobalPatchCreator().createPatch();
|
||||
}
|
||||
|
||||
ASSERT_MESSAGE( 0, PARSE_ERROR << ": primitive type not supported: \"" << name << "\"\n" );
|
||||
ASSERT_MESSAGE( 0, PARSE_ERROR << ": primitive type not supported: " << Quoted( name ) << '\n' );
|
||||
scene::Node* node = 0;
|
||||
return *node;
|
||||
}
|
||||
|
||||
@@ -1566,7 +1566,7 @@ void ShaderList_addShaderFile( const char* dirstring ){
|
||||
{
|
||||
if ( string_equal_nocase( dirstring, sh.c_str() ) ) {
|
||||
found = true;
|
||||
globalOutputStream() << "duplicate entry \"" << sh << "\" in shaderlist.txt\n";
|
||||
globalOutputStream() << "duplicate entry " << Quoted( sh ) << " in shaderlist.txt\n";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ ModelLoader* ModelLoader_forType( const char* type ){
|
||||
}
|
||||
else
|
||||
{
|
||||
globalErrorStream() << "ERROR: Model type incorrectly registered: \"" << moduleName << "\"\n";
|
||||
globalErrorStream() << "ERROR: Model type incorrectly registered: " << Quoted( moduleName ) << '\n';
|
||||
return &g_NullModelLoader;
|
||||
}
|
||||
}
|
||||
@@ -188,13 +188,13 @@ NodeSmartReference ModelResource_load( ModelLoader* loader, const char* name ){
|
||||
ArchiveFile* file = GlobalFileSystem().openFile( name );
|
||||
|
||||
if ( file != 0 ) {
|
||||
globalOutputStream() << "Loaded Model: \"" << name << "\"\n";
|
||||
globalOutputStream() << "Loaded Model: " << Quoted( name ) << '\n';
|
||||
model = loader->loadModel( *file );
|
||||
file->release();
|
||||
}
|
||||
else
|
||||
{
|
||||
globalErrorStream() << "Model load failed: \"" << name << "\"\n";
|
||||
globalErrorStream() << "Model load failed: " << Quoted( name ) << '\n';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -290,14 +290,14 @@ NodeSmartReference Model_load( ModelLoader* loader, const char* path, const char
|
||||
}
|
||||
else
|
||||
{
|
||||
globalErrorStream() << "ERROR: Map type incorrectly registered: \"" << moduleName << "\"\n";
|
||||
globalErrorStream() << "ERROR: Map type incorrectly registered: " << Quoted( moduleName ) << '\n';
|
||||
return g_nullModel;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( string_not_empty( type ) ) {
|
||||
globalErrorStream() << "Model type not supported: \"" << name << "\"\n";
|
||||
globalErrorStream() << "Model type not supported: " << Quoted( name ) << '\n';
|
||||
}
|
||||
return g_nullModel;
|
||||
}
|
||||
@@ -556,12 +556,12 @@ public:
|
||||
}
|
||||
|
||||
Resource* capture( const char* path ) override {
|
||||
//globalOutputStream() << "capture: \"" << path << "\"\n";
|
||||
//globalOutputStream() << "capture: " << Quoted( path ) << '\n';
|
||||
return m_references.capture( CopiedString( path ) ).get();
|
||||
}
|
||||
void release( const char* path ) override {
|
||||
m_references.release( CopiedString( path ) );
|
||||
//globalOutputStream() << "release: \"" << path << "\"\n";
|
||||
//globalOutputStream() << "release: " << Quoted( path ) << '\n';
|
||||
}
|
||||
|
||||
void setEntityCreator( EntityCreator& entityCreator ) override {
|
||||
|
||||
@@ -342,12 +342,12 @@ void qtexture_realise( qtexture_t& texture, const TextureKey& key ){
|
||||
texture.contentFlags = image->getContentFlags();
|
||||
texture.value = image->getValue();
|
||||
image->release();
|
||||
globalOutputStream() << "Loaded Texture: \"" << key.second << "\"\n";
|
||||
globalOutputStream() << "Loaded Texture: " << Quoted( key.second ) << '\n';
|
||||
GlobalOpenGL_debugAssertNoErrors();
|
||||
}
|
||||
else
|
||||
{
|
||||
globalErrorStream() << "Texture load failed: \"" << key.second << "\"\n";
|
||||
globalErrorStream() << "Texture load failed: " << Quoted( key.second ) << '\n';
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -386,12 +386,12 @@ void qtexture_realise( qtexture_t& texture, const TextureKey& key ){
|
||||
}
|
||||
|
||||
gl().glBindTexture( GL_TEXTURE_CUBE_MAP, 0 );
|
||||
globalOutputStream() << "Loaded Skybox: \"" << key.second << "\"\n";
|
||||
globalOutputStream() << "Loaded Skybox: " << Quoted( key.second ) << '\n';
|
||||
GlobalOpenGL_debugAssertNoErrors();
|
||||
}
|
||||
else
|
||||
{
|
||||
globalErrorStream() << "Skybox load failed: \"" << key.second << "\"\n";
|
||||
globalErrorStream() << "Skybox load failed: " << Quoted( key.second ) << '\n';
|
||||
}
|
||||
|
||||
std::for_each_n( images, std::size( images ), []( Image *img ){ if( img != nullptr ) img->release(); } );
|
||||
|
||||
@@ -481,7 +481,7 @@ void UnparseEntities(){
|
||||
for ( const auto& ep : e.epairs )
|
||||
{
|
||||
/* copy and clean */
|
||||
data << '\"' << StripTrailing( ep.key.c_str() ) << "\" \"" << StripTrailing( ep.value.c_str() ) << "\"\n";
|
||||
data << Quoted( StripTrailing( ep.key.c_str() ) ) << ' ' << Quoted( StripTrailing( ep.value.c_str() ) ) << '\n';
|
||||
}
|
||||
|
||||
/* add trailing brace */
|
||||
|
||||
Reference in New Issue
Block a user