add pref LockWheelAfterRandom

stepmania/src/MusicWheel.cpp

@@ -1272,6 +1272,8 @@ void MusicWheel::StartRoulette()
 }
 
 void MusicWheel::StartRandom()
+{
+	if( PREFSMAN->m_bLockWheelAfterRandom )
 	{
 		/* Shuffle the roulette wheel. */
 		RandomGen rnd;
@@ -1288,6 +1290,16 @@ void MusicWheel::StartRandom()
 		this->Select();
 		RebuildMusicWheelItems();
 	}
+	else
+	{
+		m_iSelection = rand() % m_CurWheelItemData.size();
+		m_fPositionOffsetFromSelection = 0;
+		m_WheelState = STATE_SELECTING_MUSIC;
+		m_soundStart.Play();
+		SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
+		RebuildMusicWheelItems();
+	}
+}
 
 void MusicWheel::SetOpenGroup(CString group, SongSortOrder so)
 {

stepmania/src/PrefsManager.cpp

@@ -213,6 +213,7 @@ PrefsManager::PrefsManager()
 
 	m_iAttractSoundFrequency = 1;
 	m_bAllowExtraStage = true;
+	m_bLockWheelAfterRandom = true;
 	m_fPadStickSeconds = 0;
 	g_bAutoRestart = false;
 	m_bSignProfileData = false;
@@ -491,6 +492,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
 	ini.GetValue( "Options", "CenterImageScaleY",				m_fCenterImageScaleY );
 	ini.GetValue( "Options", "AttractSoundFrequency",			m_iAttractSoundFrequency );
 	ini.GetValue( "Options", "AllowExtraStage",					m_bAllowExtraStage );
+	ini.GetValue( "Options", "LockWheelAfterRandom",			m_bLockWheelAfterRandom );
 	ini.GetValue( "Options", "PadStickSeconds",					m_fPadStickSeconds );
 	ini.GetValue( "Options", "AutoRestart",						g_bAutoRestart );
 	ini.GetValue( "Options", "SignProfileData",					m_bSignProfileData );
@@ -703,6 +705,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
 	ini.SetValue( "Options", "CenterImageScaleY",				m_fCenterImageScaleY );
 	ini.SetValue( "Options", "AttractSoundFrequency",			m_iAttractSoundFrequency );
 	ini.SetValue( "Options", "AllowExtraStage",					m_bAllowExtraStage );
+	ini.SetValue( "Options", "LockWheelAfterRandom",			m_bLockWheelAfterRandom );
 	ini.SetValue( "Options", "PadStickSeconds",					m_fPadStickSeconds );
 	ini.SetValue( "Options", "AutoRestart",						g_bAutoRestart );
 	ini.SetValue( "Options", "SignProfileData",					m_bSignProfileData );

stepmania/src/PrefsManager.h

@@ -188,6 +188,7 @@ public:
 	float			m_fCenterImageScaleY;
 	int				m_iAttractSoundFrequency;	// 0 = never, 1 = every time
 	bool			m_bAllowExtraStage;
+	bool			m_bLockWheelAfterRandom;
 
 	// Number of seconds it takes for a button on the controller to release
 	// after pressed.