From 0594303c3caaae80f556a404052c81c436f5b06f Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 28 Oct 2011 16:35:57 -0500 Subject: [PATCH] [ScoreKeeperRave] Fix an issue where the super meter would not decrease back to 1 after hitting the end of 3. (Fixes issue 314.) --- Docs/Changelog_sm5.txt | 5 +++++ src/ScoreKeeperRave.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 2a88a3bd2b..cf404939ce 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,11 @@ ________________________________________________________________________________ StepMania 5.0 $next | 2011xxxx -------------------------------------------------------------------------------- +2011/10/28 +---------- +* [ScoreKeeperRave] Fix an issue where the super meter would not decrease back + to 1 after hitting the end of 3. (Fixes issue 314.) [AJ] + 2011/10/27 ---------- * [Default theme] Fixed the pref controlling timing segments on song meter. [FSX] diff --git a/src/ScoreKeeperRave.cpp b/src/ScoreKeeperRave.cpp index 22d2e82706..87ff254a1a 100644 --- a/src/ScoreKeeperRave.cpp +++ b/src/ScoreKeeperRave.cpp @@ -143,7 +143,7 @@ void ScoreKeeperRave::AddSuperMeterDelta( float fUnscaledPercentChange ) { LaunchAttack( oldAL ); if( newAL == NUM_ATTACK_LEVELS ) // hit upper bounds of meter - m_pPlayerState->m_fSuperMeter -= 1.f; + m_pPlayerState->m_fSuperMeter = 0.f; } // mercy: if losing remove attacks on life drain