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

set theme and pseudolocalize at the same time

Browse Source
This commit is contained in:
Chris Danford
2006-01-08 05:35:02 +00:00
parent 6012947d00
commit 9c377d3f00
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMasterPrefs.cpp
+2 -2
View File
@@ -171,7 +171,7 @@ static void Language( int &sel, bool ToSel, const ConfOption *pConfOption )
const CString sNewLanguage = choices[sel]; const CString sNewLanguage = choices[sel];
if( THEME->GetCurLanguage() != sNewLanguage ) if( THEME->GetCurLanguage() != sNewLanguage )
THEME->SwitchThemeAndLanguage( THEME->GetCurThemeName(), sNewLanguage ); THEME->SwitchThemeAndLanguage( THEME->GetCurThemeName(), sNewLanguage, PREFSMAN->m_bPseudoLocalize );
} }
} }
@@ -206,7 +206,7 @@ static void Theme( int &sel, bool ToSel, const ConfOption *pConfOption )
} else { } else {
const CString sNewTheme = choices[sel]; const CString sNewTheme = choices[sel];
if( THEME->GetCurThemeName() != sNewTheme ) if( THEME->GetCurThemeName() != sNewTheme )
THEME->SwitchThemeAndLanguage( sNewTheme, THEME->GetCurLanguage() ); THEME->SwitchThemeAndLanguage( sNewTheme, THEME->GetCurLanguage(), PREFSMAN->m_bPseudoLocalize );
} }
} }
stepmania/src/StepMania.cpp
+2 -11
View File
@@ -291,7 +291,7 @@ void StepMania::ResetGame()
CString sGameName = GAMESTATE->GetCurrentGame()->m_szName; CString sGameName = GAMESTATE->GetCurrentGame()->m_szName;
if( !THEME->DoesThemeExist(sGameName) ) if( !THEME->DoesThemeExist(sGameName) )
sGameName = "default"; sGameName = "default";
THEME->SwitchThemeAndLanguage( sGameName, THEME->GetCurLanguage() ); THEME->SwitchThemeAndLanguage( sGameName, THEME->GetCurLanguage(), PREFSMAN->m_bPseudoLocalize );
TEXTUREMAN->DoDelayedDelete(); TEXTUREMAN->DoDelayedDelete();
} }
@@ -793,8 +793,7 @@ void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame )
// it's OK to call these functions with names that don't exist. // it's OK to call these functions with names that don't exist.
ANNOUNCER->SwitchAnnouncer( sAnnouncer ); ANNOUNCER->SwitchAnnouncer( sAnnouncer );
THEME->SwitchThemeAndLanguage( sTheme, PREFSMAN->m_sLanguage ); THEME->SwitchThemeAndLanguage( sTheme, PREFSMAN->m_sLanguage, PREFSMAN->m_bPseudoLocalize );
THEME->SetPseudoLocalilze( PREFSMAN->m_bPseudoLocalize );
} }
@@ -878,11 +877,6 @@ static void ApplyLogPreferences()
Checkpoints::LogCheckpoints( PREFSMAN->m_bLogCheckpoints ); Checkpoints::LogCheckpoints( PREFSMAN->m_bLogCheckpoints );
} }
static CString LocalizeString( const CString &sSection, const CString &s )
{
return THEME->GetString( sSection, s );
}
static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." ); static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." );
#ifdef _XBOX #ifdef _XBOX
@@ -1024,9 +1018,6 @@ int main(int argc, char* argv[])
delete pIcon; delete pIcon;
} }
LocalizedString::RegisterLocalizer( LocalizeString );
LocalizedString::RefreshLocalizedStrings();
if( PREFSMAN->m_iSoundWriteAhead ) if( PREFSMAN->m_iSoundWriteAhead )
LOG->Info( "Sound writeahead has been overridden to %i", PREFSMAN->m_iSoundWriteAhead.Get() ); LOG->Info( "Sound writeahead has been overridden to %i", PREFSMAN->m_iSoundWriteAhead.Get() );