From 09bc71b59576d540a30cbd3d9d3af274c0d82570 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 23 Nov 2005 17:06:10 +0000 Subject: [PATCH] cleanup --- stepmania/src/LifeMeterBar.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index c21096816a..c3c7900e1a 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -218,10 +218,9 @@ void LifeMeterBar::ChangeLife( float fDeltaLife ) m_iMissCombo++; /* Increase by m_iRegenComboAfterMiss; never push it beyond m_iMaxRegenComboAfterMiss * but don't reduce it if it's already past. */ - const int NewComboToRegainLife = min( - (int)PREFSMAN->m_iMaxRegenComboAfterMiss, - m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterMiss ); - m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife ); + int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterMiss; + iNewComboToRegainLife = min( (int)PREFSMAN->m_iMaxRegenComboAfterMiss, iNewComboToRegainLife ); + m_iComboToRegainLife = max( m_iComboToRegainLife, iNewComboToRegainLife ); } /* If we've already failed, there's no point in letting them fill up the bar again. */