actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Avoid extra work when changing the language and not the theme.

Browse Source
This commit is contained in:
Glenn Maynard
2005-11-01 19:15:26 +00:00
parent 826804bf84
commit a46086fdda
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+9 -4
View File
@@ -254,21 +254,26 @@ void ThemeManager::SwitchThemeAndLanguage( const CString &sThemeName_, const CSt
if( sThemeName == m_sCurThemeName && sLanguage == m_sCurLanguage ) if( sThemeName == m_sCurThemeName && sLanguage == m_sCurLanguage )
return; return;
// Load theme metrics. If only the language is changing, this is all
// we need to reload.
bool bThemeChanging = (sThemeName != m_sCurThemeName);
LoadThemeMetrics( g_vThemes, sThemeName, sLanguage );
if( bThemeChanging )
{
// clear theme path cache // clear theme path cache
for( int i = 0; i < NUM_ElementCategory; ++i ) for( int i = 0; i < NUM_ElementCategory; ++i )
g_ThemePathCache[i].clear(); g_ThemePathCache[i].clear();
// load current theme
LoadThemeMetrics( g_vThemes, sThemeName, sLanguage );
// reload common sounds // reload common sounds
if ( SCREENMAN != NULL ) if( SCREENMAN != NULL )
SCREENMAN->ThemeChanged(); SCREENMAN->ThemeChanged();
/* Lua globals can use metrics which are cached, and vice versa. Update Lua /* Lua globals can use metrics which are cached, and vice versa. Update Lua
* globals first; it's Lua's job to explicitly update cached metrics that it * globals first; it's Lua's job to explicitly update cached metrics that it
* uses. */ * uses. */
UpdateLuaGlobals(); UpdateLuaGlobals();
}
// reload subscribers // reload subscribers
FOREACHS_CONST( IThemeMetric*, *SubscriptionManager<IThemeMetric>::s_pSubscribers, p ) FOREACHS_CONST( IThemeMetric*, *SubscriptionManager<IThemeMetric>::s_pSubscribers, p )