From 7c3c56f2b930f1525a5dc953d8b9d7b50188b9e4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 25 Jun 2006 20:08:31 +0000 Subject: [PATCH] SetHibernate can be called after queuing tweens. GetLengthSeconds is hacky, and needs to be removed ... --- stepmania/src/ScreenWithMenuElements.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index f7b444a1ec..d9c16134c6 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -246,15 +246,15 @@ void ScreenWithMenuElements::StartTransitioningScreen( ScreenMessage smSendWhenD TweenOffScreen(); } + m_Out.StartTransitioning( smSendWhenDone ); if( WAIT_FOR_CHILDREN_BEFORE_TWEENING_OUT ) { // Time the transition so that it finishes exactly when all actors have // finished tweening. float fSecondsUntilFinished = GetTweenTimeLeft(); - float fSecondsUntilBeginOff = max( fSecondsUntilFinished - m_Out.GetLengthSeconds(), 0 ); + float fSecondsUntilBeginOff = max( fSecondsUntilFinished - m_Out.GetTweenTimeLeft(), 0 ); m_Out.SetHibernate( fSecondsUntilBeginOff ); } - m_Out.StartTransitioning( smSendWhenDone ); } void ScreenWithMenuElements::TweenOffScreen()