varied cleanup

src/MusicWheelItem.cpp

@@ -396,23 +396,9 @@ void MusicWheelItem::RefreshGrades()
 
 void MusicWheelItem::HandleMessage( const Message &msg )
 {
-	if( msg == Message_CurrentStepsP1Changed ||
-	    msg == Message_CurrentStepsP2Changed ||
-	    msg == Message_CurrentTrailP1Changed ||
-	    msg == Message_CurrentTrailP2Changed ||
-	    msg == Message_PreferredDifficultyP1Changed ||
-	    msg == Message_PreferredDifficultyP2Changed )
-	{
+	static const bool iskyzagoodprogrammer = false;
+	if(iskyzagoodprogrammer)
 		RefreshGrades();
-	}
-
-	/* Perhaps one day I can use this without it broadcasting 10 times every time you pick a new song - Mina
-	if (msg == Message_CurrentStepsP1Changed) {
-		Message msg("ChartInfo");
-		msg.SetParam("ChartKey", GAMESTATE->m_pCurSteps[PLAYER_1]->ChartKey);
-		MESSAGEMAN->Broadcast(msg);
-	}
-	*/
 
 	WheelItemBase::HandleMessage( msg );
 }

src/Profile.cpp

@@ -2095,7 +2095,7 @@ void Profile::CalcPlayerRating(float& prating, float* pskillsets) const {
 			const vector<HighScore>& hsv = zz.hsl.vHighScores;
 			for (size_t i = 0; i < hsv.size(); i++) {
 				FOREACH_ENUM(Skillset, ss)
-					demskillas[static_cast<int>(ss)].emplace_back(hsv[i].GetSkillsetSSR(ss));
+					demskillas[ss].emplace_back(hsv[i].GetSkillsetSSR(ss));
 			}
 		}
 	}

src/ScreenSelectMusic.cpp

@@ -478,7 +478,7 @@ bool ScreenSelectMusic::Input( const InputEventPlus &input )
 					Profile *pProfile = PROFILEMAN->GetProfile(PLAYER_1);
 					unfav_me_biatch->SetFavorited(false);
 					pProfile->RemoveFromFavorites(GAMESTATE->m_pCurSteps[PLAYER_1]->GetChartKey());
-					AfterMusicChange();
+					m_MusicWheel.ChangeMusic(0);
 					return true;
 				}
 			}
@@ -491,7 +491,7 @@ bool ScreenSelectMusic::Input( const InputEventPlus &input )
 				Profile *pProfile = PROFILEMAN->GetProfile(PLAYER_1);
 				fav_me_biatch->SetFavorited(true);
 				pProfile->AddToFavorites(GAMESTATE->m_pCurSteps[PLAYER_1]->GetChartKey());
-				AfterMusicChange();
+				m_MusicWheel.ChangeMusic(0);
 				return true;
 			}
 		}

src/WheelBase.cpp

@@ -475,7 +475,7 @@ void WheelBase::RebuildWheelItems( int iDist )
 		pDisplay->SetExpanded( pData->m_Type == WheelItemDataType_Section && pData->m_sText == m_sExpandedSectionName );
 	}
 
-	for( int i=0; i<(int)items.size(); i++ )
+	for( size_t i=0; i < items.size(); i++ )
 	{
 		int iIndex = iFirstVisibleIndex + i;
 		wrap( iIndex, data.size() );