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

fix PrefsManager::m_sCurrentGame not current, so GamePrefs from Static.ini weren't being used

Browse Source
This commit is contained in:
Chris Danford
2005-10-28 01:44:19 +00:00
parent 8c52221570
commit 6e5b3a5ed8
11 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.cpp
+5 -9
View File
@@ -747,11 +747,7 @@ void ChangeCurrentGame( const Game* g )
INPUTMAPPER->SaveMappingsToDisk(); // save mappings before switching the game
GAMESTATE->m_pCurGame = g;
/* Load this game's preferences. If we just set an unavailable game type, this
* will change it back to the default. */
PREFSMAN->m_sCurrentGame.Set( g->m_szName );
GAMESTATE->SetCurGame( g );
/* Save the newly-selected game. */
PREFSMAN->SavePrefsToDisk();
@@ -771,21 +767,21 @@ void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame )
{
ASSERT( GAMEMAN != NULL );
CString sGame;
GAMESTATE->m_pCurGame = NULL;
GAMESTATE->SetCurGame( NULL );
if( !PREFSMAN->m_sCurrentGame.Get().empty() )
GAMESTATE->m_pCurGame = GAMEMAN->StringToGameType( PREFSMAN->m_sCurrentGame );
GAMESTATE->SetCurGame( GAMEMAN->StringToGameType(PREFSMAN->m_sCurrentGame) );
}
/* If the active game type isn't actually available, revert to the default. */
if( GAMESTATE->m_pCurGame == NULL )
{
GAMESTATE->m_pCurGame = GAMEMAN->GetDefaultGame();
GAMESTATE->SetCurGame( GAMEMAN->GetDefaultGame() );
}
else if( !GAMEMAN->IsGameEnabled( GAMESTATE->m_pCurGame ) && GAMESTATE->m_pCurGame != GAMEMAN->GetDefaultGame() )
{
LOG->Warn( "Default NoteSkin for \"%s\" missing, reverting to \"%s\"",
GAMESTATE->m_pCurGame->m_szName, GAMEMAN->GetDefaultGame()->m_szName );
GAMESTATE->m_pCurGame = GAMEMAN->GetDefaultGame();
GAMESTATE->SetCurGame( GAMEMAN->GetDefaultGame() );
}
/* Load keymaps for the new game. */