diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 8c2ba91f57..746e3edd20 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1985,6 +1985,7 @@ DescWidth=400 DangerThreshold=0.2 InitialValue=0.5 HotValue=1.0 +LifeMultiplier=1.0 MinStayAlive="TapNoteScore_W3" LifePercentChangeW1=0.008 LifePercentChangeW2=0.008 diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 5b21f756e1..495ba479ba 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -23,6 +23,7 @@ LifeMeterBar::LifeMeterBar() DANGER_THRESHOLD.Load ("LifeMeterBar","DangerThreshold"); INITIAL_VALUE.Load ("LifeMeterBar","InitialValue"); HOT_VALUE.Load ("LifeMeterBar","HotValue"); + LIFE_MULTIPLIER.Load ( "LifeMeterBar","LifeMultiplier"); MIN_STAY_ALIVE.Load ("LifeMeterBar","MinStayAlive"); m_fLifePercentChange.Load( "LifeMeterBar", LIFE_PERCENT_CHANGE_NAME, NUM_ScoreEvent ); @@ -225,7 +226,7 @@ void LifeMeterBar::ChangeLife( float fDeltaLife ) } m_fLifePercentage += fDeltaLife; - CLAMP( m_fLifePercentage, 0, 1 ); + CLAMP( m_fLifePercentage, 0, LIFE_MULTIPLIER ); AfterLifeChanged(); } diff --git a/stepmania/src/LifeMeterBar.h b/stepmania/src/LifeMeterBar.h index eb772b92e4..f1ed08ea50 100644 --- a/stepmania/src/LifeMeterBar.h +++ b/stepmania/src/LifeMeterBar.h @@ -37,6 +37,7 @@ private: ThemeMetric DANGER_THRESHOLD; ThemeMetric INITIAL_VALUE; ThemeMetric HOT_VALUE; + ThemeMetric LIFE_MULTIPLIER; ThemeMetric MIN_STAY_ALIVE; ThemeMetric1D m_fLifePercentChange;