From 7038f473b85a8f8295a20fb81901a43b2eac4385 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 13 Jan 2005 09:57:26 +0000 Subject: [PATCH] in preferred, sort by group -> meter -> num steps --- stepmania/src/SongUtil.cpp | 10 +--------- stepmania/src/SongUtil.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index f1197f058d..b458ed44b0 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -97,14 +97,6 @@ static int GetSongSortDifficulty(const Song *pSong) return 1; } -void SongUtil::SortSongPointerArrayByDifficulty( vector &arraySongPointers ) -{ - for( unsigned i = 0; i < arraySongPointers.size(); ++i ) - song_sort_val[arraySongPointers[i]] = - ssprintf("%9i", GetSongSortDifficulty(arraySongPointers[i])); - stable_sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersBySortValueAscending ); -} - bool CompareSongPointersByBPM(const Song *pSong1, const Song *pSong2) { DisplayBpms bpms1, bpms2; @@ -189,7 +181,7 @@ static int CompareSongPointersByGroup(const Song *pSong1, const Song *pSong2) void SongUtil::SortSongPointerArrayByGroupAndDifficulty( vector &arraySongPointers ) { - SortSongPointerArrayByDifficulty( arraySongPointers ); + SortSongPointerArrayByMeter( arraySongPointers, DIFFICULTY_EASY ); stable_sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByGroup ); } diff --git a/stepmania/src/SongUtil.h b/stepmania/src/SongUtil.h index 31c1a3fe8f..c9378ec983 100644 --- a/stepmania/src/SongUtil.h +++ b/stepmania/src/SongUtil.h @@ -12,7 +12,6 @@ struct XNode; namespace SongUtil { CString MakeSortString( CString s ); - void SortSongPointerArrayByDifficulty( vector &arraySongPointers ); void SortSongPointerArrayByTitle( vector &arraySongPointers ); void SortSongPointerArrayByBPM( vector &arraySongPointers ); void SortSongPointerArrayByGrade( vector &arraySongPointers );