From 729d179d27f4ed696b33834ca8419b333f76b258 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 25 Nov 2003 19:46:32 +0000 Subject: [PATCH] hack no longer needed --- stepmania/src/ScreenOptions.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 5bcf74f655..99620f6e3b 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -578,28 +578,11 @@ 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 - - // Super Hack to use the feature in ScreenOptionsMenu (where no style is set) - bool bHoldingLeftOrRight = false; - bHoldingLeftOrRight |= MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && + const bool bHoldingLeftOrRight = MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && PREFSMAN->m_bArcadeOptionsNavigation && - GAMESTATE->m_CurStyle != STYLE_INVALID && (INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_RIGHT) ) || INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_LEFT) ) ); - if( GAMESTATE->m_CurStyle == STYLE_INVALID ) - { - GAMESTATE->m_CurStyle = STYLE_DANCE_VERSUS; - - bHoldingLeftOrRight |= MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && - PREFSMAN->m_bArcadeOptionsNavigation && - GAMESTATE->m_CurStyle != STYLE_INVALID && - (INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_RIGHT) ) || - INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_LEFT) ) ); - - GAMESTATE->m_CurStyle = STYLE_INVALID; - } - if( bHoldingLeftOrRight ) { Screen::MenuUp( MenuI.player, type );