From 49782b331ba46ecbf8f286161624a6c6f1ff912a Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 29 Jan 2006 22:13:36 +0000 Subject: [PATCH] Theme -> Localize --- stepmania/src/ActiveAttackList.cpp | 2 +- stepmania/src/CatalogXml.cpp | 14 +++++++------- stepmania/src/CommonMetrics.cpp | 24 ++++++++++++------------ stepmania/src/CommonMetrics.h | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/stepmania/src/ActiveAttackList.cpp b/stepmania/src/ActiveAttackList.cpp index 0bb3f39692..ddaa5df788 100644 --- a/stepmania/src/ActiveAttackList.cpp +++ b/stepmania/src/ActiveAttackList.cpp @@ -46,7 +46,7 @@ void ActiveAttackList::Refresh() PlayerOptions po; po.FromString( attack.sModifiers, true ); - po.GetThemedMods( vsThemedMods ); + po.GetLocalizedMods( vsThemedMods ); } RString s = join( "\n", vsThemedMods ); diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp index 29aa785ee4..e64e94668d 100644 --- a/stepmania/src/CatalogXml.cpp +++ b/stepmania/src/CatalogXml.cpp @@ -131,15 +131,15 @@ void SaveCatalogXml( LoadingWindow *loading_window ) continue; switch( e->m_Type ) { - case UnlockEntry::TYPE_SONG: iNumUnlockedSongs++; break; - case UnlockEntry::TYPE_STEPS: iNumUnlockedSteps++; break; - case UnlockEntry::TYPE_COURSE: iNumUnlockedCourses++; break; + case UnlockRewardType_Song: iNumUnlockedSongs++; break; + case UnlockRewardType_Steps: iNumUnlockedSteps++; break; + case UnlockRewardType_Course: iNumUnlockedCourses++; break; } } - pNode->AppendChild( "TotalSongs", iTotalSongs ); - pNode->AppendChild( "TotalSteps", iTotalSteps ); - pNode->AppendChild( "TotalCourses", iTotalCourses ); + pNode->AppendChild( "TotalSongs", iTotalSongs ); + pNode->AppendChild( "TotalSteps", iTotalSteps ); + pNode->AppendChild( "TotalCourses", iTotalCourses ); pNode->AppendChild( "NumUnlockedSongs", iNumUnlockedSongs ); pNode->AppendChild( "NumUnlockedSteps", iNumUnlockedSteps ); pNode->AppendChild( "NumUnlockedCourses", iNumUnlockedCourses ); @@ -355,7 +355,7 @@ void SaveCatalogXml( LoadingWindow *loading_window ) RString s = *iter; po.FromString( s, false ); vector v; - po.GetThemedMods( v ); + po.GetLocalizedMods( v ); if( v.empty() ) continue; XNode* pNode3 = pNode2->AppendChild( "Modifier", *iter ); diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index 76b2b87635..4713c6d067 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -10,17 +10,17 @@ static RString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); } -ThemeMetric CommonMetrics::INITIAL_SCREEN ("Common","InitialScreen", true); // always reevaluate metric -ThemeMetric CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen"); -ThemeMetric CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" ); -ThemeMetric CommonMetrics::DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" ); -ThemeMetric1D CommonMetrics::PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS); -LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle"); -ThemeMetric CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious"); -ThemeMetric CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); -ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow"); -ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow"); -ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide"); +ThemeMetric CommonMetrics::INITIAL_SCREEN ("Common","InitialScreen", true); // always reevaluate metric +ThemeMetric CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen"); +ThemeMetric CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" ); +ThemeMetric CommonMetrics::DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" ); +ThemeMetric1D CommonMetrics::PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS); +LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle"); +ThemeMetric CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious"); +ThemeMetric CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); +ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow"); +ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow"); +ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide"); ThemeMetricDifficultiesToShow::ThemeMetricDifficultiesToShow( const RString& sGroup, const RString& sName ) : @@ -122,7 +122,7 @@ void ThemeMetricStepsTypesToShow::Read() const vector& ThemeMetricStepsTypesToShow::GetValue() { return m_v; } -RString CommonMetrics::ThemeOptionItem( RString s, bool bOptional ) +RString CommonMetrics::LocalizeOptionItem( const RString &s, bool bOptional ) { if( bOptional && !THEME->HasMetric("OptionNames",s) ) return s; diff --git a/stepmania/src/CommonMetrics.h b/stepmania/src/CommonMetrics.h index f4cc57464d..582a103e94 100644 --- a/stepmania/src/CommonMetrics.h +++ b/stepmania/src/CommonMetrics.h @@ -62,7 +62,7 @@ namespace CommonMetrics extern ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW; extern ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW; - RString ThemeOptionItem( RString s, bool bOptional ); + RString LocalizeOptionItem( const RString &s, bool bOptional ); }; #endif