bpm cycle code cleaned up

stepmania/Themes/default/metrics.ini

@@ -2583,9 +2583,7 @@ SetRandomCommand=diffusetopedge,color("#fb9c57");diffusebottomedge,color("#fb575
 SetExtraCommand=diffusetopedge,color("#fb5757");diffusebottomedge,color("#9c4242")
 Cycle=true
 NoBpmText="000"
-
+RandomCycleSpeed=0.2
--- Options: vslow, slow, default, fast, vfast, hyper
-RandomCycleSpeed=default
 
 Separator="-"
 ShowQMarksInRandomCycle=true

stepmania/src/BPMDisplay.cpp

@@ -158,20 +158,10 @@ void BPMDisplay::CycleRandomly()
 
 	RunCommands( SET_RANDOM_COMMAND );
 
-	RString sValue = RANDOM_CYCLE_SPEED;
+	m_fCycleTime = (float)RANDOM_CYCLE_SPEED;
-	sValue.MakeLower();
 
-	if( stricmp(sValue, "vslow") == 0 )
+	// Go to default value in event of a negative value in the metrics
-		m_fCycleTime = 1.0f;
+	if( m_fCycleTime < 0 )
-	else if( stricmp(sValue, "slow") == 0 )
-		m_fCycleTime = 0.5f;
-	else if( stricmp(sValue, "fast") == 0 )
-		m_fCycleTime = 0.1f;
-	else if( stricmp(sValue, "vfast") == 0 )
-		m_fCycleTime = 0.05f;
-	else if( stricmp(sValue, "hyper") == 0 )
-		m_fCycleTime = 0.01f;
-	else
 		m_fCycleTime = 0.2f;
 }
 

stepmania/src/BPMDisplay.h

@@ -42,7 +42,7 @@ protected:
 	ThemeMetric<apActorCommands> SET_EXTRA_COMMAND;
 	ThemeMetric<bool> CYCLE;
 	ThemeMetric<bool> SHOW_QMARKS;
-	ThemeMetric<RString> RANDOM_CYCLE_SPEED;
+	ThemeMetric<float> RANDOM_CYCLE_SPEED;
 	ThemeMetric<RString> SEPARATOR;
 	ThemeMetric<RString> NO_BPM_TEXT;