diff --git a/stepmania/src/CombinedLifeMeterTug.cpp b/stepmania/src/CombinedLifeMeterTug.cpp index 2bc8e96836..6ef8952b07 100644 --- a/stepmania/src/CombinedLifeMeterTug.cpp +++ b/stepmania/src/CombinedLifeMeterTug.cpp @@ -8,6 +8,25 @@ ThemeMetric METER_WIDTH ("CombinedLifeMeterTug","MeterWidth"); +static void TugMeterPercentChangeInit( size_t /*ScoreEvent*/ i, CString &sNameOut, float &defaultValueOut ) +{ + sNameOut = "TugMeterPercentChange" + ScoreEventToString( (ScoreEvent)i ); + switch( i ) + { + default: ASSERT(0); + case SE_W1: defaultValueOut = +0.010f; break; + case SE_W2: defaultValueOut = +0.008f; break; + case SE_W3: defaultValueOut = +0.004f; break; + case SE_W4: defaultValueOut = +0.000f; break; + case SE_W5: defaultValueOut = -0.010f; break; + case SE_Miss: defaultValueOut = -0.020f; break; + case SE_HitMine: defaultValueOut = -0.040f; break; + case SE_Held: defaultValueOut = +0.008f; break; + case SE_LetGo: defaultValueOut = -0.020f; break; + } +} + +static Preference1D g_fTugMeterPercentChange( TugMeterPercentChangeInit, NUM_ScoreEvent ); CombinedLifeMeterTug::CombinedLifeMeterTug() { @@ -47,13 +66,13 @@ void CombinedLifeMeterTug::ChangeLife( PlayerNumber pn, TapNoteScore score ) float fPercentToMove = 0; switch( score ) { - case TNS_W1: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W1]; break; - case TNS_W2: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W2]; break; - case TNS_W3: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W3]; break; - case TNS_W4: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W4]; break; - case TNS_W5: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_W5]; break; - case TNS_Miss: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_Miss]; break; - case TNS_HitMine: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_HitMine]; break; + case TNS_W1: fPercentToMove = g_fTugMeterPercentChange[SE_W1]; break; + case TNS_W2: fPercentToMove = g_fTugMeterPercentChange[SE_W2]; break; + case TNS_W3: fPercentToMove = g_fTugMeterPercentChange[SE_W3]; break; + case TNS_W4: fPercentToMove = g_fTugMeterPercentChange[SE_W4]; break; + case TNS_W5: fPercentToMove = g_fTugMeterPercentChange[SE_W5]; break; + case TNS_Miss: fPercentToMove = g_fTugMeterPercentChange[SE_Miss]; break; + case TNS_HitMine: fPercentToMove = g_fTugMeterPercentChange[SE_HitMine]; break; default: ASSERT(0); break; } @@ -65,8 +84,8 @@ void CombinedLifeMeterTug::ChangeLife( PlayerNumber pn, HoldNoteScore score, Tap float fPercentToMove = 0; switch( score ) { - case HNS_Held: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_Held]; break; - case HNS_LetGo: fPercentToMove = PREFSMAN->m_fTugMeterPercentChange[SE_LetGo]; break; + case HNS_Held: fPercentToMove = g_fTugMeterPercentChange[SE_Held]; break; + case HNS_LetGo: fPercentToMove = g_fTugMeterPercentChange[SE_LetGo]; break; default: ASSERT(0); break; } diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index c3c7900e1a..5110ff7c5e 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -16,6 +16,26 @@ #include "Steps.h" +static void LifePercentChangeInit( size_t /*ScoreEvent*/ i, CString &sNameOut, float &defaultValueOut ) +{ + sNameOut = "LifePercentChange" + ScoreEventToString( (ScoreEvent)i ); + switch( i ) + { + default: ASSERT(0); + case SE_W1: defaultValueOut = +0.008f; break; + case SE_W2: defaultValueOut = +0.008f; break; + case SE_W3: defaultValueOut = +0.004f; break; + case SE_W4: defaultValueOut = +0.000f; break; + case SE_W5: defaultValueOut = -0.040f; break; + case SE_Miss: defaultValueOut = -0.080f; break; + case SE_HitMine: defaultValueOut = -0.160f; break; + case SE_Held: defaultValueOut = +0.008f; break; + case SE_LetGo: defaultValueOut = -0.080f; break; + } +} + +static Preference1D g_fLifePercentChange( LifePercentChangeInit, NUM_ScoreEvent ); + static ThemeMetric METER_WIDTH ("LifeMeterBar","MeterWidth"); static ThemeMetric METER_HEIGHT ("LifeMeterBar","MeterHeight"); static ThemeMetric DANGER_THRESHOLD ("LifeMeterBar","DangerThreshold"); @@ -125,13 +145,13 @@ void LifeMeterBar::ChangeLife( TapNoteScore score ) switch( score ) { default: ASSERT(0); - case TNS_W1: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W1]; break; - case TNS_W2: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W2]; break; - case TNS_W3: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W3]; break; - case TNS_W4: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W4]; break; - case TNS_W5: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_W5]; break; - case TNS_Miss: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_Miss]; break; - case TNS_HitMine: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_HitMine]; break; + case TNS_W1: fDeltaLife = g_fLifePercentChange[SE_W1]; break; + case TNS_W2: fDeltaLife = g_fLifePercentChange[SE_W2]; break; + case TNS_W3: fDeltaLife = g_fLifePercentChange[SE_W3]; break; + case TNS_W4: fDeltaLife = g_fLifePercentChange[SE_W4]; break; + case TNS_W5: fDeltaLife = g_fLifePercentChange[SE_W5]; break; + case TNS_Miss: fDeltaLife = g_fLifePercentChange[SE_Miss]; break; + case TNS_HitMine: fDeltaLife = g_fLifePercentChange[SE_HitMine]; break; } if( IsHot() && score < TNS_W4 ) fDeltaLife = -0.10f; // make it take a while to get back to "hot" @@ -164,8 +184,8 @@ void LifeMeterBar::ChangeLife( HoldNoteScore score, TapNoteScore tscore ) case SongOptions::DRAIN_NORMAL: switch( score ) { - case HNS_Held: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_Held]; break; - case HNS_LetGo: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_LetGo]; break; + case HNS_Held: fDeltaLife = g_fLifePercentChange[SE_Held]; break; + case HNS_LetGo: fDeltaLife = g_fLifePercentChange[SE_LetGo]; break; default: ASSERT(0); } @@ -176,7 +196,7 @@ void LifeMeterBar::ChangeLife( HoldNoteScore score, TapNoteScore tscore ) switch( score ) { case HNS_Held: fDeltaLife = +0.000f; break; - case HNS_LetGo: fDeltaLife = PREFSMAN->m_fLifePercentChange[SE_LetGo]; break; + case HNS_LetGo: fDeltaLife = g_fLifePercentChange[SE_LetGo]; break; default: ASSERT(0); } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index b445e4949b..c545220457 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -102,42 +102,6 @@ void TimingWindowSecondsInit( size_t /*TimingWindow*/ i, CString &sNameOut, floa } } -void LifePercentChangeInit( size_t /*ScoreEvent*/ i, CString &sNameOut, float &defaultValueOut ) -{ - sNameOut = "LifePercentChange" + ScoreEventToString( (ScoreEvent)i ); - switch( i ) - { - default: ASSERT(0); - case SE_W1: defaultValueOut = +0.008f; break; - case SE_W2: defaultValueOut = +0.008f; break; - case SE_W3: defaultValueOut = +0.004f; break; - case SE_W4: defaultValueOut = +0.000f; break; - case SE_W5: defaultValueOut = -0.040f; break; - case SE_Miss: defaultValueOut = -0.080f; break; - case SE_HitMine: defaultValueOut = -0.160f; break; - case SE_Held: defaultValueOut = +0.008f; break; - case SE_LetGo: defaultValueOut = -0.080f; break; - } -} - -void TugMeterPercentChangeInit( size_t /*ScoreEvent*/ i, CString &sNameOut, float &defaultValueOut ) -{ - sNameOut = "TugMeterPercentChange" + ScoreEventToString( (ScoreEvent)i ); - switch( i ) - { - default: ASSERT(0); - case SE_W1: defaultValueOut = +0.010f; break; - case SE_W2: defaultValueOut = +0.008f; break; - case SE_W3: defaultValueOut = +0.004f; break; - case SE_W4: defaultValueOut = +0.000f; break; - case SE_W5: defaultValueOut = -0.010f; break; - case SE_Miss: defaultValueOut = -0.020f; break; - case SE_HitMine: defaultValueOut = -0.040f; break; - case SE_Held: defaultValueOut = +0.008f; break; - case SE_LetGo: defaultValueOut = -0.020f; break; - } -} - void PercentScoreWeightInit( size_t /*ScoreEvent*/ i, CString &sNameOut, int &defaultValueOut ) { sNameOut = "PercentScoreWeight" + ScoreEventToString( (ScoreEvent)i ); @@ -255,8 +219,6 @@ PrefsManager::PrefsManager() : m_fTimingWindowSeconds( TimingWindowSecondsInit, NUM_TimingWindow ), m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ), - m_fLifePercentChange( LifePercentChangeInit, NUM_ScoreEvent ), - m_fTugMeterPercentChange( TugMeterPercentChangeInit, NUM_ScoreEvent ), m_iRegenComboAfterFail ( "RegenComboAfterFail", 10 ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index a76a2b48ac..c093142302 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -86,11 +86,7 @@ public: Preference1D m_fTimingWindowSeconds; Preference m_fLifeDifficultyScale; - Preference1D m_fLifePercentChange; - // tug meter used in rave - Preference1D m_fTugMeterPercentChange; - // Whoever added these: Please add a comment saying what they do. -Chris Preference m_iRegenComboAfterFail; Preference m_iRegenComboAfterMiss;