diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 64ef7a3cef..b9288b5d15 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -162,19 +162,23 @@ PrefsManager::PrefsManager() m_sCoursesToShowRanking = ""; - ReadGlobalPrefsFromDisk( true ); + ReadGlobalPrefsFromDisk(); } PrefsManager::~PrefsManager() { } -void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame, CString fn ) +void PrefsManager::ReadGlobalPrefsFromDisk() { IniFile ini; - ini.SetPath( fn ); - if( !ini.ReadFile() ) - return; // could not read config file, load nothing + ini.SetPath( STEPMANIA_INI_PATH ); + ini.ReadFile(); + + /* Load this on top of the regular INI; if it exists, any settings listed + * in it will override user settings. */ + ini.SetPath( STATIC_INI_PATH ); + ini.ReadFile(); ini.GetValue( "Options", "Windowed", m_bWindowed ); ini.GetValue( "Options", "Interlaced", m_bInterlaced ); @@ -293,15 +297,6 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame, CStrin } } -void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame ) -{ - ReadGlobalPrefsFromDisk( bSwitchToLastPlayedGame, STEPMANIA_INI_PATH ); - - /* Load this on top of the regular INI; if it exists, any settings listed - * in it will override user settings. */ - ReadGlobalPrefsFromDisk( bSwitchToLastPlayedGame, STATIC_INI_PATH ); -} - void PrefsManager::SaveGlobalPrefsToDisk() const { IniFile ini; diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 163d8dccf3..172032599d 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -136,15 +136,12 @@ public: /* Game-specific prefs: */ CString m_sDefaultModifiers; - void ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame ); + void ReadGlobalPrefsFromDisk(); void SaveGlobalPrefsToDisk() const; void ReadGamePrefsFromDisk(); void SaveGamePrefsToDisk(); - -private: - void ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame, CString fn ); }; diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 5df7b0df73..1e1ef23629 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -793,7 +793,7 @@ int main(int argc, char* argv[]) delete loading_window; // destroy this before init'ing Display /* XXX: Why do we reload global prefs? PREFSMAN loads them in the ctor. -glenn */ - PREFSMAN->ReadGlobalPrefsFromDisk( true ); + PREFSMAN->ReadGlobalPrefsFromDisk(); ReadGamePrefsFromDisk(); DISPLAY = CreateDisplay();