move Preferences from ThemeManager to completely in PrefsManager

Also, allow Defaults.ini and Static.ini to have sections
This commit is contained in:
Chris Danford
2005-11-09 10:55:30 +00:00
parent 089a187a6c
commit 81037f05cd
9 changed files with 155 additions and 114 deletions
+3 -3
View File
@@ -587,7 +587,7 @@ void GameState::SetCurGame( const Game *pGame )
{
m_pCurGame.Set( pGame );
CString sGame = pGame ? CString(pGame->m_szName) : CString();
PREFSMAN->m_sCurrentGame.Set( sGame );
PREFSMAN->SetCurrentGame( sGame );
}
const float GameState::MUSIC_SECONDS_INVALID = -5000.0f;
@@ -1022,14 +1022,14 @@ StageResult GameState::GetStageResult( PlayerNumber pn ) const
void GameState::GetDefaultPlayerOptions( PlayerOptions &po )
{
po.Init();
po.FromString( PREFSMAN->GetCurrentGamePrefs().m_sDefaultModifiers );
po.FromString( PREFSMAN->m_sDefaultModifiers );
po.FromString( CommonMetrics::DEFAULT_MODIFIERS );
}
void GameState::GetDefaultSongOptions( SongOptions &so )
{
so.Init();
so.FromString( PREFSMAN->GetCurrentGamePrefs().m_sDefaultModifiers );
so.FromString( PREFSMAN->m_sDefaultModifiers );
so.FromString( CommonMetrics::DEFAULT_MODIFIERS );
}