From 71b318b14638642825a2932dab049b872cb86d11 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 22 Dec 2003 23:35:02 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScoreKeeperMAX2.h | 1 - stepmania/src/ScreenCaution.cpp | 1 - stepmania/src/ScreenCenterImage.cpp | 1 - stepmania/src/ScreenCredits.cpp | 1 - stepmania/src/ScreenGameOver.cpp | 5 ----- stepmania/src/ScreenRaveOptions.cpp | 1 - 6 files changed, 10 deletions(-) diff --git a/stepmania/src/ScoreKeeperMAX2.h b/stepmania/src/ScoreKeeperMAX2.h index 86ed58fdd7..a104bb9566 100644 --- a/stepmania/src/ScoreKeeperMAX2.h +++ b/stepmania/src/ScoreKeeperMAX2.h @@ -14,7 +14,6 @@ #include "ScoreKeeper.h" #include "NoteDataWithScoring.h" -#include "GameState.h" class Steps; class ScoreKeeperMAX2: public ScoreKeeper diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp index 7abeee49d7..d52be3db13 100644 --- a/stepmania/src/ScreenCaution.cpp +++ b/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" diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp index 5f0f5841e3..2000ba16b5 100644 --- a/stepmania/src/ScreenCenterImage.cpp +++ b/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" diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 37e5888b61..ab117dc3b5 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/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" diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp index d57887b1c4..22884c0498 100644 --- a/stepmania/src/ScreenGameOver.cpp +++ b/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 ); diff --git a/stepmania/src/ScreenRaveOptions.cpp b/stepmania/src/ScreenRaveOptions.cpp index 1eaae6d241..f55a036300 100644 --- a/stepmania/src/ScreenRaveOptions.cpp +++ b/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")