cleanup

stepmania/src/ScoreKeeper.h

@@ -19,11 +19,11 @@
 */
 
 #include "Actor.h"
-#include "NoteData.h"
+#include "GameConstantsAndTypes.h"
 
 class ScoreKeeper: public Actor {
 protected:
-	int m_PlayerNumber;
+	PlayerNumber m_PlayerNumber;
 
 	/* Common toggles that this class handles directly: */
 
@@ -32,7 +32,7 @@ protected:
 //	bool Stats_DoublesCount;
 
 public:
-	ScoreKeeper(int pn) { m_PlayerNumber=pn; }
+	ScoreKeeper(PlayerNumber pn) { m_PlayerNumber=pn; }
 	virtual void DrawPrimitives() { }
 
 	virtual void HandleNoteScore( TapNoteScore score, int iNumTapsInRow ) { }

stepmania/src/ScoreKeeperMAX2.cpp

@@ -2,7 +2,7 @@
 #include "ScoreKeeperMAX2.h"
 #include "GameState.h"
 
-ScoreKeeperMAX2::ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, int pn_):
+ScoreKeeperMAX2::ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, PlayerNumber pn_):
 	ScoreKeeper(pn_)
 {
 //	Stats_DoublesCount = true;

stepmania/src/ScoreKeeperMAX2.h

@@ -25,7 +25,7 @@ class ScoreKeeperMAX2: public ScoreKeeper
 	void AddScore( TapNoteScore score );
 
 public:
-	ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, int pn);
+	ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, PlayerNumber pn);
 
 	void HandleNoteScore( TapNoteScore score, int iNumTapsInRow );
 	void HandleHoldNoteScore( HoldNoteScore score, TapNoteScore TapNoteScore );