From b3643f24516283a2bd8fa7825280901cfd278c66 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 21:50:11 +0000 Subject: [PATCH] This isn't reachable; we'll always exit through the bEndThisScreen path. Actually, this changed behavior a little, if a screen was in NAV_THREE_KEY_MENU and used SELECT_MULTIPLE rows. That combination doesn't make much sense, though; you'd have to press start on MULTIPLE rows and right on SELECT_ONE rows. That NAV mode is meant for SELECT_NONE. --- stepmania/src/ScreenOptions.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 3f35142be6..2dbb636f39 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -953,9 +953,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) ChangeValueInRowRelative( m_iCurrentRow[pn], pn, 0, input.type != IET_FIRST_PRESS ); break; case NAV_THREE_KEY_MENU: - /* Don't accept START to go to the next screen if we're still transitioning in. */ - if( input.type == IET_FIRST_PRESS && !IsTransitioning() ) - this->BeginFadingOut(); + ASSERT(0); // unreachable break; case NAV_FIVE_KEY: /* Jump to the exit row. (If everyone's already on the exit row, then