From 34dd476d5e88dffb9f2f14839c22f787658bf7e4 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 1 Mar 2004 02:45:29 +0000 Subject: [PATCH] add pref "HideDefaultNoteSkin" --- stepmania/src/NoteSkinManager.cpp | 4 +++- stepmania/src/PrefsManager.cpp | 3 +++ stepmania/src/PrefsManager.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp index 7fe9c53182..249a0f1469 100644 --- a/stepmania/src/NoteSkinManager.cpp +++ b/stepmania/src/NoteSkinManager.cpp @@ -22,6 +22,7 @@ #include "arch/arch.h" #include "RageDisplay.h" #include "arch/ArchHooks/ArchHooks.h" +#include "PrefsManager.h" NoteSkinManager* NOTESKIN = NULL; // global object accessable from anywhere in the program @@ -110,7 +111,8 @@ void NoteSkinManager::GetNoteSkinNames( CStringArray &AddTo ) if( iter != AddTo.end() ) { AddTo.erase( iter ); - AddTo.insert( AddTo.begin(), "default" ); + if( !PREFSMAN->m_bHideDefaultNoteSkin ) + AddTo.insert( AddTo.begin(), "default" ); } } } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index d9b7c37471..688fd6fdea 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -214,6 +214,7 @@ PrefsManager::PrefsManager() m_iAttractSoundFrequency = 1; m_bAllowExtraStage = true; m_bLockWheelAfterRandom = true; + m_bHideDefaultNoteSkin = false; m_fPadStickSeconds = 0; g_bAutoRestart = false; m_bSignProfileData = false; @@ -493,6 +494,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk() ini.GetValue( "Options", "AttractSoundFrequency", m_iAttractSoundFrequency ); ini.GetValue( "Options", "AllowExtraStage", m_bAllowExtraStage ); ini.GetValue( "Options", "LockWheelAfterRandom", m_bLockWheelAfterRandom ); + ini.GetValue( "Options", "HideDefaultNoteSkin", m_bHideDefaultNoteSkin ); ini.GetValue( "Options", "PadStickSeconds", m_fPadStickSeconds ); ini.GetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.GetValue( "Options", "SignProfileData", m_bSignProfileData ); @@ -706,6 +708,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "AttractSoundFrequency", m_iAttractSoundFrequency ); ini.SetValue( "Options", "AllowExtraStage", m_bAllowExtraStage ); ini.SetValue( "Options", "LockWheelAfterRandom", m_bLockWheelAfterRandom ); + ini.SetValue( "Options", "HideDefaultNoteSkin", m_bHideDefaultNoteSkin ); ini.SetValue( "Options", "PadStickSeconds", m_fPadStickSeconds ); ini.SetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.SetValue( "Options", "SignProfileData", m_bSignProfileData ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 1ba5a48c92..b0c8b181fe 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -189,6 +189,7 @@ public: int m_iAttractSoundFrequency; // 0 = never, 1 = every time bool m_bAllowExtraStage; bool m_bLockWheelAfterRandom; + bool m_bHideDefaultNoteSkin; // Number of seconds it takes for a button on the controller to release // after pressed.