From 36b61910bee62747e64e488e2d8baa84bd72d213 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 12 Dec 2003 03:54:26 +0000 Subject: [PATCH] cleanup, optimize --- stepmania/src/MusicWheel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index f5a04fa321..c6c2f38237 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -496,6 +496,7 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas // Build an array of WheelItemDatas from the sorted list of Song*'s /////////////////////////////////// arrayWheelItemDatas.clear(); // clear out the previous wheel items + arrayWheelItemDatas.reserve( arraySongs.size() ); if( PREFSMAN->m_MusicWheelUsesSections == PrefsManager::NEVER || (so != SORT_TITLE && PREFSMAN->m_MusicWheelUsesSections == PrefsManager::ABC_ONLY )) bUseSections = false; @@ -589,10 +590,9 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas default: ASSERT(0); break; } - // default sort order; other songs may alter this - SortCoursePointerArrayByDifficulty( apCourses ); - - if (PREFSMAN->m_iCourseSortOrder != PrefsManager::COURSE_SORT_SONGS) + if (PREFSMAN->m_iCourseSortOrder == PrefsManager::COURSE_SORT_SONGS) + SortCoursePointerArrayByDifficulty( apCourses ); + else { if (PREFSMAN->m_iCourseSortOrder == PrefsManager::COURSE_SORT_METER) SortCoursePointerArrayByAvgDifficulty( apCourses );