diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index d34929224c..54ca69593e 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -134,24 +134,21 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input ) void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM ) { - if( m_bAskOptionsMessage ) + if( SM == SM_BeginFadingOut && m_bAskOptionsMessage ) // user accepts the page of options { - if( SM == SM_BeginFadingOut ) // when the user accepts the page of options - { - m_bAcceptedChoices = true; - - float fShowSeconds = m_Out.GetLengthSeconds(); - - // show "hold START for options" - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); - m_sprOptionsMessage.BeginTweening( 0.15f ); // fade in - m_sprOptionsMessage.SetZoomY( 1 ); - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,1) ); - m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f ); // sleep - m_sprOptionsMessage.BeginTweening( 0.15f ); // fade out - m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); - m_sprOptionsMessage.SetZoomY( 0 ); - } + m_bAcceptedChoices = true; + + float fShowSeconds = m_Out.GetLengthSeconds(); + + // show "hold START for options" + m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); + m_sprOptionsMessage.BeginTweening( 0.15f ); // fade in + m_sprOptionsMessage.SetZoomY( 1 ); + m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,1) ); + m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f ); // sleep + m_sprOptionsMessage.BeginTweening( 0.15f ); // fade out + m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) ); + m_sprOptionsMessage.SetZoomY( 0 ); } ScreenOptionsMaster::HandleScreenMessage( SM );