Combo cleanup

stepmania/src/Player.cpp

@@ -152,6 +152,9 @@ void Player::Init(
 	m_soundMine.SetParams( p );
 	m_soundAttackLaunch.SetParams( p );
 	m_soundAttackEnding.SetParams( p );
+
+	m_Combo.SetName( "Combo" );
+	m_Combo.Load( pn );
 }
 
 void Player::Load( const NoteData& noteData )
@@ -178,8 +181,6 @@ void Player::Load( const NoteData& noteData )
 	 * then we could just this->StopTweening()? -glenn */
 	m_Judgment.StopTweening();
 //	m_Combo.Reset();				// don't reset combos between songs in a course!
-	m_Combo.SetName( "Combo" );
-	m_Combo.Init( pn );
 	if( m_pPlayerStageStats )
 		m_Combo.SetCombo( m_pPlayerStageStats->iCurCombo, m_pPlayerStageStats->iCurMissCombo );	// combo can persist between songs and games
 	m_AttackDisplay.Init( m_pPlayerState );