From 09fee49676b19e1eb60e93bdd5a4116092dfa53e Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 7 Aug 2003 05:51:21 +0000
Subject: [PATCH] add song rates up to 2.0x (for debugging mostly)

---
 stepmania/src/ScreenOptions.h       |  4 ++--
 stepmania/src/ScreenSongOptions.cpp | 35 ++++++-----------------------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 304546c92f..2b596ee8e5 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -30,11 +30,11 @@ struct OptionRow
 	CString name;
 	vector<CString> choices;
 
-	OptionRow( CString n, CString c0="", CString c1="", CString c2="", CString c3="", CString c4="", CString c5="", CString c6="", CString c7="", CString c8="", CString c9="", CString c10="", CString c11="", CString c12="", CString c13="", CString c14="" )
+	OptionRow( CString n, CString c0="", CString c1="", CString c2="", CString c3="", CString c4="", CString c5="", CString c6="", CString c7="", CString c8="", CString c9="", CString c10="", CString c11="", CString c12="", CString c13="", CString c14="", CString c15="", CString c16="", CString c17="", CString c18="", CString c19="", CString c20="" )
 	{
 		name = n;
 #define PUSH( c )	if(c!="") choices.push_back(c);
-		PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);
+		PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);PUSH(c20);
 #undef PUSH
 	}
 };
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index f7df84fa98..02e8f859c1 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -39,7 +39,7 @@ OptionRow g_SongOptionsLines[NUM_SONG_OPTIONS_LINES] = {
 	OptionRow( "Bat\nLives",	"1","2","3","4","5","6","7","8","9","10" ),	
 	OptionRow( "Fail",			"ARCADE","END OF SONG","OFF" ),	
 	OptionRow( "Assist\nTick",	"OFF", "ON" ),
-	OptionRow( "Rate",			"x0.3","x0.5","x0.7","x0.8","x0.9","x1.0","x1.1","x1.2","x1.3","x1.4","x1.5" ),	
+	OptionRow( "Rate",			"x0.3","x0.4","x0.5","x0.6","x0.7","x0.8","x0.9","x1.0","x1.1","x1.2","x1.3","x1.4","x1.5","x1.6","x1.7","x1.8","x1.9","x2.0" ),	
 	OptionRow( "Auto\nAdjust",	"OFF", "ON" ),	
 };
 
@@ -79,18 +79,10 @@ void ScreenSongOptions::ImportOptions()
 	m_iSelectedOption[0][SO_ASSIST] = so.m_bAssistTick;
 	m_iSelectedOption[0][SO_AUTOSYNC] = so.m_bAutoSync;
 
-	if(		 so.m_fMusicRate == 0.3f )		m_iSelectedOption[0][SO_RATE] = 0;
-	if(		 so.m_fMusicRate == 0.5f )		m_iSelectedOption[0][SO_RATE] = 1;
-	if(		 so.m_fMusicRate == 0.7f )		m_iSelectedOption[0][SO_RATE] = 2;
-	else if( so.m_fMusicRate == 0.8f )		m_iSelectedOption[0][SO_RATE] = 3;
-	else if( so.m_fMusicRate == 0.9f )		m_iSelectedOption[0][SO_RATE] = 4;
-	else if( so.m_fMusicRate == 1.0f )		m_iSelectedOption[0][SO_RATE] = 5;
-	else if( so.m_fMusicRate == 1.1f )		m_iSelectedOption[0][SO_RATE] = 6;
-	else if( so.m_fMusicRate == 1.2f )		m_iSelectedOption[0][SO_RATE] = 7;
-	else if( so.m_fMusicRate == 1.3f )		m_iSelectedOption[0][SO_RATE] = 8;
-	else if( so.m_fMusicRate == 1.4f )		m_iSelectedOption[0][SO_RATE] = 9;
-	else if( so.m_fMusicRate == 1.5f )		m_iSelectedOption[0][SO_RATE] = 10;
-	else									m_iSelectedOption[0][SO_RATE] = 5;
+	m_iSelectedOption[0][SO_RATE] = 7;	// in case we don't match below
+	for( int i=0; i<g_SongOptionsLines[SO_RATE].choices.size(); i++ )
+		if( so.m_fMusicRate == atof(g_SongOptionsLines[SO_RATE].choices[i]) ) 
+			m_iSelectedOption[0][SO_RATE] = i;
 }
 
 void ScreenSongOptions::ExportOptions()
@@ -109,21 +101,8 @@ void ScreenSongOptions::ExportOptions()
 	so.m_bAssistTick = !!m_iSelectedOption[0][SO_ASSIST];
 	so.m_bAutoSync = !!m_iSelectedOption[0][SO_AUTOSYNC];
 
-	switch( m_iSelectedOption[0][SO_RATE] )
-	{
-	case 0:	so.m_fMusicRate = 0.3f;	break;
-	case 1:	so.m_fMusicRate = 0.5f;	break;
-	case 2:	so.m_fMusicRate = 0.7f;	break;
-	case 3:	so.m_fMusicRate = 0.8f;	break;
-	case 4:	so.m_fMusicRate = 0.9f;	break;
-	case 5:	so.m_fMusicRate = 1.0f;	break;
-	case 6:	so.m_fMusicRate = 1.1f;	break;
-	case 7:	so.m_fMusicRate = 1.2f;	break;
-	case 8:	so.m_fMusicRate = 1.3f;	break;
-	case 9:	so.m_fMusicRate = 1.4f;	break;
-	case 10:so.m_fMusicRate = 1.5f;	break;
-	default:	ASSERT( false );
-	}
+	int iSel = m_iSelectedOption[0][SO_RATE];
+	so.m_fMusicRate = atof( g_SongOptionsLines[SO_RATE].choices[iSel] );
 }
 
 void ScreenSongOptions::GoToPrevState()