From 3f93a76b2188ed5436bdcde66b6d26bb744a4ddb Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 24 Oct 2005 07:37:38 +0000 Subject: [PATCH] Header cleanup. --- stepmania/src/Course.h | 1 + stepmania/src/PlayerNumber.h | 8 +++++--- stepmania/src/song.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h index 63c22df952..07892eb7da 100644 --- a/stepmania/src/Course.h +++ b/stepmania/src/Course.h @@ -10,6 +10,7 @@ #include "Trail.h" #include #include "EnumHelper.h" +#include "RageTypes.h" struct PlayerOptions; struct SongOptions; diff --git a/stepmania/src/PlayerNumber.h b/stepmania/src/PlayerNumber.h index 34466ddd08..d295b2dc22 100644 --- a/stepmania/src/PlayerNumber.h +++ b/stepmania/src/PlayerNumber.h @@ -3,14 +3,15 @@ #ifndef PlayerNumber_H #define PlayerNumber_H -#include "RageTypes.h" // for RageColor +//#include "RageTypes.h" // for RageColor #include "EnumHelper.h" // // Player number stuff // -enum PlayerNumber { +enum PlayerNumber +{ PLAYER_1 = 0, PLAYER_2, NUM_PLAYERS, // leave this at the end @@ -32,7 +33,8 @@ PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn ); const PlayerNumber OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 }; -enum MultiPlayer { +enum MultiPlayer +{ MultiPlayer_1 = 0, MultiPlayer_2, MultiPlayer_3, diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 75ca396294..454f516c5b 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -7,6 +7,7 @@ #include "Difficulty.h" #include "EnumHelper.h" #include "RageUtil_AutoPtr.h" +#include "RageTypes.h" class Steps; class Style;