cleanup

stepmania/src/ScoreKeeperMAX2.h

@@ -14,7 +14,6 @@
 
 #include "ScoreKeeper.h"
 #include "NoteDataWithScoring.h"
-#include "GameState.h"
 class Steps;
 
 class ScoreKeeperMAX2: public ScoreKeeper

stepmania/src/ScreenCaution.cpp

@@ -15,7 +15,6 @@
 #include "PrefsManager.h"
 #include "ScreenManager.h"
 #include "AnnouncerManager.h"
-#include "GameState.h"
 #include "RageSounds.h"
 #include "ThemeManager.h"
 #include "LightsManager.h"

stepmania/src/ScreenCenterImage.cpp

@@ -18,7 +18,6 @@
 #include "RageLog.h"
 #include "InputMapper.h"
 #include "GameManager.h"
-#include "GameState.h"
 #include "RageSounds.h"
 #include "ThemeManager.h"
 #include "RageDisplay.h"

stepmania/src/ScreenCredits.cpp

@@ -16,7 +16,6 @@
 #include "RageSounds.h"
 #include "RageLog.h"
 #include "SongManager.h"
-#include "GameState.h"
 #include "ThemeManager.h"
 #include "AnnouncerManager.h"
 #include "Sprite.h"

stepmania/src/ScreenGameOver.cpp

@@ -13,7 +13,6 @@
 #include "ScreenGameOver.h"
 #include "ScreenManager.h"
 #include "AnnouncerManager.h"
-#include "GameState.h"
 #include "RageSounds.h"
 #include "ThemeManager.h"
 
@@ -27,10 +26,6 @@ const ScreenMessage SM_PlayAnnouncer	=	ScreenMessage(SM_User + 3);
 
 ScreenGameOver::ScreenGameOver( CString sName ) : Screen( sName )
 {
-	/* Don't reset; this isn't necessarily the last screen.  Let the attract
-	 * loop reset. */
-//	GAMESTATE->Reset();
-
 	m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenGameOver background") );
 	this->AddChild( &m_Background );
 

stepmania/src/ScreenRaveOptions.cpp

@@ -20,7 +20,6 @@
 #include "PrefsManager.h"
 #include "RageLog.h"
 #include "ThemeManager.h"
-#include "GameState.h"
 
 #define PREV_SCREEN			THEME->GetMetric ("ScreenRaveOptions","PrevScreen")
 #define NEXT_SCREEN			THEME->GetMetric ("ScreenRaveOptions","NextScreen")