actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move out of PrefsManager

Browse Source
This commit is contained in:
Glenn Maynard
2006-04-06 09:39:29 +00:00
parent c7131c1b8c
commit fe00ec613c
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LightsManager.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ const RString DEFAULT_LIGHTS_DRIVER = "Null";
static Preference<RString> g_sLightsDriver( "LightsDriver", "" ); // "" == DEFAULT_LIGHTS_DRIVER static Preference<RString> g_sLightsDriver( "LightsDriver", "" ); // "" == DEFAULT_LIGHTS_DRIVER
Preference<float> g_fLightsFalloffSeconds( "LightsFalloffSeconds", 0.1f ); Preference<float> g_fLightsFalloffSeconds( "LightsFalloffSeconds", 0.1f );
Preference<float> g_fLightsAheadSeconds( "LightsAheadSeconds", 0.05f ); Preference<float> g_fLightsAheadSeconds( "LightsAheadSeconds", 0.05f );
static Preference<bool> g_bBlinkGameplayButtonLightsOnNote( "BlinkGameplayButtonLightsOnNote", false );
static const char *CabinetLightNames[] = { static const char *CabinetLightNames[] = {
"MarqueeUpLeft", "MarqueeUpLeft",
@@ -330,7 +330,7 @@ void LightsManager::Update( float fDeltaTime )
case LIGHTSMODE_MENU: case LIGHTSMODE_MENU:
case LIGHTSMODE_GAMEPLAY: case LIGHTSMODE_GAMEPLAY:
{ {
if( m_LightsMode == LIGHTSMODE_GAMEPLAY && PREFSMAN->m_bBlinkGameplayButtonLightsOnNote ) if( m_LightsMode == LIGHTSMODE_GAMEPLAY && g_bBlinkGameplayButtonLightsOnNote )
{ {
// //
// Blink on notes. // Blink on notes.
stepmania/src/MusicWheel.cpp
+3 -1
View File
@@ -22,6 +22,8 @@
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "PlayerState.h" #include "PlayerState.h"
static Preference<bool> g_bMoveRandomToEnd( "MoveRandomToEnd", false );
#define NUM_WHEEL_ITEMS ((int)ceil(NUM_WHEEL_ITEMS_TO_DRAW+2)) #define NUM_WHEEL_ITEMS ((int)ceil(NUM_WHEEL_ITEMS_TO_DRAW+2))
#define WHEEL_TEXT(s) THEME->GetString( "MusicWheel", ssprintf("%sText",s.c_str()) ); #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 // since we can't agree, make it an option
if( PREFSMAN->m_bMoveRandomToEnd ) if( g_bMoveRandomToEnd )
CourseUtil::MoveRandomToEnd( apCourses ); CourseUtil::MoveRandomToEnd( apCourses );
} }
stepmania/src/PrefsManager.cpp
-2
View File
@@ -289,7 +289,6 @@ PrefsManager::PrefsManager() :
m_bSignProfileData ( "SignProfileData", false ), m_bSignProfileData ( "SignProfileData", false ),
m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ),
m_bMoveRandomToEnd ( "MoveRandomToEnd", false ),
m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), m_bSubSortByNumSteps ( "SubSortByNumSteps", false ),
m_GetRankingName ( "GetRankingName", RANKING_ON ), m_GetRankingName ( "GetRankingName", RANKING_ON ),
m_ScoringType ( "ScoringType", SCORING_NEW ), m_ScoringType ( "ScoringType", SCORING_NEW ),
@@ -303,7 +302,6 @@ PrefsManager::PrefsManager() :
m_iSoundDevice ( "SoundDevice", "" ), m_iSoundDevice ( "SoundDevice", "" ),
m_iSoundPreferredSampleRate ( "SoundPreferredSampleRate", 44100 ), m_iSoundPreferredSampleRate ( "SoundPreferredSampleRate", 44100 ),
m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ), m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ),
m_bBlinkGameplayButtonLightsOnNote ( "BlinkGameplayButtonLightsOnNote",false ),
m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer", false ), m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer", false ),
m_bThreadedInput ( "ThreadedInput", true ), m_bThreadedInput ( "ThreadedInput", true ),
m_bThreadedMovieDecode ( "ThreadedMovieDecode", true ), m_bThreadedMovieDecode ( "ThreadedMovieDecode", true ),
stepmania/src/PrefsManager.h
-2
View File
@@ -192,7 +192,6 @@ public:
// course ranking // course ranking
enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK }; enum CourseSortOrders { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK };
Preference<CourseSortOrders,int> m_CourseSortOrder; Preference<CourseSortOrders,int> m_CourseSortOrder;
Preference<bool> m_bMoveRandomToEnd;
Preference<bool> m_bSubSortByNumSteps; Preference<bool> m_bSubSortByNumSteps;
enum GetRankingName { RANKING_OFF, RANKING_ON, RANKING_LIST }; enum GetRankingName { RANKING_OFF, RANKING_ON, RANKING_LIST };
Preference<GetRankingName,int> m_GetRankingName; Preference<GetRankingName,int> m_GetRankingName;
@@ -211,7 +210,6 @@ public:
Preference<RString> m_iSoundDevice; Preference<RString> m_iSoundDevice;
Preference<int> m_iSoundPreferredSampleRate; Preference<int> m_iSoundPreferredSampleRate;
Preference<RString> m_sLightsStepsDifficulty; Preference<RString> m_sLightsStepsDifficulty;
Preference<bool> m_bBlinkGameplayButtonLightsOnNote;
Preference<bool> m_bAllowUnacceleratedRenderer; Preference<bool> m_bAllowUnacceleratedRenderer;
Preference<bool> m_bThreadedInput; Preference<bool> m_bThreadedInput;
Preference<bool> m_bThreadedMovieDecode; Preference<bool> m_bThreadedMovieDecode;