From 4b1e4ebe7403252586b7ccf336225d88d1cdfe07 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 12 Jan 2004 09:53:09 +0000 Subject: [PATCH] remove old code (it didn't actually do anything; if start is pressed, left and right should have already been pressed) require both left and right to move back, not just one --- stepmania/src/ScreenOptions.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index d9367e5f60..4e28006178 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -853,10 +853,14 @@ void ScreenOptions::Input( const DeviceInput& DeviceI, const InputEventType type // if we are in dedicated menubutton input and arcade navigation // check to see if MENU_BUTTON_LEFT and MENU_BUTTON_RIGHT are being held + /* This was left or right, instead of left and right. Require both. When + * running through a menu quickly in three key mode with lots of right and + * start taps, it's very easy to tap start before actually releasing the right + * tap, causing the menu to move up when you wanted it to go down. */ const bool bHoldingLeftOrRight = MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && m_OptionsNavigation == NAV_THREE_KEY && - (INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_RIGHT) ) || - INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_LEFT) ) ); + INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_RIGHT) ) && + INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_LEFT) ); if( type != IET_RELEASE && bHoldingLeftOrRight ) { @@ -1168,13 +1172,6 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat ) Row &row = *m_Rows[iCurRow]; OptionRowData &optrow = m_Rows[iCurRow]->m_RowDef; - /* If START is being pressed, and in NAV_THREE_KEY, then we're holding left/right - * and start to move backwards. Don't move left and right, too. */ - /* DO move so that when we press Left then Right, we move back to the option - * that was selected before we started the combination to go Up. -Chris */ -// if( m_OptionsNavigation == NAV_THREE_KEY && INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_START) ) ) -// return; - const int iNumOptions = (row.Type == Row::ROW_EXIT)? 1: optrow.choices.size(); if( m_OptionsNavigation == NAV_THREE_KEY_MENU && iNumOptions <= 1 ) // 1 or 0 {