move out of PrefsManager
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
|
||||
@@ -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 ),
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user