actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't tween in menuelements when we're showing the summary (since

Browse Source 
we didn't tween it *out* on the previous screen)

swoosh between eval screens

clean up tweening between eval screens
This commit is contained in:
Glenn Maynard
2002-12-19 22:29:58 +00:00
parent c3596d9c32
commit b76d90cfd0
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+10 -5
View File
@@ -253,7 +253,6 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
);
this->AddChild( &m_Menu );
for( p=0; p<NUM_PLAYERS; p++ )
{
if( !GAMESTATE->IsPlayerEnabled( (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 );