[LifeMeterBar] Reverted a change from 2010 that messed with how the life meter subtracts life. The life difficulty should match StepMania 3.9 again.

This commit is contained in:
AJ Kelly
2012-04-22 14:01:12 -05:00
parent 8740bd75a4
commit 11637bd603
2 changed files with 6 additions and 1 deletions
+5
View File
@@ -9,6 +9,11 @@ ________________________________________________________________________________
StepMania 5.0 alpha 2 | 201204??
--------------------------------------------------------------------------------
2012/04/22
----------
* [LifeMeterBar] Reverted a change from 2010 that messed with how the life meter
subtracts life. The life difficulty should match StepMania 3.9 again. [AJ]
2012/04/08
----------
* [ScreenNetworkOptions] Fixed a bug where localized text would not show up
+1 -1
View File
@@ -191,7 +191,7 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
{
bool bUseMercifulDrain = m_bMercifulBeginnerInEffect || PREFSMAN->m_bMercifulDrain;
if( bUseMercifulDrain && fDeltaLife < 0 )
fDeltaLife *= 0.4f;
fDeltaLife *= SCALE( m_fLifePercentage, 0.f, 1.f, 0.5f, 1.f);
// handle progressiveness and ComboToRegainLife here
if( fDeltaLife >= 0 )