From 0607fe96986737b4b6df939187b75c3f43d7c454 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 25 Mar 2003 21:37:31 +0000 Subject: [PATCH] Fix a going to the wrong screen after cleared in ScreenGamplay. eep. --- stepmania/Themes/default/metrics.ini | 6 +++--- stepmania/src/ScreenGameplay.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 4a1774f4c7..3e037831e2 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -207,13 +207,13 @@ NextScreenBattle=ScreenInstructions [ScreenSelectGroup] FrameOnCommand=x,180;y,160;xoffset,-400;bounceend,0.5;xoffset,400 -FrameOffCommand=sleep,0.3;bouncebegin,0.5;xoffset,-400 +FrameOffCommand=sleep,0.6;bouncebegin,0.5;xoffset,-400 BannerOnCommand=x,182;y,158;xoffset,-400;bounceend,0.5;xoffset,400 -BannerOffCommand=sleep,0.3;bouncebegin,0.5;xoffset,-400 +BannerOffCommand=sleep,0.6;bouncebegin,0.5;xoffset,-400 BannerWidth=288 BannerHeight=92 NumberOnCommand=x,116;y,224;horizalign,right;shadowlength,0;xoffset,-400;bounceend,0.5;xoffset,400 -NumberOffCommand=sleep,0.3;bouncebegin,0.5;xoffset,-400 +NumberOffCommand=sleep,0.6;bouncebegin,0.5;xoffset,-400 ExplanationOnCommand=x,110;y,66;xoffset,-400;bounceend,0.5;xoffset,400 ExplanationOffCommand=bouncebegin,0.5;xoffset,-400 ContentsOnCommand=x,320;y,260;diffuse,1,1,1,0;linear,0.5;diffuse,1,1,1,1 diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 50f43b71ce..c66050e68f 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1492,6 +1492,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) case PLAY_MODE_ARCADE: case PLAY_MODE_BATTLE: SCREENMAN->SetNewScreen( "ScreenEvaluationStage" ); + break; case PLAY_MODE_NONSTOP: case PLAY_MODE_ONI: case PLAY_MODE_ENDLESS: