merge PlayerMinus and Player back together

2005-01-15 01:03:48 +00:00
parent 0a6ac4092e
commit 8431430721
5 changed files with 37 additions and 86 deletions
@@ -1426,7 +1426,7 @@ void ScreenGameplay::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_SongFinished.IsTransitioning() && !m_NextSongOut.IsTransitioning() )
 			m_SongFinished.StartTransitioning( SM_NotesEnded );