fix stopping before the last note can be missed, especially in course modes

stepmania/src/Player.h

@@ -58,6 +58,8 @@ public:
 	void SetCharacterState(int iDCState) { m_iDCState = iDCState; };
 	void ApplyWaitingTransforms();
 
+	static float GetMaxStepDistanceSeconds();
+
 protected:
 	void UpdateTapNotesMissedOlderThan( float fMissIfOlderThanThisBeat );
 	void OnRowCompletelyJudged( int iStepIndex );
@@ -70,8 +72,6 @@ protected:
 	int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection ) const;
 	int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind ) const;
 
-	static float GetMaxStepDistanceSeconds();
-
 	PlayerNumber	m_PlayerNumber;
 	float			m_fNoteFieldHeight;
 

stepmania/src/ScreenGameplay.cpp

@@ -89,7 +89,7 @@ const ScreenMessage	SM_StopHereWeGo			= ScreenMessage(SM_User+41);
 
 ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen(sName)
 {
-        m_bDemonstration = bDemonstration;
+	m_bDemonstration = bDemonstration;
 	Init(); // work around horrible gcc bug 3187
 }
 
@@ -1226,6 +1226,10 @@ void ScreenGameplay::Update( float fDeltaTime )
 		// Check for end of song
 		//
 		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();
+
 		if( GAMESTATE->m_fMusicSeconds > fSecondsToStop && !m_SongFinished.IsTransitioning() && !m_NextSongOut.IsTransitioning() )
 			m_SongFinished.StartTransitioning( SM_NotesEnded );