cleanup

stepmania/src/GameConstantsAndTypes.cpp

@@ -13,7 +13,6 @@
 #include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 
-
 #define COLOR_P1		THEME->GetMetricC("Common","ColorP1")
 #define COLOR_P2		THEME->GetMetricC("Common","ColorP2")
 #define COLOR_EASY		THEME->GetMetricC("Common","ColorEasy")
@@ -68,36 +67,3 @@ D3DXCOLOR PlayerToColor( int p )
 { 
 	return PlayerToColor( (PlayerNumber)p ); 
 }
-
-
-
-/*  This was a dumb idea.  I'm change Style so that it knows what game it belongs to.
-
-Game StyleToGame( Style s )
-{
-	switch( s )
-	{
-	case STYLE_DANCE_SINGLE:
-	case STYLE_DANCE_VERSUS:
-	case STYLE_DANCE_DOUBLE:
-	case STYLE_DANCE_COUPLE:
-	case STYLE_DANCE_SOLO:
-		return GAME_DANCE;
-	case STYLE_PUMP_SINGLE:
-	case STYLE_PUMP_VERSUS:
-	case STYLE_PUMP_DOUBLE:
-		return GAME_PUMP;
-	case STYLE_EZ2_SINGLE:
-	case STYLE_EZ2_SINGLE_HARD:
-	case STYLE_EZ2_DOUBLE:
-	case STYLE_EZ2_REAL:
-	case STYLE_EZ2_SINGLE_VERSUS:
-	case STYLE_EZ2_SINGLE_HARD_VERSUS:
-	case STYLE_EZ2_REAL_VERSUS:
-		return GAME_EZ2;
-	default:
-		ASSERT(0);	// invalid Style
-		return GAME_DANCE;
-	}
-}
-*/

stepmania/src/Grade.h

@@ -10,17 +10,14 @@
 */
 
 
-#ifndef _Grade_H_
+#ifndef GRADE_H
-#define _Grade_H_
+#define GRADE_H
 
-
+enum Grade { GRADE_NO_DATA=0,
-
+			GRADE_E, GRADE_D, GRADE_C, GRADE_B, GRADE_A,
-
+			GRADE_AA,GRADE_AAA };
-enum Grade { GRADE_NO_DATA=0, GRADE_E, GRADE_D, GRADE_C, GRADE_B, GRADE_A, GRADE_AA, GRADE_AAA };
 
 CString GradeToString( Grade g );
 Grade StringToGrade( const CString &s );
 
-
-
 #endif

stepmania/src/StyleDef.h

@@ -30,8 +30,6 @@
 const int MAX_COLS_PER_PLAYER = MAX_NOTE_TRACKS;
 
 
-class GameDef;
-
 class StyleDef
 {
 public: