From b2aa109cbcbc1d679d068063d32e3d0d940aff90 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 1 Nov 2005 17:05:07 +0000 Subject: [PATCH] GetLanguages: check all loaded themes --- stepmania/src/ThemeManager.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index bf68b4f708..ecad36eb56 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -145,12 +145,9 @@ bool ThemeManager::DoesThemeExist( const CString &sThemeName ) void ThemeManager::GetLanguages( CStringArray& AddTo ) { AddTo.clear(); - CStringArray asTemp; - /* XXX: this should use FallbackTheme */ - GetLanguagesForTheme( m_sCurThemeName, AddTo ); - GetLanguagesForTheme( BASE_THEME_NAME, asTemp ); - AddTo.insert( AddTo.begin(), asTemp.begin(), asTemp.end() ); + for( unsigned i = 0; i < g_vThemes.size(); ++i ) + GetLanguagesForTheme( g_vThemes[i].sThemeName, AddTo ); // remove dupes sort( AddTo.begin(), AddTo.end() ); @@ -786,7 +783,7 @@ void ThemeManager::GetLanguagesForTheme( const CString &sThemeName, CStringArray as[i] = as[i].Left( as[i].size()-4 ); } - asLanguagesOut = as; + asLanguagesOut.insert( asLanguagesOut.end(), as.begin(), as.end() ); } CString ThemeManager::GetLanguageIniPath( const CString &sThemeName, const CString &sLanguage )