From 8e8dbb5862b57743eac01bd7ff1b5d607c8d7d29 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 30 Sep 2003 05:39:47 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenOptionsMasterPrefs.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index 54702cd37c..f070f4d6cd 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -246,19 +246,8 @@ MOVE( OptionsNavigation, PREFSMAN->m_bArcadeOptionsNavigation ); static void WheelSpeed( int &sel, bool ToSel, const CStringArray &choices ) { - if( ToSel ) - { - sel = - (PREFSMAN->m_iMusicWheelSwitchSpeed <= 5)? 0: - (PREFSMAN->m_iMusicWheelSwitchSpeed <= 10)? 1: - (PREFSMAN->m_iMusicWheelSwitchSpeed <= 15)? 2:3; - } - else - { - int mapping[] = { 5, 10, 15, 25 }; - ASSERT( sel >= 0 && sel < 4 ); - PREFSMAN->m_iMusicWheelSwitchSpeed = mapping[sel]; - } + const int mapping[] = { 5, 10, 15, 25 }; + MoveMap( sel, PREFSMAN->m_iMusicWheelSwitchSpeed, ToSel, mapping, ARRAYSIZE(mapping) ); } /* Gameplay options */