header cleanup

stepmania/src/Actor.cpp

@@ -3,7 +3,6 @@
 #include "RageDisplay.h"
 #include "RageUtil.h"
 #include "RageMath.h"
-#include "GameConstantsAndTypes.h"
 #include "RageLog.h"
 #include "arch/Dialog/Dialog.h"
 #include "Foreach.h"

stepmania/src/BitmapText.cpp

@@ -6,7 +6,6 @@
 #include "RageTimer.h"
 #include "RageDisplay.h"
 #include "ThemeManager.h"
-#include "GameConstantsAndTypes.h"
 #include "Font.h"
 #include "ActorUtil.h"
 #include "LuaBinding.h"

stepmania/src/InputEventPlus.h

@@ -6,6 +6,7 @@
 #include "InputFilter.h"
 #include "GameInput.h"
 #include "MenuInput.h"
+#include "PlayerNumber.h"
 
 class InputEventPlus
 {

stepmania/src/InputMapper.h

@@ -6,7 +6,7 @@
 #include "RageInputDevice.h"
 #include "GameInput.h"
 #include "MenuInput.h"
-#include "GameConstantsAndTypes.h"
+#include "PlayerNumber.h"
 
 const int NUM_GAME_TO_DEVICE_SLOTS	= 5;	// five device inputs may map to one game input
 const int NUM_SHOWN_GAME_TO_DEVICE_SLOTS = 3;

stepmania/src/InputQueue.h

@@ -3,7 +3,6 @@
 #ifndef INPUT_QUEUE_H
 #define INPUT_QUEUE_H
 
-#include "GameConstantsAndTypes.h"
 #include "GameInput.h"
 
 const unsigned MAX_INPUT_QUEUE_LENGTH = 16;

stepmania/src/MenuTimer.cpp

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "MenuTimer.h"
 #include "RageUtil.h"
-#include "GameConstantsAndTypes.h"
 #include "ScreenManager.h"
 #include "AnnouncerManager.h"
 #include "ThemeManager.h"

stepmania/src/OptionsCursor.cpp

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "OptionsCursor.h"
 #include "RageUtil.h"
-#include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 
 

stepmania/src/ScreenAttract.cpp

@@ -1,7 +1,6 @@
 #include "global.h"
 #include "ScreenAttract.h"
 #include "ScreenManager.h"
-#include "GameConstantsAndTypes.h"
 #include "RageUtil.h"
 #include "StepMania.h"
 #include "PrefsManager.h"

stepmania/src/ScreenMapControllers.cpp

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "ScreenMapControllers.h"
-#include "GameConstantsAndTypes.h"
 #include "ScreenManager.h"
 #include "RageLog.h"
 #include "RageInput.h"

stepmania/src/ScrollBar.cpp

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "ScrollBar.h"
-#include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 #include "RageUtil.h"