From fe00ec613c15e91f70fd73085b8e1c478d2638da Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 6 Apr 2006 09:39:29 +0000
Subject: [PATCH] move out of PrefsManager

---
 stepmania/src/LightsManager.cpp | 4 ++--
 stepmania/src/MusicWheel.cpp    | 4 +++-
 stepmania/src/PrefsManager.cpp  | 2 --
 stepmania/src/PrefsManager.h    | 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index fae6ba696a..07606483d5 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -21,7 +21,7 @@ const RString DEFAULT_LIGHTS_DRIVER = "Null";
 static Preference<RString> g_sLightsDriver( "LightsDriver", "" ); // "" == DEFAULT_LIGHTS_DRIVER
 Preference<float>	g_fLightsFalloffSeconds( "LightsFalloffSeconds", 0.1f );
 Preference<float>	g_fLightsAheadSeconds( "LightsAheadSeconds", 0.05f );
-
+static Preference<bool>	g_bBlinkGameplayButtonLightsOnNote( "BlinkGameplayButtonLightsOnNote", false );
 
 static const char *CabinetLightNames[] = {
 	"MarqueeUpLeft",
@@ -330,7 +330,7 @@ void LightsManager::Update( float fDeltaTime )
 	case LIGHTSMODE_MENU:
 	case LIGHTSMODE_GAMEPLAY:
 		{
-			if( m_LightsMode == LIGHTSMODE_GAMEPLAY  &&  PREFSMAN->m_bBlinkGameplayButtonLightsOnNote )
+			if( m_LightsMode == LIGHTSMODE_GAMEPLAY  &&  g_bBlinkGameplayButtonLightsOnNote )
 			{
 				//
 				// Blink on notes.
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index b43760e29a..ecb01b2327 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -22,6 +22,8 @@
 #include "ThemeMetric.h"
 #include "PlayerState.h"
 
+static Preference<bool> g_bMoveRandomToEnd( "MoveRandomToEnd", false );
+
 #define NUM_WHEEL_ITEMS		((int)ceil(NUM_WHEEL_ITEMS_TO_DRAW+2))
 #define WHEEL_TEXT(s)             THEME->GetString( "MusicWheel", ssprintf("%sText",s.c_str()) );
 
@@ -658,7 +660,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 				}
 
 				// since we can't agree, make it an option
-				if( PREFSMAN->m_bMoveRandomToEnd )
+				if( g_bMoveRandomToEnd )
 					CourseUtil::MoveRandomToEnd( apCourses );
 			}
 
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 980f55b3dc..48fe8dabb1 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -289,7 +289,6 @@ PrefsManager::PrefsManager() :
 
 	m_bSignProfileData		( "SignProfileData",			false ),
 	m_CourseSortOrder		( "CourseSortOrder",			COURSE_SORT_SONGS ),
-	m_bMoveRandomToEnd		( "MoveRandomToEnd",			false ),
 	m_bSubSortByNumSteps		( "SubSortByNumSteps",			false ),
 	m_GetRankingName		( "GetRankingName",			RANKING_ON ),
 	m_ScoringType			( "ScoringType",			SCORING_NEW ),
@@ -303,7 +302,6 @@ PrefsManager::PrefsManager() :
 	m_iSoundDevice			( "SoundDevice",			"" ),
 	m_iSoundPreferredSampleRate	( "SoundPreferredSampleRate",		44100 ),
 	m_sLightsStepsDifficulty	( "LightsStepsDifficulty",		"medium" ),
-	m_bBlinkGameplayButtonLightsOnNote	( "BlinkGameplayButtonLightsOnNote",false ),
 	m_bAllowUnacceleratedRenderer	( "AllowUnacceleratedRenderer",		false ),
 	m_bThreadedInput		( "ThreadedInput",			true ),
 	m_bThreadedMovieDecode		( "ThreadedMovieDecode",		true ),
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index cd6cbe4b00..1f38229a3d 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -192,7 +192,6 @@ public:
 	// course ranking
 	enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK };
 	Preference<CourseSortOrders,int>	m_CourseSortOrder;
-	Preference<bool>	m_bMoveRandomToEnd;
 	Preference<bool>	m_bSubSortByNumSteps;	
 	enum GetRankingName { RANKING_OFF, RANKING_ON, RANKING_LIST };
 	Preference<GetRankingName,int>	m_GetRankingName;
@@ -211,7 +210,6 @@ public:
 	Preference<RString>	m_iSoundDevice;	
 	Preference<int>		m_iSoundPreferredSampleRate;
 	Preference<RString>	m_sLightsStepsDifficulty;
-	Preference<bool>	m_bBlinkGameplayButtonLightsOnNote;
 	Preference<bool>	m_bAllowUnacceleratedRenderer;
 	Preference<bool>	m_bThreadedInput;
 	Preference<bool>	m_bThreadedMovieDecode;