From c56123b228c3b592b5630e41679e95943fd5d629 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Sep 2005 04:16:48 +0000 Subject: [PATCH] cleanup --- stepmania/src/MusicWheel.cpp | 12 ++++++------ stepmania/src/MusicWheel.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 16e73425da..cd53c50675 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -553,11 +553,10 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas // Sorting twice isn't necessary. Instead, modify the compatator functions // in Song.cpp to have the desired effect. -Chris /* Keeping groups together with the sorts is tricky and brittle; we - * keep getting OTHER split up without this. However, it puts the - * Grade and BPM sorts in the wrong order, and they're already correct, - * so don't re-sort for them. */ - // /* We're using sections, so use the section name as the top-level - // * sort. */ + * keep getting OTHER split up without this. However, it puts the + * Grade and BPM sorts in the wrong order, and they're already correct, + * so don't re-sort for them. */ + /* We're using sections, so use the section name as the top-level sort. */ if( so != SORT_TOP_GRADES && so != SORT_BPM ) SongUtil::SortSongPointerArrayBySectionName(arraySongs, so); @@ -569,8 +568,9 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas Song* pSong = arraySongs[i]; CString sThisSection = SongUtil::GetSectionNameFromSongAndSort( pSong, so ); - if( sThisSection != sLastSection) // new section, make a section item + if( sThisSection != sLastSection ) { + // new section, make a section item RageColor colorSection = (so==SORT_GROUP) ? SONGMAN->GetSongGroupColor(pSong->m_sGroupName) : SECTION_COLORS.GetValue(iSectionColorIndex); iSectionColorIndex = (iSectionColorIndex+1) % NUM_SECTION_COLORS; arrayWheelItemDatas.push_back( WheelItemData(TYPE_SECTION, NULL, sThisSection, NULL, colorSection) ); diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index 75da7829b1..b61e430f33 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -1,7 +1,7 @@ /* MusicWheel - A wheel with song names used in the Select Music screen. */ -#ifndef MUSICWHEEL_H -#define MUSICWHEEL_H +#ifndef MUSIC_WHEEL_H +#define MUSIC_WHEEL_H #include "AutoActor.h" #include "ActorFrame.h"