From ecde561c0387e5b8531bdf2bab7f6ca1db19f4e1 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 18 Jun 2006 05:05:06 +0000 Subject: [PATCH] Fix crash in Actor::BeginTweening. Is there a reason for that ASSERT? The next line clamps to 0. --- stepmania/src/ScreenPlayerOptions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index c0e55085b8..ecf0645794 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -131,14 +131,14 @@ void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM ) { m_bAcceptedChoices = true; - float fShowSeconds = m_Out.GetLengthSeconds(); + float fShowSeconds = max( m_Out.GetLengthSeconds()-0.3f, 0 ); // show "hold START for options" m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); m_sprOptionsMessage.BeginTweening( 0.15f ); // fade in m_sprOptionsMessage.SetZoomY( 1 ); m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,1) ); - m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f ); // sleep + m_sprOptionsMessage.BeginTweening( fShowSeconds ); // sleep m_sprOptionsMessage.BeginTweening( 0.15f ); // fade out m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); m_sprOptionsMessage.SetZoomY( 0 );