From fc544bb7d97062b04d9dbec8d3cd6e04b6a011fe Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 7 Mar 2004 00:22:03 +0000
Subject: [PATCH] simplify

---
 stepmania/src/MusicWheel.cpp | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index ab0c4fa12e..b0154ad776 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -354,7 +354,10 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SongSortOrder so, CStrin
 //		SONGMAN->GetSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );	
 //	else
 //		SONGMAN->GetSongs( apAllSongs, GAMESTATE->GetNumStagesLeft() );
-	SONGMAN->GetSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );	
+	if( so == SORT_MOST_PLAYED )
+		SONGMAN->GetBestSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );
+	else
+		SONGMAN->GetSongs( apAllSongs, GAMESTATE->m_sPreferredGroup, GAMESTATE->GetNumStagesLeft() );	
 
 	// copy only songs that have at least one Steps for the current GameMode
 	for( unsigned i=0; i<apAllSongs.size(); i++ )
@@ -483,27 +486,10 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			SortSongPointerArrayByBPM( arraySongs );
 			break;
 		case SORT_MOST_PLAYED:
-			{
-			arraySongs.clear();
-
-			const vector<Song*> arrayAllSongs = SONGMAN->GetBestSongs();
-
-			const unsigned SongsToShow = MOST_PLAYED_SONGS_TO_SHOW;
-			for ( i=0; arraySongs.size() < SongsToShow && i < arrayAllSongs.size(); i++ )
-			{
-				// weed out songs that require more songs than are available
-				Song *pSong = arrayAllSongs[i];
-				if( SONGMAN->GetNumStagesForSong(pSong) > GAMESTATE->GetNumStagesLeft() )
-					continue;
-				if( UNLOCKMAN->SongIsLocked(pSong) )
-					continue;
-
-				arraySongs.push_back( pSong );
-			}
-
+			if( (int) arraySongs.size() > MOST_PLAYED_SONGS_TO_SHOW )
+				arraySongs.erase( arraySongs.begin()+MOST_PLAYED_SONGS_TO_SHOW, arraySongs.end() );
 			bUseSections = false;
 			break;
-			}
 		case SORT_GRADE:
 			SortSongPointerArrayByGrade( arraySongs );
 			break;