theme -> localize
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
@@ -616,7 +616,7 @@ bool PlayerOptions::IsEasierForCourseAndTrail( Course* pCourse, Trail* pTrail )
|
||||
return false;
|
||||
}
|
||||
|
||||
void PlayerOptions::GetThemedMods( vector<RString> &AddTo ) const
|
||||
void PlayerOptions::GetLocalizedMods( vector<RString> &AddTo ) const
|
||||
{
|
||||
vector<RString> 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
|
||||
* 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 );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ public:
|
||||
RString GetSavedPrefsString() const; // only the basic options that players would want for every song
|
||||
void ResetSavedPrefs();
|
||||
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 ChooseRandomModifiers();
|
||||
bool ContainsTransformOrTurn() const;
|
||||
|
||||
@@ -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<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 );
|
||||
m_textPlayerOptions[p].SetText( sPO );
|
||||
this->AddChild( &m_textPlayerOptions[p] );
|
||||
|
||||
Reference in New Issue
Block a user