simplify

stepmania/src/GameState.cpp

@@ -317,6 +317,9 @@ void GameState::EndGame()
 {
 	LOG->Trace( "GameState::EndGame" );
 
+	/* Finish the final stage. */
+	FinishStage();
+
 	// Update profile stats
 	int iPlaySeconds = max( 0, (int) m_timeGameStarted.PeekDeltaTime() );
 

stepmania/src/ScreenCredits.cpp

@@ -23,7 +23,6 @@
 #include "BitmapText.h"
 #include "ActorUtil.h"
 #include "SongUtil.h"
-#include "GameState.h"
 
 
 #define BACKGROUNDS_SPACING_X				THEME->GetMetricF("ScreenCredits","BackgroundsSpacingX")
@@ -170,9 +169,6 @@ static const CreditLine CREDIT_LINES[] =
 
 ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName )
 {
-	/* Make sure the last stage was finished. */
-	GAMESTATE->FinishStage();
-
 	vector<Song*> arraySongs;
 	SONGMAN->GetSongs( arraySongs );
 	SongUtil::SortSongPointerArrayByTitle( arraySongs );

stepmania/src/ScreenEnding.cpp

@@ -66,9 +66,6 @@ CString GetStatsLineValue( PlayerNumber pn, int iLine )
 
 ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, false/*dont reset GAMESTATE*/ )
 {
-	/* Make sure the last stage was finished. */
-	GAMESTATE->FinishStage();
-
 	vector<Song*> arraySongs;
 	SONGMAN->GetSongs( arraySongs );
 	SongUtil::SortSongPointerArrayByTitle( arraySongs );

stepmania/src/ScreenMusicScroll.cpp

@@ -19,7 +19,6 @@
 #include "AnnouncerManager.h"
 #include "song.h"
 #include "SongUtil.h"
-#include "GameState.h"
 
 
 #define SCROLL_DELAY		THEME->GetMetricF("ScreenMusicScroll","ScrollDelay")
@@ -36,9 +35,6 @@ const unsigned NUM_CREDIT_LINES = sizeof(CREDIT_LINES) / sizeof(CString);
 
 ScreenMusicScroll::ScreenMusicScroll( CString sClassName ) : ScreenAttract( sClassName )
 {
-	/* Make sure the last stage was finished. */
-	GAMESTATE->FinishStage();
-
 	vector<Song*> arraySongs;
 	SONGMAN->GetSongs( arraySongs );
 	SongUtil::SortSongPointerArrayByTitle( arraySongs );