diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp index 838a04005e..34a3fecbee 100644 --- a/stepmania/src/ScreenSongOptions.cpp +++ b/stepmania/src/ScreenSongOptions.cpp @@ -37,7 +37,7 @@ OptionRowData g_SongOptionsLines[NUM_SONG_OPTIONS_LINES] = { { "Bat\nLives", 10, {"1","2","3","4","5","6","7","8","9","10"} }, { "Fail", 3, {"ARCADE","END OF SONG","OFF"} }, { "Assist", 2, {"OFF","TICK"} }, - { "Rate", 9, {"x0.7","x0.8","x0.9","x1.0","x1.1","x1.2","x1.3","x1.4","x1.5"} }, + { "Rate", 9, {"SLOW","NORMAL","FAST"} }, { "Auto\nAdjust", 2, {"OFF", "ON"} }, }; @@ -67,16 +67,9 @@ void ScreenSongOptions::ImportOptions() m_iSelectedOption[0][SO_ASSIST] = so.m_AssistType; m_iSelectedOption[0][SO_AUTOADJ] = so.m_AutoAdjust; - if( so.m_fMusicRate == 0.7f ) m_iSelectedOption[0][SO_RATE] = 0; - else if( so.m_fMusicRate == 0.8f ) m_iSelectedOption[0][SO_RATE] = 1; - else if( so.m_fMusicRate == 0.9f ) m_iSelectedOption[0][SO_RATE] = 2; - else if( so.m_fMusicRate == 1.0f ) m_iSelectedOption[0][SO_RATE] = 3; - else if( so.m_fMusicRate == 1.1f ) m_iSelectedOption[0][SO_RATE] = 4; - else if( so.m_fMusicRate == 1.2f ) m_iSelectedOption[0][SO_RATE] = 5; - else if( so.m_fMusicRate == 1.3f ) m_iSelectedOption[0][SO_RATE] = 6; - else if( so.m_fMusicRate == 1.4f ) m_iSelectedOption[0][SO_RATE] = 7; - else if( so.m_fMusicRate == 1.5f ) m_iSelectedOption[0][SO_RATE] = 8; - else m_iSelectedOption[0][SO_RATE] = 3; + if( so.m_fMusicRate == 0.80f ) m_iSelectedOption[0][SO_RATE] = 0; + else if( so.m_fMusicRate == 1.20f ) m_iSelectedOption[0][SO_RATE] = 2; + else m_iSelectedOption[0][SO_RATE] = 1; } void ScreenSongOptions::ExportOptions() @@ -92,15 +85,9 @@ void ScreenSongOptions::ExportOptions() switch( m_iSelectedOption[0][SO_RATE] ) { - case 0: so.m_fMusicRate = 0.7f; break; - case 1: so.m_fMusicRate = 0.8f; break; - case 2: so.m_fMusicRate = 0.9f; break; - case 3: so.m_fMusicRate = 1.0f; break; - case 4: so.m_fMusicRate = 1.1f; break; - case 5: so.m_fMusicRate = 1.2f; break; - case 6: so.m_fMusicRate = 1.3f; break; - case 7: so.m_fMusicRate = 1.4f; break; - case 8: so.m_fMusicRate = 1.5f; break; + case 0: so.m_fMusicRate = 0.80f; break; + case 1: so.m_fMusicRate = 1.00f; break; + case 2: so.m_fMusicRate = 1.20f; break; default: ASSERT( false ); } }