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

cleanup: use Preference

Browse Source
This commit is contained in:
Chris Danford
2005-04-27 07:50:38 +00:00
parent 6889c8be3f
commit 3117e1bd3d
6 changed files with 196 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+7 -8
View File
@@ -1321,14 +1321,13 @@ SongOptions::FailType GameState::GetPlayerFailType( PlayerNumber pn ) const
bool GameState::ShowMarvelous() const bool GameState::ShowMarvelous() const
{ {
if (PREFSMAN->m_iMarvelousTiming == 2) switch( PREFSMAN->m_iMarvelousTiming )
return true; {
case PrefsManager::MARVELOUS_NEVER: return false;
if (PREFSMAN->m_iMarvelousTiming == 1) case PrefsManager::MARVELOUS_COURSES_ONLY: return IsCourseMode();
if (IsCourseMode()) case PrefsManager::MARVELOUS_EVERYWHERE: return true;
return true; default: ASSERT(0);
}
return false;
} }
void GameState::GetCharacters( vector<Character*> &apCharactersOut ) void GameState::GetCharacters( vector<Character*> &apCharactersOut )
stepmania/src/LifeMeterBar.cpp
+5 -4
View File
@@ -227,7 +227,8 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
m_iMissCombo++; m_iMissCombo++;
/* Increase by m_iRegenComboAfterMiss; never push it beyond m_iMaxRegenComboAfterMiss /* Increase by m_iRegenComboAfterMiss; never push it beyond m_iMaxRegenComboAfterMiss
* but don't reduce it if it's already past. */ * but don't reduce it if it's already past. */
const int NewComboToRegainLife = min( PREFSMAN->m_iMaxRegenComboAfterMiss, const int NewComboToRegainLife = min(
(int)PREFSMAN->m_iMaxRegenComboAfterMiss,
m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterMiss ); m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterMiss );
m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife ); m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife );
} }
@@ -248,12 +249,12 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
} }
// check if this step would cause a fail // check if this step would cause a fail
if( m_fLifePercentage + fDeltaLife <= FAIL_THRESHOLD if( m_fLifePercentage + fDeltaLife <= FAIL_THRESHOLD && m_fLifePercentage > FAIL_THRESHOLD )
&& m_fLifePercentage > FAIL_THRESHOLD )
{ {
/* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail /* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail
* but don't reduce it if it's already past. */ * but don't reduce it if it's already past. */
const int NewComboToRegainLife = min( PREFSMAN->m_iMaxRegenComboAfterFail, const int NewComboToRegainLife = min(
(int)PREFSMAN->m_iMaxRegenComboAfterFail,
m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail ); m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail );
m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife ); m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife );
} }
stepmania/src/PrefsManager.cpp
+78 -210
View File
@@ -119,8 +119,81 @@ PrefsManager::PrefsManager() :
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_fTugMeterPercentChangeMarvelous ( Options, "TugMeterPercentChangeMarvelous", +0.010f ),
m_fTugMeterPercentChangePerfect ( Options, "TugMeterPercentChangePerfect", +0.008f ),
m_fTugMeterPercentChangeGreat ( Options, "TugMeterPercentChangeGreat", +0.004f ),
m_fTugMeterPercentChangeGood ( Options, "TugMeterPercentChangeGood", +0.000f ),
m_fTugMeterPercentChangeBoo ( Options, "TugMeterPercentChangeBoo", -0.010f ),
m_fTugMeterPercentChangeMiss ( Options, "TugMeterPercentChangeMiss", -0.020f ),
m_fTugMeterPercentChangeHitMine ( Options, "TugMeterPercentChangeHitMine", -0.040f ),
m_fTugMeterPercentChangeOK ( Options, "TugMeterPercentChangeOK", +0.008f ),
m_fTugMeterPercentChangeNG ( Options, "TugMeterPercentChangeNG", -0.020f ),
m_iRegenComboAfterFail ( Options, "RegenComboAfterFail", 10 ),
m_iRegenComboAfterMiss ( Options, "RegenComboAfterMiss", 5 ),
m_iMaxRegenComboAfterFail ( Options, "MaxRegenComboAfterFail", 10 ),
m_iMaxRegenComboAfterMiss ( Options, "MaxRegenComboAfterMiss", 10 ),
m_bTwoPlayerRecovery ( Options, "TwoPlayerRecovery", true ),
m_bMercifulDrain ( Options, "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage
m_bMinimum1FullSongInCourses ( Options, "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter
m_bFailOffInBeginner ( Options, "FailOffInBeginner", false ),
m_bFailOffForFirstStageEasy ( Options, "FailOffForFirstStageEasy", false ),
m_iPercentScoreWeightMarvelous ( Options, "PercentScoreWeightMarvelous", 3 ),
m_iPercentScoreWeightPerfect ( Options, "PercentScoreWeightPerfect", 2 ),
m_iPercentScoreWeightGreat ( Options, "PercentScoreWeightGreat", 1 ),
m_iPercentScoreWeightGood ( Options, "PercentScoreWeightGood", 0 ),
m_iPercentScoreWeightBoo ( Options, "PercentScoreWeightBoo", 0 ),
m_iPercentScoreWeightMiss ( Options, "PercentScoreWeightMiss", 0 ),
m_iPercentScoreWeightOK ( Options, "PercentScoreWeightOK", 3 ),
m_iPercentScoreWeightNG ( Options, "PercentScoreWeightNG", 0 ),
m_iPercentScoreWeightHitMine ( Options, "PercentScoreWeightHitMine", -2 ),
m_iGradeWeightMarvelous ( Options, "GradeWeightMarvelous", 2 ),
m_iGradeWeightPerfect ( Options, "GradeWeightPerfect", 2 ),
m_iGradeWeightGreat ( Options, "GradeWeightGreat", 1 ),
m_iGradeWeightGood ( Options, "GradeWeightGood", 0 ),
m_iGradeWeightBoo ( Options, "GradeWeightBoo", -4 ),
m_iGradeWeightMiss ( Options, "GradeWeightMiss", -8 ),
m_iGradeWeightHitMine ( Options, "GradeWeightHitMine", -8 ),
m_iGradeWeightOK ( Options, "GradeWeightOK", 6 ),
m_iGradeWeightNG ( Options, "GradeWeightNG", 0 ),
m_fSuperMeterPercentChangeMarvelous ( Options, "SuperMeterPercentChangeMarvelous", +0.05f ),
m_fSuperMeterPercentChangePerfect ( Options, "SuperMeterPercentChangePerfect", +0.04f ),
m_fSuperMeterPercentChangeGreat ( Options, "SuperMeterPercentChangeGreat", +0.02f ),
m_fSuperMeterPercentChangeGood ( Options, "SuperMeterPercentChangeGood", +0.00f ),
m_fSuperMeterPercentChangeBoo ( Options, "SuperMeterPercentChangeBoo", -0.00f ),
m_fSuperMeterPercentChangeMiss ( Options, "SuperMeterPercentChangeMiss", -0.20f ),
m_fSuperMeterPercentChangeHitMine ( Options, "SuperMeterPercentChangeHitMine", -0.40f ),
m_fSuperMeterPercentChangeOK ( Options, "SuperMeterPercentChangeOK", +0.04f ),
m_fSuperMeterPercentChangeNG ( Options, "SuperMeterPercentChangeNG", -0.20f ),
m_bMercifulSuperMeter ( Options, "MercifulSuperMeter", true ),
m_fTimeMeterSecondsChangeMarvelous ( Options, "TimeMeterSecondsChangeMarvelous", -0.0f ),
m_fTimeMeterSecondsChangePerfect ( Options, "TimeMeterSecondsChangePerfect", -0.25f ),
m_fTimeMeterSecondsChangeGreat ( Options, "TimeMeterSecondsChangeGreat", -0.5f ),
m_fTimeMeterSecondsChangeGood ( Options, "TimeMeterSecondsChangeGood", -1.0f ),
m_fTimeMeterSecondsChangeBoo ( Options, "TimeMeterSecondsChangeBoo", -2.0f ),
m_fTimeMeterSecondsChangeMiss ( Options, "TimeMeterSecondsChangeMiss", -4.0f ),
m_fTimeMeterSecondsChangeHitMine ( Options, "TimeMeterSecondsChangeHitMine", -2.0f ),
m_fTimeMeterSecondsChangeOK ( Options, "TimeMeterSecondsChangeOK", -0.0f ),
m_fTimeMeterSecondsChangeNG ( Options, "TimeMeterSecondsChangeNG", -4.0f ),
m_bAutoPlay ( Options, "AutoPlay", false ),
m_bDelayedBack ( Options, "DelayedBack", true ),
m_bShowInstructions ( Options, "ShowInstructions", true ),
m_bShowCaution ( Options, "ShowCaution", true ), m_bShowCaution ( Options, "ShowCaution", true ),
m_bShowSelectGroup ( Options, "ShowSelectGroup", true ),
m_bShowNativeLanguage ( Options, "ShowNativeLanguage", true ),
m_bArcadeOptionsNavigation ( Options, "ArcadeOptionsNavigation", false ),
m_MusicWheelUsesSections ( Options, "MusicWheelUsesSections", ALWAYS ),
m_iMusicWheelSwitchSpeed ( Options, "MusicWheelSwitchSpeed", 10 ),
m_bEasterEggs ( Options, "EasterEggs", true ),
m_iMarvelousTiming ( Options, "MarvelousTiming", MARVELOUS_EVERYWHERE ),
m_bEventMode ( Options, "EventMode", false ), m_bEventMode ( Options, "EventMode", false ),
m_iCoinsPerCredit ( Options, "CoinsPerCredit", 1 ),
m_iNumArcadeStages ( Options, "SongsPerPlay", 3 ), m_iNumArcadeStages ( Options, "SongsPerPlay", 3 ),
m_fGlobalOffsetSeconds ( Options, "GlobalOffsetSeconds", 0 ) m_fGlobalOffsetSeconds ( Options, "GlobalOffsetSeconds", 0 )
{ {
@@ -132,80 +205,9 @@ void PrefsManager::Init()
{ {
m_bCelShadeModels = false; // Work-In-Progress.. disable by default. m_bCelShadeModels = false; // Work-In-Progress.. disable by default.
m_fConstantUpdateDeltaSeconds = 0; m_fConstantUpdateDeltaSeconds = 0;
m_bAutoPlay = false;
m_fTugMeterPercentChangeMarvelous = +0.010f;
m_fTugMeterPercentChangePerfect = +0.008f;
m_fTugMeterPercentChangeGreat = +0.004f;
m_fTugMeterPercentChangeGood = +0.000f;
m_fTugMeterPercentChangeBoo = -0.010f;
m_fTugMeterPercentChangeMiss = -0.020f;
m_fTugMeterPercentChangeHitMine = -0.040f;
m_fTugMeterPercentChangeOK = +0.008f;
m_fTugMeterPercentChangeNG = -0.020f;
m_iRegenComboAfterFail = 10; // cumulative
m_iRegenComboAfterMiss = 5; // cumulative
m_iMaxRegenComboAfterFail = 10;
m_iMaxRegenComboAfterMiss = 10;
m_bTwoPlayerRecovery = true;
m_bMercifulDrain = true;
m_bMinimum1FullSongInCourses = false;
m_bFailOffInBeginner = false;
m_bFailOffForFirstStageEasy = false;
m_iPercentScoreWeightMarvelous = 3;
m_iPercentScoreWeightPerfect = 2;
m_iPercentScoreWeightGreat = 1;
m_iPercentScoreWeightGood = 0;
m_iPercentScoreWeightBoo = 0;
m_iPercentScoreWeightMiss = 0;
m_iPercentScoreWeightOK = 3;
m_iPercentScoreWeightNG = 0;
m_iPercentScoreWeightHitMine = -2;
m_iGradeWeightMarvelous = 2;
m_iGradeWeightPerfect = 2;
m_iGradeWeightGreat = 1;
m_iGradeWeightGood = 0;
m_iGradeWeightBoo = -4;
m_iGradeWeightMiss = -8;
m_iGradeWeightHitMine = -8;
m_iGradeWeightOK = 6;
m_iGradeWeightNG = 0;
m_fSuperMeterPercentChangeMarvelous = +0.05f;
m_fSuperMeterPercentChangePerfect = +0.04f;
m_fSuperMeterPercentChangeGreat = +0.02f;
m_fSuperMeterPercentChangeGood = +0.00f;
m_fSuperMeterPercentChangeBoo = -0.00f;
m_fSuperMeterPercentChangeMiss = -0.20f;
m_fSuperMeterPercentChangeHitMine = -0.40f;
m_fSuperMeterPercentChangeOK = +0.04f;
m_fSuperMeterPercentChangeNG = -0.20f;
m_bMercifulSuperMeter = true;
m_fTimeMeterSecondsChangeMarvelous = -0.0f;
m_fTimeMeterSecondsChangePerfect = -0.25f;
m_fTimeMeterSecondsChangeGreat = -0.5f;
m_fTimeMeterSecondsChangeGood = -1.0f;
m_fTimeMeterSecondsChangeBoo = -2.0f;
m_fTimeMeterSecondsChangeMiss = -4.0f;
m_fTimeMeterSecondsChangeHitMine = -2.0f;
m_fTimeMeterSecondsChangeOK = -0.0f;
m_fTimeMeterSecondsChangeNG = -4.0f;
m_bDelayedBack = true;
m_bShowInstructions = true;
m_bShowSelectGroup = true;
m_bShowNativeLanguage = true;
m_bArcadeOptionsNavigation = false;
m_bSoloSingle = false; m_bSoloSingle = false;
m_MusicWheelUsesSections = ALWAYS;
m_iMusicWheelSwitchSpeed = 10;
m_bEasterEggs = true;
m_iMarvelousTiming = 2;
m_CoinMode = COIN_HOME; m_CoinMode = COIN_HOME;
m_iCoinsPerCredit = 1;
m_Premium = PREMIUM_NONE; m_Premium = PREMIUM_NONE;
m_bDelayedCreditsReconcile = false; m_bDelayedCreditsReconcile = false;
m_iBoostAppPriority = -1; m_iBoostAppPriority = -1;
@@ -380,86 +382,19 @@ void PrefsManager::ReadGlobalPrefsFromIni( const IniFile &ini )
{ {
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", "AutoPlay", m_bAutoPlay );
ini.GetValue( "Options", "TugMeterPercentChangeMarvelous", m_fTugMeterPercentChangeMarvelous );
ini.GetValue( "Options", "TugMeterPercentChangePerfect", m_fTugMeterPercentChangePerfect );
ini.GetValue( "Options", "TugMeterPercentChangeGreat", m_fTugMeterPercentChangeGreat );
ini.GetValue( "Options", "TugMeterPercentChangeGood", m_fTugMeterPercentChangeGood );
ini.GetValue( "Options", "TugMeterPercentChangeBoo", m_fTugMeterPercentChangeBoo );
ini.GetValue( "Options", "TugMeterPercentChangeMiss", m_fTugMeterPercentChangeMiss );
ini.GetValue( "Options", "TugMeterPercentChangeHitMine", m_fTugMeterPercentChangeHitMine );
ini.GetValue( "Options", "TugMeterPercentChangeOK", m_fTugMeterPercentChangeOK );
ini.GetValue( "Options", "TugMeterPercentChangeNG", m_fTugMeterPercentChangeNG );
ini.GetValue( "Options", "RegenComboAfterFail", m_iRegenComboAfterFail );
ini.GetValue( "Options", "RegenComboAfterMiss", m_iRegenComboAfterMiss );
ini.GetValue( "Options", "MaxRegenComboAfterFail", m_iMaxRegenComboAfterFail );
ini.GetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss );
ini.GetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery );
ini.GetValue( "Options", "MercifulDrain", m_bMercifulDrain );
ini.GetValue( "Options", "Minimum1FullSongInCourses", m_bMinimum1FullSongInCourses );
ini.GetValue( "Options", "FailOffInBeginner", m_bFailOffInBeginner );
ini.GetValue( "Options", "FailOffForFirstStageEasy", m_bFailOffForFirstStageEasy );
ini.GetValue( "Options", "PercentScoreWeightMarvelous", m_iPercentScoreWeightMarvelous );
ini.GetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect );
ini.GetValue( "Options", "PercentScoreWeightGreat", m_iPercentScoreWeightGreat );
ini.GetValue( "Options", "PercentScoreWeightGood", m_iPercentScoreWeightGood );
ini.GetValue( "Options", "PercentScoreWeightBoo", m_iPercentScoreWeightBoo );
ini.GetValue( "Options", "PercentScoreWeightMiss", m_iPercentScoreWeightMiss );
ini.GetValue( "Options", "PercentScoreWeightOK", m_iPercentScoreWeightOK );
ini.GetValue( "Options", "PercentScoreWeightNG", m_iPercentScoreWeightNG );
ini.GetValue( "Options", "PercentScoreWeightHitMine", m_iPercentScoreWeightHitMine );
ini.GetValue( "Options", "GradeWeightMarvelous", m_iGradeWeightMarvelous );
ini.GetValue( "Options", "GradeWeightPerfect", m_iGradeWeightPerfect );
ini.GetValue( "Options", "GradeWeightGreat", m_iGradeWeightGreat );
ini.GetValue( "Options", "GradeWeightGood", m_iGradeWeightGood );
ini.GetValue( "Options", "GradeWeightBoo", m_iGradeWeightBoo );
ini.GetValue( "Options", "GradeWeightMiss", m_iGradeWeightMiss );
ini.GetValue( "Options", "GradeWeightHitMine", m_iGradeWeightHitMine );
ini.GetValue( "Options", "GradeWeightOK", m_iGradeWeightOK );
ini.GetValue( "Options", "GradeWeightNG", m_iGradeWeightNG );
ini.GetValue( "Options", "SuperMeterPercentChangeMarvelous",m_fSuperMeterPercentChangeMarvelous );
ini.GetValue( "Options", "SuperMeterPercentChangePerfect", m_fSuperMeterPercentChangePerfect );
ini.GetValue( "Options", "SuperMeterPercentChangeGreat", m_fSuperMeterPercentChangeGreat );
ini.GetValue( "Options", "SuperMeterPercentChangeGood", m_fSuperMeterPercentChangeGood );
ini.GetValue( "Options", "SuperMeterPercentChangeBoo", m_fSuperMeterPercentChangeBoo );
ini.GetValue( "Options", "SuperMeterPercentChangeMiss", m_fSuperMeterPercentChangeMiss );
ini.GetValue( "Options", "SuperMeterPercentChangeHitMine", m_fSuperMeterPercentChangeHitMine );
ini.GetValue( "Options", "SuperMeterPercentChangeOK", m_fSuperMeterPercentChangeOK );
ini.GetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG );
ini.GetValue( "Options", "MercifulSuperMeter", m_bMercifulSuperMeter );
ini.GetValue( "Options", "TimeMeterSecondsChangeMarvelous", m_fTimeMeterSecondsChangeMarvelous );
ini.GetValue( "Options", "TimeMeterSecondsChangePerfect", m_fTimeMeterSecondsChangePerfect );
ini.GetValue( "Options", "TimeMeterSecondsChangeGreat", m_fTimeMeterSecondsChangeGreat );
ini.GetValue( "Options", "TimeMeterSecondsChangeGood", m_fTimeMeterSecondsChangeGood );
ini.GetValue( "Options", "TimeMeterSecondsChangeBoo", m_fTimeMeterSecondsChangeBoo );
ini.GetValue( "Options", "TimeMeterSecondsChangeMiss", m_fTimeMeterSecondsChangeMiss );
ini.GetValue( "Options", "TimeMeterSecondsChangeHitMine", m_fTimeMeterSecondsChangeHitMine );
ini.GetValue( "Options", "TimeMeterSecondsChangeOK", m_fTimeMeterSecondsChangeOK );
ini.GetValue( "Options", "TimeMeterSecondsChangeNG", m_fTimeMeterSecondsChangeNG );
ini.GetValue( "Options", "DelayedEscape", m_bDelayedBack );
ini.GetValue( "Options", "ShowInstructions", m_bShowInstructions );
ini.GetValue( "Options", "ShowSelectGroup", m_bShowSelectGroup );
ini.GetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage );
ini.GetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
ini.GetValue( "Options", "MusicWheelUsesSections", (int&)m_MusicWheelUsesSections );
ini.GetValue( "Options", "MusicWheelSwitchSpeed", m_iMusicWheelSwitchSpeed );
ini.GetValue( "Options", "SoundDrivers", m_sSoundDrivers ); ini.GetValue( "Options", "SoundDrivers", m_sSoundDrivers );
ini.GetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead ); ini.GetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead );
ini.GetValue( "Options", "SoundDevice", m_iSoundDevice ); ini.GetValue( "Options", "SoundDevice", m_iSoundDevice );
ini.GetValue( "Options", "InputDrivers", m_sInputDrivers ); ini.GetValue( "Options", "InputDrivers", m_sInputDrivers );
ini.GetValue( "Options", "MovieDrivers", m_sMovieDrivers ); ini.GetValue( "Options", "MovieDrivers", m_sMovieDrivers );
ini.GetValue( "Options", "EasterEggs", m_bEasterEggs );
ini.GetValue( "Options", "MarvelousTiming", (int&)m_iMarvelousTiming );
ini.GetValue( "Options", "SoundVolume", m_fSoundVolume ); ini.GetValue( "Options", "SoundVolume", m_fSoundVolume );
ini.GetValue( "Options", "LightsDriver", m_sLightsDriver ); ini.GetValue( "Options", "LightsDriver", m_sLightsDriver );
ini.GetValue( "Options", "SoundResampleQuality", m_iSoundResampleQuality ); ini.GetValue( "Options", "SoundResampleQuality", m_iSoundResampleQuality );
ini.GetValue( "Options", "CoinMode", (int&)m_CoinMode ); ini.GetValue( "Options", "CoinMode", (int&)m_CoinMode );
ini.GetValue( "Options", "CoinsPerCredit", m_iCoinsPerCredit );
m_iCoinsPerCredit = max(m_iCoinsPerCredit, 1); m_iCoinsPerCredit = max( (int)m_iCoinsPerCredit, 1);
ini.GetValue( "Options", "Premium", (int&)m_Premium ); ini.GetValue( "Options", "Premium", (int&)m_Premium );
ini.GetValue( "Options", "DelayedCreditsReconcile", m_bDelayedCreditsReconcile ); ini.GetValue( "Options", "DelayedCreditsReconcile", m_bDelayedCreditsReconcile );
ini.GetValue( "Options", "BoostAppPriority", m_iBoostAppPriority ); ini.GetValue( "Options", "BoostAppPriority", m_iBoostAppPriority );
@@ -590,7 +525,7 @@ void PrefsManager::SaveGlobalPrefsToIni( IniFile &ini ) const
ini.SetValue( "Options", "BackgroundMode", m_iBackgroundMode); ini.SetValue( "Options", "BackgroundMode", m_iBackgroundMode);
ini.SetValue( "Options", "NumBackgrounds", m_iNumBackgrounds); ini.SetValue( "Options", "NumBackgrounds", m_iNumBackgrounds);
ini.SetValue( "Options", "BGBrightness", m_fBGBrightness ); ini.SetValue( "Options", "BGBrightness", m_fBGBrightness );
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 );
ini.SetValue( "Options", "JudgeWindowSecondsMarvelous", m_fJudgeWindowSecondsMarvelous ); ini.SetValue( "Options", "JudgeWindowSecondsMarvelous", m_fJudgeWindowSecondsMarvelous );
@@ -612,74 +547,12 @@ void PrefsManager::SaveGlobalPrefsToIni( IniFile &ini ) const
ini.SetValue( "Options", "LifeDeltaPercentChangeHitMine", m_fLifeDeltaPercentChangeHitMine ); ini.SetValue( "Options", "LifeDeltaPercentChangeHitMine", m_fLifeDeltaPercentChangeHitMine );
ini.SetValue( "Options", "LifeDeltaPercentChangeOK", m_fLifeDeltaPercentChangeOK ); ini.SetValue( "Options", "LifeDeltaPercentChangeOK", m_fLifeDeltaPercentChangeOK );
ini.SetValue( "Options", "LifeDeltaPercentChangeNG", m_fLifeDeltaPercentChangeNG ); ini.SetValue( "Options", "LifeDeltaPercentChangeNG", m_fLifeDeltaPercentChangeNG );
ini.SetValue( "Options", "TugMeterPercentChangeMarvelous", m_fTugMeterPercentChangeMarvelous );
ini.SetValue( "Options", "TugMeterPercentChangePerfect", m_fTugMeterPercentChangePerfect );
ini.SetValue( "Options", "TugMeterPercentChangeGreat", m_fTugMeterPercentChangeGreat );
ini.SetValue( "Options", "TugMeterPercentChangeGood", m_fTugMeterPercentChangeGood );
ini.SetValue( "Options", "TugMeterPercentChangeBoo", m_fTugMeterPercentChangeBoo );
ini.SetValue( "Options", "TugMeterPercentChangeMiss", m_fTugMeterPercentChangeMiss );
ini.SetValue( "Options", "TugMeterPercentChangeHitMine", m_fTugMeterPercentChangeHitMine );
ini.SetValue( "Options", "TugMeterPercentChangeOK", m_fTugMeterPercentChangeOK );
ini.SetValue( "Options", "TugMeterPercentChangeNG", m_fTugMeterPercentChangeNG );
ini.SetValue( "Options", "RegenComboAfterFail", m_iRegenComboAfterFail );
ini.SetValue( "Options", "RegenComboAfterMiss", m_iRegenComboAfterMiss );
ini.SetValue( "Options", "MaxRegenComboAfterFail", m_iMaxRegenComboAfterFail );
ini.SetValue( "Options", "MaxRegenComboAfterMiss", m_iMaxRegenComboAfterMiss );
ini.SetValue( "Options", "TwoPlayerRecovery", m_bTwoPlayerRecovery );
ini.SetValue( "Options", "MercifulDrain", m_bMercifulDrain );
ini.SetValue( "Options", "Minimum1FullSongInCourses", m_bMinimum1FullSongInCourses );
ini.SetValue( "Options", "FailOffInBeginner", m_bFailOffInBeginner );
ini.SetValue( "Options", "FailOffForFirstStageEasy", m_bFailOffForFirstStageEasy );
ini.SetValue( "Options", "PercentScoreWeightMarvelous", m_iPercentScoreWeightMarvelous );
ini.SetValue( "Options", "PercentScoreWeightPerfect", m_iPercentScoreWeightPerfect );
ini.SetValue( "Options", "PercentScoreWeightGreat", m_iPercentScoreWeightGreat );
ini.SetValue( "Options", "PercentScoreWeightGood", m_iPercentScoreWeightGood );
ini.SetValue( "Options", "PercentScoreWeightBoo", m_iPercentScoreWeightBoo );
ini.SetValue( "Options", "PercentScoreWeightMiss", m_iPercentScoreWeightMiss );
ini.SetValue( "Options", "PercentScoreWeightOK", m_iPercentScoreWeightOK );
ini.SetValue( "Options", "PercentScoreWeightNG", m_iPercentScoreWeightNG );
ini.SetValue( "Options", "PercentScoreWeightHitMine", m_iPercentScoreWeightHitMine );
ini.SetValue( "Options", "GradeWeightMarvelous", m_iGradeWeightMarvelous );
ini.SetValue( "Options", "GradeWeightPerfect", m_iGradeWeightPerfect );
ini.SetValue( "Options", "GradeWeightGreat", m_iGradeWeightGreat );
ini.SetValue( "Options", "GradeWeightGood", m_iGradeWeightGood );
ini.SetValue( "Options", "GradeWeightBoo", m_iGradeWeightBoo );
ini.SetValue( "Options", "GradeWeightMiss", m_iGradeWeightMiss );
ini.SetValue( "Options", "GradeWeightHitMine", m_iGradeWeightHitMine );
ini.SetValue( "Options", "GradeWeightOK", m_iGradeWeightOK );
ini.SetValue( "Options", "GradeWeightNG", m_iGradeWeightNG );
ini.SetValue( "Options", "SuperMeterPercentChangeMarvelous",m_fSuperMeterPercentChangeMarvelous );
ini.SetValue( "Options", "SuperMeterPercentChangePerfect", m_fSuperMeterPercentChangePerfect );
ini.SetValue( "Options", "SuperMeterPercentChangeGreat", m_fSuperMeterPercentChangeGreat );
ini.SetValue( "Options", "SuperMeterPercentChangeGood", m_fSuperMeterPercentChangeGood );
ini.SetValue( "Options", "SuperMeterPercentChangeBoo", m_fSuperMeterPercentChangeBoo );
ini.SetValue( "Options", "SuperMeterPercentChangeMiss", m_fSuperMeterPercentChangeMiss );
ini.SetValue( "Options", "SuperMeterPercentChangeHitMine", m_fSuperMeterPercentChangeHitMine );
ini.SetValue( "Options", "SuperMeterPercentChangeOK", m_fSuperMeterPercentChangeOK );
ini.SetValue( "Options", "SuperMeterPercentChangeNG", m_fSuperMeterPercentChangeNG );
ini.SetValue( "Options", "MercifulSuperMeter", m_bMercifulSuperMeter );
ini.SetValue( "Options", "TimeMeterSecondsChangeMarvelous", m_fTimeMeterSecondsChangeMarvelous );
ini.SetValue( "Options", "TimeMeterSecondsChangePerfect", m_fTimeMeterSecondsChangePerfect );
ini.SetValue( "Options", "TimeMeterSecondsChangeGreat", m_fTimeMeterSecondsChangeGreat );
ini.SetValue( "Options", "TimeMeterSecondsChangeGood", m_fTimeMeterSecondsChangeGood );
ini.SetValue( "Options", "TimeMeterSecondsChangeBoo", m_fTimeMeterSecondsChangeBoo );
ini.SetValue( "Options", "TimeMeterSecondsChangeMiss", m_fTimeMeterSecondsChangeMiss );
ini.SetValue( "Options", "TimeMeterSecondsChangeHitMine", m_fTimeMeterSecondsChangeHitMine );
ini.SetValue( "Options", "TimeMeterSecondsChangeOK", m_fTimeMeterSecondsChangeOK );
ini.SetValue( "Options", "TimeMeterSecondsChangeNG", m_fTimeMeterSecondsChangeNG );
ini.SetValue( "Options", "DelayedEscape", m_bDelayedBack );
ini.SetValue( "Options", "HiddenSongs", m_bHiddenSongs ); ini.SetValue( "Options", "HiddenSongs", m_bHiddenSongs );
ini.SetValue( "Options", "Vsync", m_bVsync ); ini.SetValue( "Options", "Vsync", m_bVsync );
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", "ShowSelectGroup", m_bShowSelectGroup );
ini.SetValue( "Options", "ShowNativeLanguage", m_bShowNativeLanguage );
ini.SetValue( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
ini.SetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete ); ini.SetValue( "Options", "DelayedTextureDelete", m_bDelayedTextureDelete );
ini.SetValue( "Options", "TexturePreload", m_bTexturePreload ); ini.SetValue( "Options", "TexturePreload", m_bTexturePreload );
ini.SetValue( "Options", "DelayedScreenLoad", m_bDelayedScreenLoad ); ini.SetValue( "Options", "DelayedScreenLoad", m_bDelayedScreenLoad );
@@ -687,13 +560,8 @@ void PrefsManager::SaveGlobalPrefsToIni( IniFile &ini ) const
ini.SetValue( "Options", "BannerCache", m_iBannerCache ); ini.SetValue( "Options", "BannerCache", m_iBannerCache );
ini.SetValue( "Options", "PalettedBannerCache", m_bPalettedBannerCache ); ini.SetValue( "Options", "PalettedBannerCache", m_bPalettedBannerCache );
ini.SetValue( "Options", "FastLoad", m_bFastLoad ); ini.SetValue( "Options", "FastLoad", m_bFastLoad );
ini.SetValue( "Options", "MusicWheelUsesSections", m_MusicWheelUsesSections );
ini.SetValue( "Options", "MusicWheelSwitchSpeed", m_iMusicWheelSwitchSpeed );
ini.SetValue( "Options", "EasterEggs", m_bEasterEggs );
ini.SetValue( "Options", "MarvelousTiming", m_iMarvelousTiming );
ini.SetValue( "Options", "SoundResampleQuality", m_iSoundResampleQuality ); ini.SetValue( "Options", "SoundResampleQuality", m_iSoundResampleQuality );
ini.SetValue( "Options", "CoinMode", m_CoinMode ); ini.SetValue( "Options", "CoinMode", m_CoinMode );
ini.SetValue( "Options", "CoinsPerCredit", m_iCoinsPerCredit );
ini.SetValue( "Options", "Premium", m_Premium ); ini.SetValue( "Options", "Premium", m_Premium );
ini.SetValue( "Options", "DelayedCreditsReconcile", m_bDelayedCreditsReconcile ); ini.SetValue( "Options", "DelayedCreditsReconcile", m_bDelayedCreditsReconcile );
ini.SetValue( "Options", "BoostAppPriority", m_iBoostAppPriority ); ini.SetValue( "Options", "BoostAppPriority", m_iBoostAppPriority );
stepmania/src/PrefsManager.h
+68 -65
View File
@@ -79,84 +79,87 @@ public:
Preference<float> m_fLifeDeltaPercentChangeNG; Preference<float> m_fLifeDeltaPercentChangeNG;
// tug meter used in rave // tug meter used in rave
float m_fTugMeterPercentChangeMarvelous; Preference<float> m_fTugMeterPercentChangeMarvelous;
float m_fTugMeterPercentChangePerfect; Preference<float> m_fTugMeterPercentChangePerfect;
float m_fTugMeterPercentChangeGreat; Preference<float> m_fTugMeterPercentChangeGreat;
float m_fTugMeterPercentChangeGood; Preference<float> m_fTugMeterPercentChangeGood;
float m_fTugMeterPercentChangeBoo; Preference<float> m_fTugMeterPercentChangeBoo;
float m_fTugMeterPercentChangeMiss; Preference<float> m_fTugMeterPercentChangeMiss;
float m_fTugMeterPercentChangeHitMine; Preference<float> m_fTugMeterPercentChangeHitMine;
float m_fTugMeterPercentChangeOK; Preference<float> m_fTugMeterPercentChangeOK;
float m_fTugMeterPercentChangeNG; Preference<float> m_fTugMeterPercentChangeNG;
// Whoever added these: Please add a comment saying what they do. -Chris // Whoever added these: Please add a comment saying what they do. -Chris
int m_iRegenComboAfterFail; Preference<int> m_iRegenComboAfterFail;
int m_iRegenComboAfterMiss; Preference<int> m_iRegenComboAfterMiss;
int m_iMaxRegenComboAfterFail; Preference<int> m_iMaxRegenComboAfterFail;
int m_iMaxRegenComboAfterMiss; Preference<int> m_iMaxRegenComboAfterMiss;
bool m_bTwoPlayerRecovery; Preference<bool> m_bTwoPlayerRecovery;
bool m_bMercifulDrain; // negative life deltas are scaled by the players life percentage Preference<bool> m_bMercifulDrain; // negative life deltas are scaled by the players life percentage
bool m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter Preference<bool> m_bMinimum1FullSongInCourses; // FEoS for 1st song, FailImmediate thereafter
bool m_bFailOffInBeginner; Preference<bool> m_bFailOffInBeginner;
bool m_bFailOffForFirstStageEasy; Preference<bool> m_bFailOffForFirstStageEasy;
// percent score (the number that is shown on the screen and saved to memory card) // percent score (the number that is shown on the screen and saved to memory card)
int m_iPercentScoreWeightMarvelous; Preference<int> m_iPercentScoreWeightMarvelous;
int m_iPercentScoreWeightPerfect; Preference<int> m_iPercentScoreWeightPerfect;
int m_iPercentScoreWeightGreat; Preference<int> m_iPercentScoreWeightGreat;
int m_iPercentScoreWeightGood; Preference<int> m_iPercentScoreWeightGood;
int m_iPercentScoreWeightBoo; Preference<int> m_iPercentScoreWeightBoo;
int m_iPercentScoreWeightMiss; Preference<int> m_iPercentScoreWeightMiss;
int m_iPercentScoreWeightHitMine; Preference<int> m_iPercentScoreWeightHitMine;
int m_iPercentScoreWeightOK; Preference<int> m_iPercentScoreWeightOK;
int m_iPercentScoreWeightNG; Preference<int> m_iPercentScoreWeightNG;
// grades are calculated based on a percentage, but might have different weights than the percent score // grades are calculated based on a percentage, but might have different weights than the percent score
int m_iGradeWeightMarvelous; Preference<int> m_iGradeWeightMarvelous;
int m_iGradeWeightPerfect; Preference<int> m_iGradeWeightPerfect;
int m_iGradeWeightGreat; Preference<int> m_iGradeWeightGreat;
int m_iGradeWeightGood; Preference<int> m_iGradeWeightGood;
int m_iGradeWeightBoo; Preference<int> m_iGradeWeightBoo;
int m_iGradeWeightMiss; Preference<int> m_iGradeWeightMiss;
int m_iGradeWeightHitMine; Preference<int> m_iGradeWeightHitMine;
int m_iGradeWeightOK; Preference<int> m_iGradeWeightOK;
int m_iGradeWeightNG; Preference<int> m_iGradeWeightNG;
// super meter used in rave // super meter used in rave
float m_fSuperMeterPercentChangeMarvelous; Preference<float> m_fSuperMeterPercentChangeMarvelous;
float m_fSuperMeterPercentChangePerfect; Preference<float> m_fSuperMeterPercentChangePerfect;
float m_fSuperMeterPercentChangeGreat; Preference<float> m_fSuperMeterPercentChangeGreat;
float m_fSuperMeterPercentChangeGood; Preference<float> m_fSuperMeterPercentChangeGood;
float m_fSuperMeterPercentChangeBoo; Preference<float> m_fSuperMeterPercentChangeBoo;
float m_fSuperMeterPercentChangeMiss; Preference<float> m_fSuperMeterPercentChangeMiss;
float m_fSuperMeterPercentChangeHitMine; Preference<float> m_fSuperMeterPercentChangeHitMine;
float m_fSuperMeterPercentChangeOK; Preference<float> m_fSuperMeterPercentChangeOK;
float m_fSuperMeterPercentChangeNG; Preference<float> m_fSuperMeterPercentChangeNG;
bool m_bMercifulSuperMeter; // negative super deltas are scaled by the players life percentage Preference<float> m_bMercifulSuperMeter; // negative super deltas are scaled by the players life percentage
// time meter used in survival // time meter used in survival
float m_fTimeMeterSecondsChangeMarvelous; Preference<float> m_fTimeMeterSecondsChangeMarvelous;
float m_fTimeMeterSecondsChangePerfect; Preference<float> m_fTimeMeterSecondsChangePerfect;
float m_fTimeMeterSecondsChangeGreat; Preference<float> m_fTimeMeterSecondsChangeGreat;
float m_fTimeMeterSecondsChangeGood; Preference<float> m_fTimeMeterSecondsChangeGood;
float m_fTimeMeterSecondsChangeBoo; Preference<float> m_fTimeMeterSecondsChangeBoo;
float m_fTimeMeterSecondsChangeMiss; Preference<float> m_fTimeMeterSecondsChangeMiss;
float m_fTimeMeterSecondsChangeHitMine; Preference<float> m_fTimeMeterSecondsChangeHitMine;
float m_fTimeMeterSecondsChangeOK; Preference<float> m_fTimeMeterSecondsChangeOK;
float m_fTimeMeterSecondsChangeNG; Preference<float> m_fTimeMeterSecondsChangeNG;
bool m_bAutoPlay; Preference<bool> m_bAutoPlay;
bool m_bDelayedBack; Preference<bool> m_bDelayedBack;
bool m_bShowInstructions, m_bShowSelectGroup; Preference<bool> m_bShowInstructions;
Preference<bool> m_bShowSelectGroup;
Preference<bool> m_bShowCaution; Preference<bool> m_bShowCaution;
bool m_bShowNativeLanguage; Preference<bool> m_bShowNativeLanguage;
bool m_bArcadeOptionsNavigation; Preference<bool> m_bArcadeOptionsNavigation;
enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY } m_MusicWheelUsesSections; enum MusicWheelUsesSections { NEVER, ALWAYS, ABC_ONLY };
int m_iMusicWheelSwitchSpeed; Preference<int> m_MusicWheelUsesSections;
bool m_bEasterEggs; Preference<int> m_iMusicWheelSwitchSpeed;
int m_iMarvelousTiming; Preference<bool> m_bEasterEggs;
enum MarvelousTiming { MARVELOUS_NEVER, MARVELOUS_COURSES_ONLY, MARVELOUS_EVERYWHERE };
Preference<int> m_iMarvelousTiming;
Preference<bool> m_bEventMode; Preference<bool> m_bEventMode;
int m_iCoinsPerCredit; Preference<int> m_iCoinsPerCredit;
Preference<int> m_iNumArcadeStages; Preference<int> m_iNumArcadeStages;
// These options have weird interactions depending on m_bEventMode, // These options have weird interactions depending on m_bEventMode,
stepmania/src/ScreenOptionsMasterPrefs.cpp
+19 -4
View File
@@ -73,8 +73,8 @@ static void MoveMap( int &sel, T &opt, bool ToSel, const T *mapping, unsigned cn
} }
/* /*
* MoveMap for a generic preference. We don't know its type, but MoveMap is only used on numeric * MoveMap for a generic preference.
* values, so pretend it's a float. * TODO: make this templated.
*/ */
static void MoveMap( int &sel, IPreference &pOption, bool ToSel, const float *mapping, unsigned cnt ) static void MoveMap( int &sel, IPreference &pOption, bool ToSel, const float *mapping, unsigned cnt )
{ {
@@ -91,6 +91,21 @@ static void MoveMap( int &sel, IPreference &pOption, bool ToSel, const float *ma
pOption.FromString( sStr ); pOption.FromString( sStr );
} }
} }
static void MoveMap( int &sel, IPreference &pOption, bool ToSel, const int *mapping, unsigned cnt )
{
if( ToSel )
{
/* opt -> sel. Find the closest entry in mapping. */
CString sStr = pOption.ToString();
int iValue = atoi( sStr );
sel = FindClosestEntry( iValue, mapping, cnt );
} else {
/* sel -> opt */
CString sStr = ssprintf( "%i", mapping[sel] );
pOption.FromString( sStr );
}
}
static void MovePref( int &iSel, bool bToSel, const ConfOption *pConfOption ) static void MovePref( int &iSel, bool bToSel, const ConfOption *pConfOption )
{ {
@@ -305,7 +320,7 @@ MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation );
static void WheelSpeed( int &sel, bool ToSel, const ConfOption *pConfOption ) static void WheelSpeed( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {
const int mapping[] = { 5, 10, 15, 25 }; const int mapping[] = { 5, 10, 15, 25 };
MoveMap( sel, PREFSMAN->m_iMusicWheelSwitchSpeed, ToSel, mapping, ARRAYSIZE(mapping) ); MoveMap( sel, (int&)PREFSMAN->m_iMusicWheelSwitchSpeed, ToSel, mapping, ARRAYSIZE(mapping) );
} }
/* Gameplay options */ /* Gameplay options */
@@ -317,7 +332,7 @@ MOVE( UnlockSystem, PREFSMAN->m_bUseUnlockSystem );
static void MarvelousTiming( int &sel, bool ToSel, const ConfOption *pConfOption ) static void MarvelousTiming( int &sel, bool ToSel, const ConfOption *pConfOption )
{ {
const int mapping[] = { 0, 1, 2 }; const int mapping[] = { PrefsManager::MARVELOUS_NEVER, PrefsManager::MARVELOUS_COURSES_ONLY, PrefsManager::MARVELOUS_EVERYWHERE };
MoveMap( sel, PREFSMAN->m_iMarvelousTiming, ToSel, mapping, ARRAYSIZE(mapping) ); MoveMap( sel, PREFSMAN->m_iMarvelousTiming, ToSel, mapping, ARRAYSIZE(mapping) );
} }
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -791,7 +791,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_F9 ) if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_F9 )
{ {
if( type != IET_FIRST_PRESS ) return; if( type != IET_FIRST_PRESS ) return;
PREFSMAN->m_bShowNativeLanguage ^= 1; PREFSMAN->m_bShowNativeLanguage = !PREFSMAN->m_bShowNativeLanguage;
m_MusicWheel.RebuildAllMusicWheelItems(); m_MusicWheel.RebuildAllMusicWheelItems();
if( SHOW_COURSE_CONTENTS ) if( SHOW_COURSE_CONTENTS )
m_CourseContents.SetFromGameState(); m_CourseContents.SetFromGameState();