From 11637bd603a5ea398b31dba33c8b81e199e24d46 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 22 Apr 2012 14:01:12 -0500 Subject: [PATCH] [LifeMeterBar] Reverted a change from 2010 that messed with how the life meter subtracts life. The life difficulty should match StepMania 3.9 again. --- Docs/Changelog_sm5.txt | 5 +++++ src/LifeMeterBar.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 8860b7876c..32501d7047 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -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 diff --git a/src/LifeMeterBar.cpp b/src/LifeMeterBar.cpp index aa07a5cfa7..a165791bb6 100644 --- a/src/LifeMeterBar.cpp +++ b/src/LifeMeterBar.cpp @@ -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 )