From 9c607c99865a13a7472ac0f2325d26b71360fe8a Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 24 Mar 2003 21:59:50 +0000 Subject: [PATCH] fix ScreenEvaluation glitches --- stepmania/Themes/default/metrics.ini | 4 ++++ stepmania/src/ScreenEvaluation.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 24a56542e6..709065adc0 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -678,6 +678,10 @@ DancePointsP1OnCommand=diffuse,1,1,1,0 DancePointsP1OffCommand= DancePointsP2OnCommand=diffuse,1,1,1,0 DancePointsP2OffCommand= +SongsSurvivedP1OnCommand=diffuse,1,1,1,0 +SongsSurvivedP1OffCommand= +SongsSurvivedP2OnCommand=diffuse,1,1,1,0 +SongsSurvivedP2OffCommand= TimeLabelOnCommand=diffuse,1,1,1,0 TimeLabelOffCommand= TimeNumberP1OnCommand=diffuse,1,1,1,0 diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index e57fec0ded..94923152e4 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -80,7 +80,7 @@ const char* SCORE_STRING[NUM_SCORE_LINES] = { "Score", "Time" }; const ScreenMessage SM_GoToSelectMusic = ScreenMessage(SM_User+1); const ScreenMessage SM_GoToSelectCourse = ScreenMessage(SM_User+3); -const ScreenMessage SM_GoToFinalEvaluation = ScreenMessage(SM_User+4); +const ScreenMessage SM_GoToEvaluationSummary = ScreenMessage(SM_User+4); const ScreenMessage SM_GoToGameFinished = ScreenMessage(SM_User+5); const ScreenMessage SM_PlayCheer = ScreenMessage(SM_User+6); @@ -723,8 +723,8 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) // SCREENMAN->SetNewScreen( "ScreenNameEntry" ); SCREENMAN->SetNewScreen( ENDGAME_SCREEN ); break; - case SM_GoToFinalEvaluation: - SCREENMAN->SetNewScreen( "ScreenFinalEvaluation" ); + case SM_GoToEvaluationSummary: + SCREENMAN->SetNewScreen( "ScreenEvaluationSummary" ); break; case SM_PlayCheer: SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") ); @@ -789,7 +789,7 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn ) * Play the "swoosh" sound manually (would normally be played by the ME * tween out). */ TweenOffScreen(); - SCREENMAN->SendMessageToTopScreen( SM_GoToFinalEvaluation, MENU_ELEMENTS_TWEEN_TIME ); + m_Menu.StartTransitioning( SM_GoToEvaluationSummary ); } else {