From c5f0f565cefd566b9a3c8d2138137a8b4dc7f6da Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Nov 2006 09:49:50 +0000 Subject: [PATCH] simplify; don't accumulate m_iComboToRegainLife --- stepmania/src/LifeMeterBar.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index b567176eb7..7f7a435b82 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -232,11 +232,7 @@ void LifeMeterBar::ChangeLife( float fDeltaLife ) // do this after; only successive W5/miss will // increase the amount of life lost. m_iMissCombo++; - /* Increase by m_iRegenComboAfterMiss; never push it beyond m_iMaxRegenComboAfterMiss - * but don't reduce it if it's already past. */ - int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterMiss; - iNewComboToRegainLife = min( (int)PREFSMAN->m_iMaxRegenComboAfterMiss, iNewComboToRegainLife ); - m_iComboToRegainLife = max( m_iComboToRegainLife, iNewComboToRegainLife ); + m_iComboToRegainLife = PREFSMAN->m_iRegenComboAfterMiss; } /* If we've already failed, there's no point in letting them fill up the bar again. */