From 94ea3cb9e05e928dd7c592958db3411a72af7add Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Sep 2005 00:30:46 +0000 Subject: [PATCH] cleanup --- stepmania/src/ActorUtil.cpp | 1 - stepmania/src/BGAnimationLayer.cpp | 2 +- stepmania/src/Game.cpp | 1 - stepmania/src/GameManager.cpp | 1 - stepmania/src/GameState.cpp | 1 - stepmania/src/InputQueue.cpp | 1 - stepmania/src/MusicWheel.h | 1 - stepmania/src/RageModelGeometry.cpp | 2 +- stepmania/src/ScreenGameplay.h | 1 - stepmania/src/ScreenNameEntry.h | 1 - stepmania/src/ScreenOptions.h | 1 - stepmania/src/ScreenSelectMode.h | 1 - stepmania/src/Song.cpp | 1 - stepmania/src/SongManager.cpp | 1 - stepmania/src/Style.cpp | 1 - 15 files changed, 2 insertions(+), 15 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index 3c350b5841..de4e9132e3 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -4,7 +4,6 @@ #include "BitmapText.h" #include "Model.h" #include "BGAnimation.h" -#include "IniFile.h" #include "ThemeManager.h" #include "RageFileManager.h" #include "RageLog.h" diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index c3292d6644..3bde91fed2 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "BGAnimationLayer.h" #include "GameState.h" -#include "IniFile.h" +#include "XmlFile.h" #include "RageMath.h" #include "RageLog.h" #include "song.h" diff --git a/stepmania/src/Game.cpp b/stepmania/src/Game.cpp index 9457b246fe..f427d87156 100644 --- a/stepmania/src/Game.cpp +++ b/stepmania/src/Game.cpp @@ -2,7 +2,6 @@ #include "Game.h" #include "RageLog.h" #include "RageUtil.h" -#include "IniFile.h" #include "Style.h" #include "RageException.h" #include "GameState.h" diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 7aca99d5b0..b2e9171d0d 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -4,7 +4,6 @@ #include "GameConstantsAndTypes.h" #include "GameState.h" #include "GameInput.h" // for GameButton constants -#include "IniFile.h" #include "RageLog.h" #include "RageUtil.h" #include "NoteSkinManager.h" diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index dc88409715..494a22808c 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1,6 +1,5 @@ #include "global.h" #include "GameState.h" -#include "IniFile.h" #include "GameManager.h" #include "PrefsManager.h" #include "InputMapper.h" diff --git a/stepmania/src/InputQueue.cpp b/stepmania/src/InputQueue.cpp index 85a4353d82..69af132b1e 100644 --- a/stepmania/src/InputQueue.cpp +++ b/stepmania/src/InputQueue.cpp @@ -1,6 +1,5 @@ #include "global.h" #include "InputQueue.h" -#include "IniFile.h" #include "GameManager.h" #include "RageException.h" #include "RageTimer.h" diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index 1d573dfef9..75da7829b1 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -6,7 +6,6 @@ #include "AutoActor.h" #include "ActorFrame.h" #include "RageSound.h" -#include "RandomSample.h" #include "GameConstantsAndTypes.h" #include "ScreenMessage.h" #include "ScoreDisplayNormal.h" diff --git a/stepmania/src/RageModelGeometry.cpp b/stepmania/src/RageModelGeometry.cpp index cf46b236d8..3ce25f0ab6 100644 --- a/stepmania/src/RageModelGeometry.cpp +++ b/stepmania/src/RageModelGeometry.cpp @@ -4,7 +4,7 @@ #include "RageFile.h" #include "RageMath.h" #include "RageDisplay.h" -#include "IniFile.h" // Added by Ym2413a, needed for code changes. +#include "IniFile.h" RageModelGeometry::RageModelGeometry () { diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index cb9de37154..9fd466afc2 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -7,7 +7,6 @@ #include "Sprite.h" #include "Transition.h" #include "BitmapText.h" -#include "RandomSample.h" #include "RageSound.h" #include "Background.h" #include "Foreground.h" diff --git a/stepmania/src/ScreenNameEntry.h b/stepmania/src/ScreenNameEntry.h index e6a10fc7d0..d486268cfe 100644 --- a/stepmania/src/ScreenNameEntry.h +++ b/stepmania/src/ScreenNameEntry.h @@ -6,7 +6,6 @@ #include "Screen.h" #include "BitmapText.h" #include "Transition.h" -#include "RandomSample.h" #include "ReceptorArrowRow.h" #include "MenuTimer.h" diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 8e35c945d8..8836dedec3 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -5,7 +5,6 @@ #include "ScreenWithMenuElements.h" #include "Sprite.h" -#include "RandomSample.h" #include "DualScrollBar.h" #include "ThemeMetric.h" #include "OptionRow.h" diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 35e765e0f7..3425fa881e 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -13,7 +13,6 @@ #include "GameConstantsAndTypes.h" #include "GameCommand.h" #include "BitmapText.h" -#include "RandomSample.h" #include "Character.h" /* Class Definition */ diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 974c4f1137..df7fc174c2 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -3,7 +3,6 @@ #include "Steps.h" #include "RageUtil.h" #include "RageLog.h" -#include "IniFile.h" #include "NoteData.h" #include "RageSoundReader_FileReader.h" #include "RageSurface_Load.h" diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 65c4ce6b9e..a71f115bcb 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1,6 +1,5 @@ #include "global.h" #include "SongManager.h" -#include "IniFile.h" #include "RageLog.h" #include "MsdFile.h" #include "NotesLoaderDWI.h" diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp index 9ae32b3bcd..4aed56bc17 100644 --- a/stepmania/src/Style.cpp +++ b/stepmania/src/Style.cpp @@ -17,7 +17,6 @@ #include "RageLog.h" #include "RageUtil.h" #include "Game.h" -#include "IniFile.h" #include "GameState.h" #include "NoteData.h" #include