diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 1056963992..34b56edbf0 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -374,6 +374,11 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) if( !ini.ReadFile(sIni) ) return; + ReadGlobalPrefsFromIni( ini ); +} + +void PrefsManager::ReadGlobalPrefsFromIni( const IniFile &ini ) +{ ini.GetValue( "Options", "CelShadeModels", m_bCelShadeModels ); ini.GetValue( "Options", "ConstantUpdateDeltaSeconds", m_fConstantUpdateDeltaSeconds ); ini.GetValue( "Options", "NumArcadeStages", m_iNumArcadeStages ); @@ -575,7 +580,12 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) void PrefsManager::SaveGlobalPrefsToDisk() const { IniFile ini; + SaveGlobalPrefsToIni( ini ); + ini.WriteFile( STEPMANIA_INI_PATH ); +} +void PrefsManager::SaveGlobalPrefsToIni( IniFile &ini ) const +{ ini.SetValue( "Options", "CelShadeModels", m_bCelShadeModels ); ini.SetValue( "Options", "ConstantUpdateDeltaSeconds", m_fConstantUpdateDeltaSeconds ); ini.SetValue( "Options", "UseDedicatedMenuButtons", m_bOnlyDedicatedMenuButtons ); @@ -815,8 +825,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const FOREACHS_CONST( IPreference*, *SubscriptionManager::s_pSubscribers, p ) (*p)->WriteTo( ini ); - - ini.WriteFile( STEPMANIA_INI_PATH ); } diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index c432e9b9fd..35a6dba2d3 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -293,6 +293,9 @@ public: bool m_bLogVirtualMemory; // (under debug) log the virtual memory allocation, etc. #endif + void ReadGlobalPrefsFromIni( const IniFile &ini ); + void SaveGlobalPrefsToIni( IniFile &ini ) const; + void ReadGlobalPrefsFromDisk(); void SaveGlobalPrefsToDisk() const;