From b76d90cfd06ff18308bd36293c35332ea6bb6e48 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 19 Dec 2002 22:29:58 +0000 Subject: [PATCH] don't tween in menuelements when we're showing the summary (since we didn't tween it *out* on the previous screen) swoosh between eval screens clean up tweening between eval screens --- stepmania/src/ScreenEvaluation.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 232c6c1024..879ef1c779 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -253,7 +253,6 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) ); this->AddChild( &m_Menu ); - for( p=0; pIsPlayerEnabled( (PlayerNumber)p ) ) // If EZ2 wants to hide this graphic, place it somewhere off screen using theme metrics @@ -619,7 +618,10 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) break; } - m_Menu.TweenOnScreenFromBlack( SM_None ); + if( bSummary ) + m_Menu.ImmedOnScreenFromMenu(); + else + m_Menu.TweenOnScreenFromBlack( SM_None ); MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","evaluation music") ); } @@ -865,9 +867,12 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn ) m_Menu.TweenOffScreenToMenu( SM_GoToSelectMusic ); else if( m_ResultMode == RM_ARCADE_STAGE && GAMESTATE->m_iCurrentStageIndex == PREFSMAN->m_iNumArcadeStages-1 ) { - //Disable "Lets Move On Graphic" - m_Menu.m_KeepAlive.SetHidden(); - m_Menu.TweenOffScreenToMenu( SM_GoToFinalEvaluation ); + /* Tween the screen out, but leave the MenuElements where they are. + * Play the "swoosh" sound manually (would normally be played by the ME + * tween out). */ + SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu swoosh") ); + TweenOffScreen(); + SCREENMAN->SendMessageToTopScreen( SM_GoToFinalEvaluation, MENU_ELEMENTS_TWEEN_TIME ); } else if( m_ResultMode == RM_ARCADE_STAGE && GAMESTATE->m_iCurrentStageIndex < PREFSMAN->m_iNumArcadeStages-1 ) m_Menu.TweenOffScreenToMenu( SM_GoToSelectMusic );