From f3f7af7045bd3dfa69479d157b29fe1e2b475c2f Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Sun, 3 Aug 2014 22:38:01 -0600 Subject: [PATCH] Changed RollingNumbers to not set NAN velocity. --- src/RollingNumbers.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/RollingNumbers.cpp b/src/RollingNumbers.cpp index 2330351fb1..95c48e5926 100644 --- a/src/RollingNumbers.cpp +++ b/src/RollingNumbers.cpp @@ -72,7 +72,7 @@ void RollingNumbers::DrawPrimitives() void RollingNumbers::Update( float fDeltaTime ) { - if( m_fCurrentNumber != m_fTargetNumber ) + if(m_fCurrentNumber != m_fTargetNumber && m_fScoreVelocity > 0) { fapproach( m_fCurrentNumber, m_fTargetNumber, fabsf(m_fScoreVelocity) * fDeltaTime ); UpdateText(); @@ -86,7 +86,15 @@ void RollingNumbers::SetTargetNumber( float fTargetNumber ) if( fTargetNumber == m_fTargetNumber ) // no change return; m_fTargetNumber = fTargetNumber; - m_fScoreVelocity = (m_fTargetNumber-m_fCurrentNumber) / APPROACH_SECONDS.GetValue(); + float approach_secs= APPROACH_SECONDS.GetValue(); + if(approach_secs > 0) + { + m_fScoreVelocity= (m_fTargetNumber-m_fCurrentNumber) / approach_secs; + } + else + { + m_fScoreVelocity= (m_fTargetNumber-m_fCurrentNumber); + } } void RollingNumbers::UpdateText()