This commit is contained in:
Glenn Maynard
2005-11-23 16:56:36 +00:00
parent d08e4d0a14
commit ae712f3126
+2 -4
View File
@@ -244,10 +244,8 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
{ {
/* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail /* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail
* but don't reduce it if it's already past. */ * but don't reduce it if it's already past. */
const int NewComboToRegainLife = min( int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail;
(int)PREFSMAN->m_iMaxRegenComboAfterFail, m_iComboToRegainLife = clamp( iNewComboToRegainLife, m_iComboToRegainLife, (int)PREFSMAN->m_iMaxRegenComboAfterFail );
m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail );
m_iComboToRegainLife = max( m_iComboToRegainLife, NewComboToRegainLife );
} }
m_fLifePercentage += fDeltaLife; m_fLifePercentage += fDeltaLife;