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

m_bShowCaution and m_bEventMode to Preference

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-30 01:36:20 +00:00
parent 795380601b
commit 25f50a20b7
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
+3 -7
View File
@@ -124,7 +124,9 @@ PrefsManager::PrefsManager() :
m_fLifeDeltaPercentChangeMiss ( Options, "LifeDeltaPercentChangeMiss", -0.080f ), m_fLifeDeltaPercentChangeMiss ( Options, "LifeDeltaPercentChangeMiss", -0.080f ),
m_fLifeDeltaPercentChangeHitMine ( Options, "LifeDeltaPercentChangeHitMine", -0.160f ), m_fLifeDeltaPercentChangeHitMine ( Options, "LifeDeltaPercentChangeHitMine", -0.160f ),
m_fLifeDeltaPercentChangeOK ( Options, "LifeDeltaPercentChangeOK", +0.008f ), m_fLifeDeltaPercentChangeOK ( Options, "LifeDeltaPercentChangeOK", +0.008f ),
m_fLifeDeltaPercentChangeNG ( Options, "LifeDeltaPercentChangeNG", -0.080f ) m_fLifeDeltaPercentChangeNG ( Options, "LifeDeltaPercentChangeNG", -0.080f ),
m_bShowCaution ( Options, "ShowCaution", true ),
m_bEventMode ( Options, "EventMode", false )
{ {
Init(); Init();
ReadGlobalPrefsFromDisk(); ReadGlobalPrefsFromDisk();
@@ -137,7 +139,6 @@ void PrefsManager::Init()
m_bShowDanger = true; m_bShowDanger = true;
m_bMenuTimer = true; m_bMenuTimer = true;
m_iNumArcadeStages = 3; m_iNumArcadeStages = 3;
m_bEventMode = false;
m_bAutoPlay = false; m_bAutoPlay = false;
m_fTugMeterPercentChangeMarvelous = +0.010f; m_fTugMeterPercentChangeMarvelous = +0.010f;
@@ -201,7 +202,6 @@ void PrefsManager::Init()
m_bDelayedBack = true; m_bDelayedBack = true;
m_bShowInstructions = true; m_bShowInstructions = true;
m_bShowCaution = true;
m_bShowSelectGroup = true; m_bShowSelectGroup = true;
m_bShowNativeLanguage = true; m_bShowNativeLanguage = true;
m_bArcadeOptionsNavigation = false; m_bArcadeOptionsNavigation = false;
@@ -384,7 +384,6 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
ini.GetValue( "Options", "CelShadeModels", m_bCelShadeModels ); ini.GetValue( "Options", "CelShadeModels", m_bCelShadeModels );
ini.GetValue( "Options", "ConstantUpdateDeltaSeconds", m_fConstantUpdateDeltaSeconds ); ini.GetValue( "Options", "ConstantUpdateDeltaSeconds", m_fConstantUpdateDeltaSeconds );
ini.GetValue( "Options", "NumArcadeStages", m_iNumArcadeStages ); ini.GetValue( "Options", "NumArcadeStages", m_iNumArcadeStages );
ini.GetValue( "Options", "EventMode", m_bEventMode );
ini.GetValue( "Options", "AutoPlay", m_bAutoPlay ); ini.GetValue( "Options", "AutoPlay", m_bAutoPlay );
ini.GetValue( "Options", "TugMeterPercentChangeMarvelous", m_fTugMeterPercentChangeMarvelous ); ini.GetValue( "Options", "TugMeterPercentChangeMarvelous", m_fTugMeterPercentChangeMarvelous );
ini.GetValue( "Options", "TugMeterPercentChangePerfect", m_fTugMeterPercentChangePerfect ); ini.GetValue( "Options", "TugMeterPercentChangePerfect", m_fTugMeterPercentChangePerfect );
@@ -444,7 +443,6 @@ void PrefsManager::ReadPrefsFromFile( CString sIni )
ini.GetValue( "Options", "DelayedEscape", m_bDelayedBack ); ini.GetValue( "Options", "DelayedEscape", m_bDelayedBack );
ini.GetValue( "Options", "ShowInstructions", m_bShowInstructions ); ini.GetValue( "Options", "ShowInstructions", m_bShowInstructions );
ini.GetValue( "Options", "ShowCaution", m_bShowCaution );
ini.GetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); ini.GetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup );
ini.GetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage ); ini.GetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage );
ini.GetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.GetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
@@ -593,7 +591,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "BGBrightness", m_fBGBrightness ); ini.SetValue( "Options", "BGBrightness", m_fBGBrightness );
ini.SetValue( "Options", "MenuTimer", m_bMenuTimer ); ini.SetValue( "Options", "MenuTimer", m_bMenuTimer );
ini.SetValue( "Options", "NumArcadeStages", m_iNumArcadeStages ); ini.SetValue( "Options", "NumArcadeStages", m_iNumArcadeStages );
ini.SetValue( "Options", "EventMode", m_bEventMode );
ini.SetValue( "Options", "AutoPlay", m_bAutoPlay ); ini.SetValue( "Options", "AutoPlay", m_bAutoPlay );
ini.SetValue( "Options", "JudgeWindowScale", m_fJudgeWindowScale ); ini.SetValue( "Options", "JudgeWindowScale", m_fJudgeWindowScale );
ini.SetValue( "Options", "JudgeWindowAdd", m_fJudgeWindowAdd ); ini.SetValue( "Options", "JudgeWindowAdd", m_fJudgeWindowAdd );
@@ -677,7 +674,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
ini.SetValue( "Options", "Interlaced", m_bInterlaced ); ini.SetValue( "Options", "Interlaced", m_bInterlaced );
ini.SetValue( "Options", "PAL", m_bPAL ); ini.SetValue( "Options", "PAL", m_bPAL );
ini.SetValue( "Options", "ShowInstructions", m_bShowInstructions ); ini.SetValue( "Options", "ShowInstructions", m_bShowInstructions );
ini.SetValue( "Options", "ShowCaution", m_bShowCaution );
ini.SetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup ); ini.SetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup );
ini.SetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage ); ini.SetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage );
ini.SetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation ); ini.SetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
stepmania/src/PrefsManager.h
+3 -2
View File
@@ -133,14 +133,15 @@ public:
bool m_bAutoPlay; bool m_bAutoPlay;
bool m_bDelayedBack; bool m_bDelayedBack;
bool m_bShowInstructions, m_bShowCaution, m_bShowSelectGroup; bool m_bShowInstructions, m_bShowSelectGroup;
Preference<bool> m_bShowCaution;
bool m_bShowNativeLanguage; bool m_bShowNativeLanguage;
bool m_bArcadeOptionsNavigation; bool m_bArcadeOptionsNavigation;
enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections; enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections;
int m_iMusicWheelSwitchSpeed; int m_iMusicWheelSwitchSpeed;
bool m_bEasterEggs; bool m_bEasterEggs;
int m_iMarvelousTiming; int m_iMarvelousTiming;
bool m_bEventMode; Preference<bool> m_bEventMode;
int m_iCoinsPerCredit; int m_iCoinsPerCredit;
int m_iNumArcadeStages; int m_iNumArcadeStages;
stepmania/src/ScreenOptionsMasterPrefs.cpp
+2 -2
View File
@@ -233,7 +233,7 @@ static void MovePref( int &iSel, bool bToSel, const ConfOption *pConfOption )
/* Appearance options */ /* Appearance options */
MOVE( Instructions, PREFSMAN->m_bShowInstructions ); MOVE( Instructions, PREFSMAN->m_bShowInstructions );
MOVE( Caution, PREFSMAN->m_bShowCaution ); MOVE( Caution, (bool&) PREFSMAN->m_bShowCaution );
MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni ); MOVE( OniScoreDisplay, PREFSMAN->m_bDancePointsForOni );
MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup ); MOVE( SongGroup, PREFSMAN->m_bShowSelectGroup );
MOVE( WheelSections, PREFSMAN->m_MusicWheelUsesSections ); MOVE( WheelSections, PREFSMAN->m_MusicWheelUsesSections );
@@ -311,7 +311,7 @@ static void SongsPerPlay( int &sel, bool ToSel, const ConfOption *pConfOption )
const int mapping[] = { 1,2,3,4,5,6,7 }; const int mapping[] = { 1,2,3,4,5,6,7 };
MoveMap( sel, PREFSMAN->m_iNumArcadeStages, ToSel, mapping, ARRAYSIZE(mapping) ); MoveMap( sel, PREFSMAN->m_iNumArcadeStages, ToSel, mapping, ARRAYSIZE(mapping) );
} }
MOVE( EventMode, PREFSMAN->m_bEventMode ); MOVE( EventMode, (bool&) PREFSMAN->m_bEventMode );
/* Machine options */ /* Machine options */
MOVE( ScoringType, PREFSMAN->m_iScoringType ); MOVE( ScoringType, PREFSMAN->m_iScoringType );