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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-30 07:47:54 +00:00
parent 303ae8cfea
commit 09f5687615
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.cpp
+6 -8
View File
@@ -794,15 +794,13 @@ static void ReadGamePrefsFromDisk()
if( INPUTMAPPER ) if( INPUTMAPPER )
INPUTMAPPER->ReadMappingsFromDisk(); INPUTMAPPER->ReadMappingsFromDisk();
RString sGameName = GAMESTATE->GetCurrentGame()->m_szName; RString sAnnouncer = PREFSMAN->m_sAnnouncer;
RString sAnnouncer = sGameName; RString sTheme = PREFSMAN->m_sTheme;
RString sTheme = sGameName;
// if these calls fail, the three strings will keep the initial values set above. if( sAnnouncer.empty() )
if( !PREFSMAN->m_sAnnouncer.Get().empty() ) sAnnouncer = GAMESTATE->GetCurrentGame()->m_szName;
sAnnouncer = PREFSMAN->m_sAnnouncer; if( sTheme.empty() )
if( !PREFSMAN->m_sTheme.Get().empty() ) sTheme = GAMESTATE->GetCurrentGame()->m_szName;
sTheme = PREFSMAN->m_sTheme;
// 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 );