call SONGMAN->SortSongs; optimize pSong->GetSteps call

This commit is contained in:
Glenn Maynard
2004-02-27 21:29:31 +00:00
parent 8c8a5f8460
commit e0e5d0ca29
+7 -2
View File
@@ -187,7 +187,12 @@ void MusicWheel::Load()
} }
/* Update for SORT_MOST_PLAYED. */ /* Update for SORT_MOST_PLAYED. */
SONGMAN->UpdateBestAndShuffled(); SONGMAN->UpdateBest();
/* Sort SONGMAN's songs by CompareSongPointersByTitle, so we can do other sorts (with
* stable_sort) from its output, and title will be the secondary sort, without having
* to re-sort by title each time. */
SONGMAN->SortSongs();
RageTimer timer; RageTimer timer;
CString times; CString times;
@@ -375,7 +380,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SongSortOrder so, CStrin
continue; continue;
vector<Steps*> arraySteps; vector<Steps*> arraySteps;
pSong->GetSteps( arraySteps, GAMESTATE->GetCurrentStyleDef()->m_StepsType, DIFFICULTY_INVALID, -1, -1, "" ); pSong->GetSteps( arraySteps, GAMESTATE->GetCurrentStyleDef()->m_StepsType, DIFFICULTY_INVALID, -1, -1, "", 1 );
if( !arraySteps.empty() ) if( !arraySteps.empty() )
arraySongs.push_back( pSong ); arraySongs.push_back( pSong );