From 031d359e980548dfd9647c91014023f60c348bdf Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 22:11:22 +0000 Subject: [PATCH] remove redundant conditional --- stepmania/src/ScreenOptions.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 2dbb636f39..224f6fc7b7 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -939,19 +939,19 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) break; case NAV_TOGGLE_THREE_KEY: case NAV_TOGGLE_FIVE_KEY: - if( row.GetRowDef().m_selectType != SELECT_MULTIPLE ) - { - int iChoiceInRow = row.GetChoiceInRowWithFocus(pn); - if( row.GetRowDef().m_bOneChoiceForAllPlayers ) - row.SetOneSharedSelection( iChoiceInRow ); - else - row.SetOneSelection( pn, iChoiceInRow ); - } + { + int iChoiceInRow = row.GetChoiceInRowWithFocus(pn); + if( row.GetRowDef().m_bOneChoiceForAllPlayers ) + row.SetOneSharedSelection( iChoiceInRow ); + else + row.SetOneSelection( pn, iChoiceInRow ); + if( row.GetFirstItemGoesDown() ) ChangeValueInRowRelative( m_iCurrentRow[pn], pn, -row.GetChoiceInRowWithFocus(pn), input.type != IET_FIRST_PRESS ); // move to the first choice else ChangeValueInRowRelative( m_iCurrentRow[pn], pn, 0, input.type != IET_FIRST_PRESS ); break; + } case NAV_THREE_KEY_MENU: ASSERT(0); // unreachable break;