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

radiant/texwindow: fix a minor typo

Browse Source
This commit is contained in:
Thomas Debesse 2021-03-10 13:03:06 +01:00 committed by Garux
parent 42c00bfc67
commit c4b79d2194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
radiant/texwindow.cpp
View File

@ -323,7 +323,7 @@ void TextureBrowser_queueDraw( TextureBrowser& textureBrowser ){
} }
} }
const char* TextureBrowser_getComonShadersName(){ const char* TextureBrowser_getCommonShadersName(){
const char* value = g_pGameDescription->getKeyValue( "common_shaders_name" ); const char* value = g_pGameDescription->getKeyValue( "common_shaders_name" );
if ( !string_empty( value ) ) { if ( !string_empty( value ) ) {
return value; return value;
@ -331,7 +331,7 @@ const char* TextureBrowser_getComonShadersName(){
return "Common"; return "Common";
} }
const char* TextureBrowser_getComonShadersDir(){ const char* TextureBrowser_getCommonShadersDir(){
const char* value = g_pGameDescription->getKeyValue( "common_shaders_dir" ); const char* value = g_pGameDescription->getKeyValue( "common_shaders_dir" );
if ( !string_empty( value ) ) { if ( !string_empty( value ) ) {
return value; return value;
@ -516,7 +516,7 @@ bool Texture_IsShown( IShader* shader, TextureBrowser& textureBrowser ){
} }
if( textureBrowser.m_hideNonShadersInCommon && shader->IsDefault() && !shader->IsInUse() //&& g_TextureBrowser_currentDirectory != "" if( textureBrowser.m_hideNonShadersInCommon && shader->IsDefault() && !shader->IsInUse() //&& g_TextureBrowser_currentDirectory != ""
&& shader_equal_prefix( shader_get_textureName( shader->getName() ), TextureBrowser_getComonShadersDir() ) ){ && shader_equal_prefix( shader_get_textureName( shader->getName() ), TextureBrowser_getCommonShadersDir() ) ){
return false; return false;
} }
@ -844,7 +844,7 @@ void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnus
void TextureBrowser_ShowStartupShaders( TextureBrowser& textureBrowser ){ void TextureBrowser_ShowStartupShaders( TextureBrowser& textureBrowser ){
if ( textureBrowser.m_startupShaders == STARTUPSHADERS_COMMON ) { if ( textureBrowser.m_startupShaders == STARTUPSHADERS_COMMON ) {
TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getComonShadersDir() ); TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getCommonShadersDir() );
} }
} }
@ -1323,8 +1323,8 @@ gboolean TextureBrowser_button_press( GtkWidget* widget, GdkEventButton* event,
} }
} }
else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) { else if ( event->type == GDK_2BUTTON_PRESS && event->button == 3 ) {
ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getComonShadersDir(), "Loading Textures" ); ScopeDisableScreenUpdates disableScreenUpdates( TextureBrowser_getCommonShadersDir(), "Loading Textures" );
TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getComonShadersDir() ); TextureBrowser_ShowDirectory( *textureBrowser, TextureBrowser_getCommonShadersDir() );
TextureBrowser_queueDraw( *textureBrowser ); TextureBrowser_queueDraw( *textureBrowser );
} }
return FALSE; return FALSE;
@ -2686,12 +2686,12 @@ void TextureBrowser_constructPreferences( PreferencesPage& page ){
page.appendSpinner( "Thumbnails Min Size", GlobalTextureBrowser().m_uniformTextureMinSize, 48.0, 16, 8192 ); page.appendSpinner( "Thumbnails Min Size", GlobalTextureBrowser().m_uniformTextureMinSize, 48.0, 16, 8192 );
page.appendEntry( "Mousewheel Increment", GlobalTextureBrowser().m_mouseWheelScrollIncrement ); page.appendEntry( "Mousewheel Increment", GlobalTextureBrowser().m_mouseWheelScrollIncrement );
{ {
const char* startup_shaders[] = { "None", TextureBrowser_getComonShadersName() }; const char* startup_shaders[] = { "None", TextureBrowser_getCommonShadersName() };
page.appendCombo( "Load Shaders at Startup", reinterpret_cast<int&>( GlobalTextureBrowser().m_startupShaders ), STRING_ARRAY_RANGE( startup_shaders ) ); page.appendCombo( "Load Shaders at Startup", reinterpret_cast<int&>( GlobalTextureBrowser().m_startupShaders ), STRING_ARRAY_RANGE( startup_shaders ) );
} }
{ {
StringOutputStream sstream( 256 ); StringOutputStream sstream( 256 );
sstream << "Hide nonShaders in " << TextureBrowser_getComonShadersDir() << " folder"; sstream << "Hide nonShaders in " << TextureBrowser_getCommonShadersDir() << " folder";
page.appendCheckBox( page.appendCheckBox(
"", sstream.c_str(), "", sstream.c_str(),
GlobalTextureBrowser().m_hideNonShadersInCommon GlobalTextureBrowser().m_hideNonShadersInCommon