actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetic changes:

Browse Source 
merge an if and a switch that test the same thing
embellish a LOG line

R=steve
This commit is contained in:
John Bauer
2006-10-22 13:36:59 +00:00
parent 5242ac7708
commit e28f5f5ce8
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+5 -9
View File
@@ -115,7 +115,7 @@ void MusicWheel::Load( RString sType )
BuildWheelItemDatas( m_WheelItemDatas[so], so ); BuildWheelItemDatas( m_WheelItemDatas[so], so );
times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() ); times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() );
} }
LOG->Trace( "took: %s", times.c_str() ); LOG->Trace( "MusicWheel sorting took: %s", times.c_str() );
/* Set m_LastModeMenuItem to the first item that matches the current mode. (Do this /* Set m_LastModeMenuItem to the first item that matches the current mode. (Do this
* after building wheel item data.) */ * after building wheel item data.) */
@@ -604,14 +604,11 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
SONGMAN->GetCourses( *ct, apCourses, PREFSMAN->m_bAutogenGroupCourses ); SONGMAN->GetCourses( *ct, apCourses, PREFSMAN->m_bAutogenGroupCourses );
} }
if( PREFSMAN->m_CourseSortOrder == COURSE_SORT_SONGS )
{
CourseUtil::SortCoursePointerArrayByDifficulty( apCourses );
}
else
{
switch( PREFSMAN->m_CourseSortOrder ) switch( PREFSMAN->m_CourseSortOrder )
{ {
case COURSE_SORT_SONGS:
CourseUtil::SortCoursePointerArrayByDifficulty( apCourses );
break;
case COURSE_SORT_PREFERRED: case COURSE_SORT_PREFERRED:
break; break;
case COURSE_SORT_METER: case COURSE_SORT_METER:
@@ -627,9 +624,8 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
} }
// since we can't agree, make it an option // since we can't agree, make it an option
if( g_bMoveRandomToEnd ) if( PREFSMAN->m_CourseSortOrder != COURSE_SORT_SONGS && g_bMoveRandomToEnd )
CourseUtil::MoveRandomToEnd( apCourses ); CourseUtil::MoveRandomToEnd( apCourses );
}
if( so == SORT_ALL_COURSES ) if( so == SORT_ALL_COURSES )
CourseUtil::SortCoursePointerArrayByType( apCourses ); CourseUtil::SortCoursePointerArrayByType( apCourses );