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

theme -> localize

Browse Source
This commit is contained in:
Chris Danford
2006-01-29 22:17:54 +00:00
parent 880cf1591e
commit 370d11ee19
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ void OptionRow::PrepareItemText( RString &s ) const
} }
if( bTheme ) if( bTheme )
s = CommonMetrics::ThemeOptionItem( s, false ); s = CommonMetrics::LocalizeOptionItem( s, false );
if( m_pParentType->CAPITALIZE_ALL_OPTION_NAMES ) if( m_pParentType->CAPITALIZE_ALL_OPTION_NAMES )
s.MakeUpper(); s.MakeUpper();
} }
stepmania/src/PlayerOptions.cpp
+4 -5
View File
@@ -616,7 +616,7 @@ bool PlayerOptions::IsEasierForCourseAndTrail( Course* pCourse, Trail* pTrail )
return false; return false;
} }
void PlayerOptions::GetThemedMods( vector<RString> &AddTo ) const void PlayerOptions::GetLocalizedMods( vector<RString> &AddTo ) const
{ {
vector<RString> vMods; vector<RString> vMods;
GetMods( vMods ); GetMods( vMods );
@@ -641,11 +641,10 @@ void PlayerOptions::GetThemedMods( vector<RString> &AddTo ) const
/* Theme the mod name (the last string). Allow this to not exist, since /* Theme the mod name (the last string). Allow this to not exist, since
* characters might use modifiers that don't exist in the theme. */ * 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 ); RString sLocalizedMod = join( " ", asTokens );
AddTo.push_back( sLocalizedMod );
AddTo.push_back( sThemedMod );
} }
} }
stepmania/src/PlayerOptions.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
RString GetSavedPrefsString() const; // only the basic options that players would want for every song RString GetSavedPrefsString() const; // only the basic options that players would want for every song
void ResetSavedPrefs(); void ResetSavedPrefs();
void GetMods( vector<RString> &AddTo ) const; void GetMods( vector<RString> &AddTo ) const;
void GetThemedMods( vector<RString> &AddTo ) const; void GetLocalizedMods( vector<RString> &AddTo ) const;
void FromString( RString sOptions, bool bWarnOnInvalid = false ); void FromString( RString sOptions, bool bWarnOnInvalid = false );
void ChooseRandomModifiers(); void ChooseRandomModifiers();
bool ContainsTransformOrTurn() const; bool ContainsTransformOrTurn() const;
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -330,7 +330,7 @@ void ScreenEvaluation::Init()
m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) ); m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) );
SET_XY_AND_ON_COMMAND( m_textPlayerOptions[p] ); SET_XY_AND_ON_COMMAND( m_textPlayerOptions[p] );
vector<RString> v; vector<RString> v;
GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetThemedMods( v ); GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetLocalizedMods( v );
RString sPO = join( PLAYER_OPTIONS_SEPARATOR, v ); RString sPO = join( PLAYER_OPTIONS_SEPARATOR, v );
m_textPlayerOptions[p].SetText( sPO ); m_textPlayerOptions[p].SetText( sPO );
this->AddChild( &m_textPlayerOptions[p] ); this->AddChild( &m_textPlayerOptions[p] );