From a269621ffe5010b1c73bce588b566edc95ce0e74 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 18 Apr 2003 09:11:46 +0000 Subject: [PATCH] Don't send the tween-finished message before all menu elements have finished tweening. Fixes tweening problems in the SMMAX2 options menus. . --- stepmania/src/MenuElements.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp index 229e5bc7a5..5cafc747fd 100644 --- a/stepmania/src/MenuElements.cpp +++ b/stepmania/src/MenuElements.cpp @@ -113,7 +113,12 @@ void MenuElements::StartTransitioning( ScreenMessage smSendWhenDone ) m_sprFooter.Command( FOOTER_OFF_COMMAND ); m_textHelp.Command( HELP_OFF_COMMAND ); - m_Out.StartTransitioning( smSendWhenDone ); + m_Out.StartTransitioning(); + + /* This includes all of the actors: */ + float TimeUntilFinished = GetTweenTimeLeft(); + TimeUntilFinished = max(TimeUntilFinished, m_Out.GetLengthSeconds()); + SCREENMAN->PostMessageToTopScreen( smSendWhenDone, TimeUntilFinished ); } void MenuElements::Back( ScreenMessage smSendWhenDone )