From 078017317c4c5ff80313e7a9a3cdce8096c21d19 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 19 Jan 2006 04:32:31 +0000 Subject: [PATCH] fix NAV_TOGGLE_FIVE_KEY focus navigation --- stepmania/src/ScreenOptions.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index bf5d778bd9..ec14318516 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -1139,7 +1139,6 @@ void ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool Repeat ) wrap( r, m_pRows.size() ); - const unsigned iOldSelection = row.GetChoiceInRowWithFocus(p); if( m_iCurrentRow[p] == r ) continue; @@ -1150,7 +1149,6 @@ void ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool Repeat ) switch( m_OptionsNavigation ) { - case NAV_TOGGLE_THREE_KEY: case NAV_TOGGLE_FIVE_KEY: if( row.GetRowDef().m_layoutType != LAYOUT_SHOW_ONE_IN_ROW ) { @@ -1166,7 +1164,6 @@ void ScreenOptions::MoveRowRelative( PlayerNumber pn, int iDir, bool Repeat ) row.SetChoiceInRowWithFocus( p, i ); } } - row.SetChoiceInRowWithFocus( p, min( iOldSelection, row.GetTextItemsSize()-1 ) ); } }