From 370d11ee19bc9a204f4d8be9c6c0d0be9fd4316c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 29 Jan 2006 22:17:54 +0000 Subject: [PATCH] theme -> localize --- stepmania/src/OptionRow.cpp | 2 +- stepmania/src/PlayerOptions.cpp | 9 ++++----- stepmania/src/PlayerOptions.h | 2 +- stepmania/src/ScreenEvaluation.cpp | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 12edf59b2b..f67bdaa975 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -50,7 +50,7 @@ void OptionRow::PrepareItemText( RString &s ) const } if( bTheme ) - s = CommonMetrics::ThemeOptionItem( s, false ); + s = CommonMetrics::LocalizeOptionItem( s, false ); if( m_pParentType->CAPITALIZE_ALL_OPTION_NAMES ) s.MakeUpper(); } diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index f1bbfa089a..05b94cb503 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -616,7 +616,7 @@ bool PlayerOptions::IsEasierForCourseAndTrail( Course* pCourse, Trail* pTrail ) return false; } -void PlayerOptions::GetThemedMods( vector &AddTo ) const +void PlayerOptions::GetLocalizedMods( vector &AddTo ) const { vector vMods; GetMods( vMods ); @@ -641,11 +641,10 @@ void PlayerOptions::GetThemedMods( vector &AddTo ) const /* Theme the mod name (the last string). Allow this to not exist, since * characters might use modifiers that don't exist in the theme. */ - asTokens.back() = CommonMetrics::ThemeOptionItem( asTokens.back(), true ); + asTokens.back() = CommonMetrics::LocalizeOptionItem( asTokens.back(), true ); - RString sThemedMod = join( " ", asTokens ); - - AddTo.push_back( sThemedMod ); + RString sLocalizedMod = join( " ", asTokens ); + AddTo.push_back( sLocalizedMod ); } } diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h index ca9a3a1dc9..428ad2f4bb 100644 --- a/stepmania/src/PlayerOptions.h +++ b/stepmania/src/PlayerOptions.h @@ -20,7 +20,7 @@ public: RString GetSavedPrefsString() const; // only the basic options that players would want for every song void ResetSavedPrefs(); void GetMods( vector &AddTo ) const; - void GetThemedMods( vector &AddTo ) const; + void GetLocalizedMods( vector &AddTo ) const; void FromString( RString sOptions, bool bWarnOnInvalid = false ); void ChooseRandomModifiers(); bool ContainsTransformOrTurn() const; diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 17c3a7ab94..9057dcf7d3 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -330,7 +330,7 @@ void ScreenEvaluation::Init() m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_textPlayerOptions[p] ); vector v; - GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetThemedMods( v ); + GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetLocalizedMods( v ); RString sPO = join( PLAYER_OPTIONS_SEPARATOR, v ); m_textPlayerOptions[p].SetText( sPO ); this->AddChild( &m_textPlayerOptions[p] );