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:45:15 +00:00
parent a010517276
commit 303ae8cfea
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.cpp
+16 -24
View File
@@ -764,44 +764,36 @@ void StepMania::ChangeCurrentGame( const Game* g )
INPUTMAPPER->ReadMappingsFromDisk(); INPUTMAPPER->ReadMappingsFromDisk();
} }
static void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame ) static void ReadGamePrefsFromDisk()
{ {
ASSERT( GAMESTATE ); ASSERT( GAMESTATE );
ASSERT( ANNOUNCER ); ASSERT( ANNOUNCER );
ASSERT( THEME ); ASSERT( THEME );
ASSERT( GAMESTATE ); ASSERT( GAMEMAN );
if( bSwitchToLastPlayedGame ) const Game *pGame = GAMEMAN->StringToGameType( PREFSMAN->GetCurrentGame() );
{
ASSERT( GAMEMAN != NULL );
RString sGame = PREFSMAN->GetCurrentGame();
if( !sGame.empty() )
{
const Game *pGame = GAMEMAN->StringToGameType(sGame);
GAMESTATE->SetCurGame( pGame );
}
}
/* If the active game type isn't actually available, revert to the default. */ /* If the active game type isn't actually available, revert to the default. */
if( GAMESTATE->m_pCurGame == NULL ) if( pGame == NULL )
{ pGame = GAMEMAN->GetDefaultGame();
GAMESTATE->SetCurGame( GAMEMAN->GetDefaultGame() );
} if( !GAMEMAN->IsGameEnabled( pGame ) && pGame != GAMEMAN->GetDefaultGame() )
else if( !GAMEMAN->IsGameEnabled( GAMESTATE->m_pCurGame ) && GAMESTATE->m_pCurGame != GAMEMAN->GetDefaultGame() )
{ {
pGame = GAMEMAN->GetDefaultGame();
LOG->Warn( "Default NoteSkin for \"%s\" missing, reverting to \"%s\"", LOG->Warn( "Default NoteSkin for \"%s\" missing, reverting to \"%s\"",
GAMESTATE->m_pCurGame->m_szName, GAMEMAN->GetDefaultGame()->m_szName ); pGame->m_szName, GAMEMAN->GetDefaultGame()->m_szName );
GAMESTATE->SetCurGame( GAMEMAN->GetDefaultGame() );
} }
/* If the default isn't available, our default note skin is messed up. */
if( !GAMEMAN->IsGameEnabled(pGame) )
RageException::Throw( "Default NoteSkin for \"%s\" missing", pGame->m_szName );
GAMESTATE->SetCurGame( pGame );
/* Load keymaps for the new game. */ /* Load keymaps for the new game. */
if( INPUTMAPPER ) if( INPUTMAPPER )
INPUTMAPPER->ReadMappingsFromDisk(); INPUTMAPPER->ReadMappingsFromDisk();
/* If the default isn't available, our default note skin is messed up. */
if( !GAMEMAN->IsGameEnabled( GAMESTATE->m_pCurGame ) )
RageException::Throw( "Default NoteSkin for \"%s\" missing", GAMESTATE->m_pCurGame->m_szName );
RString sGameName = GAMESTATE->GetCurrentGame()->m_szName; RString sGameName = GAMESTATE->GetCurrentGame()->m_szName;
RString sAnnouncer = sGameName; RString sAnnouncer = sGameName;
RString sTheme = sGameName; RString sTheme = sGameName;
@@ -1021,7 +1013,7 @@ int main(int argc, char* argv[])
NOTESKIN = new NoteSkinManager; NOTESKIN = new NoteSkinManager;
/* Set up the theme and announcer, and switch to the last game type. */ /* Set up the theme and announcer, and switch to the last game type. */
ReadGamePrefsFromDisk( true ); ReadGamePrefsFromDisk();
{ {
/* Now that THEME is loaded, load the icon for the current theme into the /* Now that THEME is loaded, load the icon for the current theme into the