SORT_GRADE fixes
This commit is contained in:
@@ -532,7 +532,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
|
|||||||
* so don't re-sort for them. */
|
* so don't re-sort for them. */
|
||||||
// /* We're using sections, so use the section name as the top-level
|
// /* We're using sections, so use the section name as the top-level
|
||||||
// * sort. */
|
// * sort. */
|
||||||
if( so != SORT_GRADE && so != SORT_BPM )
|
if( so != SORT_BPM )
|
||||||
SortSongPointerArrayBySectionName(arraySongs, so);
|
SortSongPointerArrayBySectionName(arraySongs, so);
|
||||||
|
|
||||||
// make WheelItemDatas with sections
|
// make WheelItemDatas with sections
|
||||||
|
|||||||
@@ -1438,12 +1438,12 @@ CString GetSectionNameFromSongAndSort( const Song* pSong, SongSortOrder so )
|
|||||||
return "";
|
return "";
|
||||||
case SORT_GRADE:
|
case SORT_GRADE:
|
||||||
{
|
{
|
||||||
for( int i=NUM_GRADES; i>GRADE_NO_DATA; i-- )
|
for( int i=GRADE_TIER_1; i<NUM_GRADES; ++i )
|
||||||
{
|
{
|
||||||
Grade g = (Grade)i;
|
Grade g = (Grade)i;
|
||||||
int iCount = pSong->GetNumNotesWithGrade( g );
|
int iCount = pSong->GetNumNotesWithGrade( g );
|
||||||
if( iCount > 0 )
|
if( iCount > 0 )
|
||||||
return ssprintf( "%4s x %d", GradeToString(g).c_str(), iCount );
|
return ssprintf( "%4s x %d", GradeToThemedString(g).c_str(), iCount );
|
||||||
}
|
}
|
||||||
return "NO DATA";
|
return "NO DATA";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user