efa81bc: don't filter NoteSkins at a PrefsManager/NoteSkinManager level. Leave the NoteSkin sorting and filtering up to the theme. [Chris Danford]

ScreenWithMenuElements.cpp - add Cancel command, so actors can react to Cancel.
GameState.cpp - cleanup
This commit is contained in:
AJ Kelly
2010-02-19 16:05:50 -06:00
parent 2c19a3fab1
commit c43635b6b3
7 changed files with 8 additions and 16 deletions
+2 -1
View File
@@ -239,7 +239,6 @@ PrefsManager::PrefsManager() :
m_fCenterImageAddHeight ( "CenterImageAddHeight", 0 ),
m_AttractSoundFrequency ( "AttractSoundFrequency", ASF_EVERY_TIME ),
m_bAllowExtraStage ( "AllowExtraStage", true ),
m_bHideDefaultNoteSkin ( "HideDefaultNoteSkin", false ),
m_iMaxHighScoresPerListForMachine ( "MaxHighScoresPerListForMachine", 10 ),
m_iMaxHighScoresPerListForPlayer ( "MaxHighScoresPerListForPlayer", 3 ),
m_bAllowMultipleHighScoreWithSameName ( "AllowMultipleHighScoreWithSameName", true ),
@@ -439,6 +438,7 @@ void PrefsManager::ReadGamePrefsFromIni( const RString &sIni )
RString sGame = section->GetName().Right( section->GetName().length() - GAME_SECTION_PREFIX.length() );
GamePrefs &gp = m_mapGameNameToGamePrefs[ sGame ];
// todo: read more prefs here? -aj
ini.GetValue( section->GetName(), "Announcer", gp.m_sAnnouncer );
ini.GetValue( section->GetName(), "Theme", gp.m_sTheme );
ini.GetValue( section->GetName(), "DefaultModifiers", gp.m_sDefaultModifiers );
@@ -486,6 +486,7 @@ void PrefsManager::SavePrefsToIni( IniFile &ini )
{
RString sSection = "Game-" + RString( iter->first );
// todo: write more values here? -aj
ini.SetValue( sSection, "Announcer", iter->second.m_sAnnouncer );
ini.SetValue( sSection, "Theme", iter->second.m_sTheme );
ini.SetValue( sSection, "DefaultModifiers", iter->second.m_sDefaultModifiers );