various changes from sm4 and sm-ssc (svn); see updated changelog for the full information

src/MusicWheel.cpp

@@ -365,6 +365,7 @@ void MusicWheel::GetSongList( vector<Song*> &arraySongs, SortOrder so )
 		if( (so!=SORT_ROULETTE || !RANDOM_PICKS_LOCKED_SONGS) && iLocked )
 			continue;
 
+
 		if( PREFSMAN->m_bOnlyPreferredDifficulties )
 		{
 			// if the song has steps that fit the preferred difficulty of the default player
@@ -378,6 +379,7 @@ void MusicWheel::GetSongList( vector<Song*> &arraySongs, SortOrder so )
 				arraySongs.push_back( pSong );
 		}
 
+
 	}
 
 	/* Hack: Add extra stage item if it was eliminated for any reason (eg. it's a long
@@ -437,7 +439,7 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 			// Make an array of Song*, then sort them
 			vector<Song*> arraySongs;
 
-			GetSongList(arraySongs, so);
+			GetSongList( arraySongs, so );
 
 			bool bUseSections = true;