From 54da02109ee747847bbfb8f568d96b7906615523 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Dec 2002 21:52:38 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScoreKeeper.h | 6 +++--- stepmania/src/ScoreKeeperMAX2.cpp | 2 +- stepmania/src/ScoreKeeperMAX2.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScoreKeeper.h b/stepmania/src/ScoreKeeper.h index a5452752b8..8f27d15399 100644 --- a/stepmania/src/ScoreKeeper.h +++ b/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 ) { } diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp index 6b732709ed..46e012084d 100644 --- a/stepmania/src/ScoreKeeperMAX2.cpp +++ b/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; diff --git a/stepmania/src/ScoreKeeperMAX2.h b/stepmania/src/ScoreKeeperMAX2.h index 73a59f4bda..217b267a2e 100644 --- a/stepmania/src/ScoreKeeperMAX2.h +++ b/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 );