From 1ccb50ac5522ba2d347a703e78eb287b4cca7831 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 Jan 2005 19:36:39 +0000 Subject: [PATCH] include cleanup (not much of a win) --- stepmania/src/ConditionalBGA.h | 1 + stepmania/src/DifficultyDisplay.h | 1 + stepmania/src/DifficultyIcon.h | 1 + stepmania/src/DifficultyMeter.h | 1 + stepmania/src/GameCommand.h | 1 + stepmania/src/GameConstantsAndTypes.h | 1 - stepmania/src/GameState.h | 1 + stepmania/src/GrooveGraph.h | 1 + stepmania/src/JukeboxMenu.h | 1 + stepmania/src/ScreenRanking.h | 1 + stepmania/src/SongManager.h | 1 + stepmania/src/SongUtil.h | 1 + stepmania/src/Steps.h | 1 + stepmania/src/StepsUtil.h | 1 + stepmania/src/Trail.h | 1 + stepmania/src/TrailUtil.h | 1 + stepmania/src/song.h | 1 + 17 files changed, 16 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ConditionalBGA.h b/stepmania/src/ConditionalBGA.h index 89acfca8bb..5dc6611e0e 100644 --- a/stepmania/src/ConditionalBGA.h +++ b/stepmania/src/ConditionalBGA.h @@ -4,6 +4,7 @@ #include "PlayerOptions.h" #include "GameConstantsAndTypes.h" #include "BGAnimation.h" +#include "Difficulty.h" class Style; diff --git a/stepmania/src/DifficultyDisplay.h b/stepmania/src/DifficultyDisplay.h index 4e92c69f28..a0ea311bcb 100644 --- a/stepmania/src/DifficultyDisplay.h +++ b/stepmania/src/DifficultyDisplay.h @@ -4,6 +4,7 @@ #include "GameConstantsAndTypes.h" #include "Sprite.h" #include "ActorFrame.h" +#include "Difficulty.h" class Song; diff --git a/stepmania/src/DifficultyIcon.h b/stepmania/src/DifficultyIcon.h index dc24f567a4..c26f14da80 100644 --- a/stepmania/src/DifficultyIcon.h +++ b/stepmania/src/DifficultyIcon.h @@ -6,6 +6,7 @@ #include "Sprite.h" #include "PlayerNumber.h" #include "GameConstantsAndTypes.h" +#include "Difficulty.h" class Steps; class Trail; diff --git a/stepmania/src/DifficultyMeter.h b/stepmania/src/DifficultyMeter.h index 6bb634a560..f7d40da8df 100644 --- a/stepmania/src/DifficultyMeter.h +++ b/stepmania/src/DifficultyMeter.h @@ -8,6 +8,7 @@ #include "ActorFrame.h" #include "GameConstantsAndTypes.h" #include "ActorUtil.h" +#include "Difficulty.h" class Steps; class Trail; diff --git a/stepmania/src/GameCommand.h b/stepmania/src/GameCommand.h index 6ddea90e6e..17d05e9bc8 100644 --- a/stepmania/src/GameCommand.h +++ b/stepmania/src/GameCommand.h @@ -5,6 +5,7 @@ #include "GameConstantsAndTypes.h" #include "PlayerNumber.h" +#include "Difficulty.h" #include class Song; diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 047bd52d23..96eecab589 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -4,7 +4,6 @@ #define GAME_CONSTANTS_AND_TYPES_H #include "PlayerNumber.h" // TODO: Get rid of this dependency. -Chris -#include "Difficulty.h" // TODO: Get rid of this dependency. #include "EnumHelper.h" diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 408e341ba0..56a8d9885a 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -8,6 +8,7 @@ #include "Grade.h" #include "Attack.h" #include "RageTimer.h" +#include "Difficulty.h" #include #include diff --git a/stepmania/src/GrooveGraph.h b/stepmania/src/GrooveGraph.h index 95a9f4fc10..8d82e99bbc 100644 --- a/stepmania/src/GrooveGraph.h +++ b/stepmania/src/GrooveGraph.h @@ -6,6 +6,7 @@ #include "ActorFrame.h" #include "Sprite.h" #include "GameConstantsAndTypes.h" +#include "Difficulty.h" class Song; diff --git a/stepmania/src/JukeboxMenu.h b/stepmania/src/JukeboxMenu.h index beb0ae061b..005ee71736 100644 --- a/stepmania/src/JukeboxMenu.h +++ b/stepmania/src/JukeboxMenu.h @@ -8,6 +8,7 @@ #include "GameConstantsAndTypes.h" #include "RandomSample.h" #include "BitmapText.h" +#include "Difficulty.h" class Style; diff --git a/stepmania/src/ScreenRanking.h b/stepmania/src/ScreenRanking.h index f77b4e5b02..5d2ba0b301 100644 --- a/stepmania/src/ScreenRanking.h +++ b/stepmania/src/ScreenRanking.h @@ -8,6 +8,7 @@ #include "Banner.h" #include "ListDisplay.h" #include "ActorUtil.h" +#include "Difficulty.h" class Course; class Song; diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index b8e3b352bb..d6a8662f6a 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -15,6 +15,7 @@ struct PlayerOptions; #include "SongOptions.h" #include "PlayerOptions.h" #include "PlayerNumber.h" +#include "Difficulty.h" class SongManager { diff --git a/stepmania/src/SongUtil.h b/stepmania/src/SongUtil.h index c9378ec983..5025a3803c 100644 --- a/stepmania/src/SongUtil.h +++ b/stepmania/src/SongUtil.h @@ -4,6 +4,7 @@ #define SONG_UTIL_H #include "GameConstantsAndTypes.h" +#include "Difficulty.h" class Song; class Profile; diff --git a/stepmania/src/Steps.h b/stepmania/src/Steps.h index bbe5543b06..de0fc210cb 100644 --- a/stepmania/src/Steps.h +++ b/stepmania/src/Steps.h @@ -7,6 +7,7 @@ #include "PlayerNumber.h" #include "Grade.h" #include "RadarValues.h" +#include "Difficulty.h" class NoteData; class Profile; diff --git a/stepmania/src/StepsUtil.h b/stepmania/src/StepsUtil.h index 1ea2836470..d59e76a5cf 100644 --- a/stepmania/src/StepsUtil.h +++ b/stepmania/src/StepsUtil.h @@ -2,6 +2,7 @@ #define STEPSUTIL_H #include "GameConstantsAndTypes.h" +#include "Difficulty.h" class Steps; class Song; diff --git a/stepmania/src/Trail.h b/stepmania/src/Trail.h index 8e76ca84c5..2b0fc669d6 100644 --- a/stepmania/src/Trail.h +++ b/stepmania/src/Trail.h @@ -5,6 +5,7 @@ #include "Attack.h" #include "RadarValues.h" +#include "Difficulty.h" class Song; class Steps; diff --git a/stepmania/src/TrailUtil.h b/stepmania/src/TrailUtil.h index 5131a1a34e..85ebaa1d85 100644 --- a/stepmania/src/TrailUtil.h +++ b/stepmania/src/TrailUtil.h @@ -2,6 +2,7 @@ #define TRAIL_UTIL_H #include "GameConstantsAndTypes.h" +#include "Difficulty.h" class Song; class Trail; diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 51dccda1d5..6646980239 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -7,6 +7,7 @@ #include "GameConstantsAndTypes.h" #include "Grade.h" #include "TimingData.h" +#include "Difficulty.h" class Steps; class Style;