From a176ba50c73bc51469428ee1d56bfe9e62dcf82c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 8 May 2004 05:47:37 +0000 Subject: [PATCH] simplify fix draw order --- stepmania/src/ScreenInstructions.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp index c932ae060a..43b636beaf 100644 --- a/stepmania/src/ScreenInstructions.cpp +++ b/stepmania/src/ScreenInstructions.cpp @@ -41,12 +41,9 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements if( GAMESTATE->m_PlayMode == PLAY_MODE_ARCADE ) { Difficulty easiestDifficulty = (Difficulty)(NUM_DIFFICULTIES-1); - for( int p=0; pIsHumanPlayer(p) ) - continue; + FOREACH_HumanPlayer(p) easiestDifficulty = min( easiestDifficulty, GAMESTATE->m_PreferredDifficulty[p] ); - } + if( easiestDifficulty > DIFFICULTY_EASY ) { HandleScreenMessage( SM_GoToNextScreen ); @@ -69,6 +66,8 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE ); m_sprHowToPlay.SetX( CENTER_X ); + this->SortByDrawOrder(); + SOUND->PlayMusic( THEME->GetPathToS("ScreenInstructions music") ); }