From 1b690264e359c97c3b5d98eeabde18efc4641c31 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 23 Nov 2005 17:00:23 +0000 Subject: [PATCH] that's not right: clamp(x,a,b) is not well-defined if a > b --- stepmania/src/LifeMeterBar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 31b9eb33c1..c21096816a 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -245,7 +245,8 @@ void LifeMeterBar::ChangeLife( float fDeltaLife ) /* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail * but don't reduce it if it's already past. */ int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail; - m_iComboToRegainLife = clamp( iNewComboToRegainLife, m_iComboToRegainLife, (int)PREFSMAN->m_iMaxRegenComboAfterFail ); + iNewComboToRegainLife = min( (int)PREFSMAN->m_iMaxRegenComboAfterFail, iNewComboToRegainLife ); + m_iComboToRegainLife = max( m_iComboToRegainLife, iNewComboToRegainLife ); } m_fLifePercentage += fDeltaLife;