From 18d29783ba6387f2ef1b3b3bf4f3c1453ff9b6bc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 29 Dec 2005 02:34:27 +0000 Subject: [PATCH] compile fix --- stepmania/src/ThemeManager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 99de55f1d0..f929d79c85 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -219,8 +219,8 @@ void ThemeManager::LoadThemeMetrics( deque &theme, const RString &sThemeN IniFile ini; ini.ReadFile( GetMetricsIniPath(sThemeName) ); - ini.ReadFile( GetLanguageIniPath(sThemeName,BASE_LANGUAGE) ); - if( sLanguage.CompareNoCase(BASE_LANGUAGE) ) + ini.ReadFile( GetLanguageIniPath(sThemeName,SpecialFiles::BASE_LANGUAGE) ); + if( sLanguage.CompareNoCase(SpecialFiles::BASE_LANGUAGE) ) ini.ReadFile( GetLanguageIniPath(sThemeName,sLanguage) ); bool bIsBaseTheme = !sThemeName.CompareNoCase(BASE_THEME_NAME); @@ -468,7 +468,7 @@ try_element_again: if( iDist == 0 ) { /* We didn't find any for the current language. Try BASE_LANGUAGE. */ - it = partition( asElementPaths.begin(), asElementPaths.end(), CompareLanguageTag(BASE_LANGUAGE) ); + it = partition( asElementPaths.begin(), asElementPaths.end(), CompareLanguageTag(SpecialFiles::BASE_LANGUAGE) ); iDist = distance( asElementPaths.begin(), it ); } @@ -656,7 +656,7 @@ try_element_again: RString ThemeManager::GetMetricsIniPath( const RString &sThemeName ) { - return GetThemeDirFromName( sThemeName ) + METRICS_FILE; + return GetThemeDirFromName( sThemeName ) + SpecialFiles::METRICS_FILE; } bool ThemeManager::HasMetric( const RString &sClassName, const RString &sValueName ) @@ -852,7 +852,7 @@ void ThemeManager::GetLanguagesForTheme( const RString &sThemeName, vector=0; i-- ) { - if( as[i].CompareNoCase(METRICS_FILE)==0 ) + if( as[i].CompareNoCase(SpecialFiles::METRICS_FILE)==0 ) as.erase( as.begin()+i ); // strip ".ini" as[i] = as[i].Left( as[i].size()-4 );