From afa29318fcb9fa92a63c82341213b317d566b024 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 29 Sep 2002 17:59:34 +0000 Subject: [PATCH] Per-game theme preference now remembered if value is "default" --- stepmania/src/PrefsManager.cpp | 17 ++++++++--------- stepmania/src/ScreenTitleMenu.cpp | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 35d75cb1a9..d7454f329a 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -169,15 +169,15 @@ void PrefsManager::ReadGamePrefsFromDisk() CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName; IniFile ini; - ini.SetPath( "StepMania.ini" ); + ini.SetPath( sGameName+"Prefs.ini" ); ini.ReadFile(); // it's OK if this fails CString sAnnouncer = sGameName, sTheme = sGameName, sNoteSkin = sGameName; // if these calls fail, the three strings will keep the initial values set above. - ini.GetValue( sGameName, "Announcer", sAnnouncer ); - ini.GetValue( sGameName, "Theme", sTheme ); - ini.GetValue( sGameName, "NoteSkin", sNoteSkin ); + ini.GetValue( "Options", "Announcer", sAnnouncer ); + ini.GetValue( "Options", "Theme", sTheme ); + ini.GetValue( "Options", "NoteSkin", sNoteSkin ); // it's OK to call these functions with names that don't exist. ANNOUNCER->SwitchAnnouncer( sAnnouncer ); @@ -192,12 +192,11 @@ void PrefsManager::SaveGamePrefsToDisk() CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName; IniFile ini; - ini.SetPath( "StepMania.ini" ); - ini.ReadFile(); // it's OK if this fails + ini.SetPath( sGameName+"Prefs.ini" ); - ini.SetValue( sGameName, "Announcer", ANNOUNCER->GetCurAnnouncerName() ); - ini.SetValue( sGameName, "Theme", THEME->GetCurThemeName() ); - ini.SetValue( sGameName, "NoteSkin", GAMEMAN->GetCurNoteSkin() ); + ini.SetValue( "Options", "Announcer", ANNOUNCER->GetCurAnnouncerName() ); + ini.SetValue( "Options", "Theme", THEME->GetCurThemeName() ); + ini.SetValue( "Options", "NoteSkin", GAMEMAN->GetCurNoteSkin() ); ini.WriteFile(); } diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 1ba7f9660e..ac64122875 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -88,6 +88,7 @@ ScreenTitleMenu::ScreenTitleMenu() else THEME->SwitchTheme( "default" ); } + PREFSMAN->SaveGamePrefsToDisk();