merge PlayerMinus and Player back together

stepmania/src/ScreenGameplayMultiplayer.cpp

@@ -330,7 +330,6 @@ void ScreenGameplayMultiplayer::SetupSong( MultiPlayer p, int iSongIndex )
 			NULL, 
 			NULL, 
 			m_pPrimaryScoreKeeper[p], 
-			NULL, 
 			NULL );
 	}
 
@@ -486,7 +485,7 @@ void ScreenGameplayMultiplayer::Update( float fDeltaTime )
 	float fSecondsToStop = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( GAMESTATE->m_pCurSong->m_fLastBeat );
 
 	/* Make sure we keep going long enough to register a miss for the last note. */
-	fSecondsToStop += PlayerMinus::GetMaxStepDistanceSeconds();
+	fSecondsToStop += Player::GetMaxStepDistanceSeconds();
 
 	if( GAMESTATE->m_fMusicSeconds > fSecondsToStop && !m_Out.IsTransitioning() )
 		this->HandleScreenMessage( SM_NotesEnded );