From 60d8f65ab45b168d244c7789981d272ca420cd1a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 18 Mar 2005 07:38:44 +0000 Subject: [PATCH] ScoreKeeper is not an Actor --- stepmania/src/ScoreKeeper.h | 3 +-- stepmania/src/ScoreKeeperRave.cpp | 4 ---- stepmania/src/ScoreKeeperRave.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/stepmania/src/ScoreKeeper.h b/stepmania/src/ScoreKeeper.h index 079b743b3a..de7c766761 100644 --- a/stepmania/src/ScoreKeeper.h +++ b/stepmania/src/ScoreKeeper.h @@ -11,7 +11,6 @@ * Results are injected directly into GameState. */ -#include "Actor.h" #include "Attack.h" #include "GameConstantsAndTypes.h" // for TapNoteScore and HoldNoteScore class NoteData; @@ -22,7 +21,7 @@ struct PlayerState; struct PlayerStageStats; -class ScoreKeeper: public Actor +class ScoreKeeper { protected: PlayerState* m_pPlayerState; diff --git a/stepmania/src/ScoreKeeperRave.cpp b/stepmania/src/ScoreKeeperRave.cpp index 1950bfb84c..5177eef695 100644 --- a/stepmania/src/ScoreKeeperRave.cpp +++ b/stepmania/src/ScoreKeeperRave.cpp @@ -123,10 +123,6 @@ void ScoreKeeperRave::AddSuperMeterDelta( float fUnscaledPercentChange ) } -void ScoreKeeperRave::Update( float fDelta ) -{ -} - void ScoreKeeperRave::LaunchAttack( AttackLevel al ) { PlayerNumber pn = m_pPlayerState->m_PlayerNumber; diff --git a/stepmania/src/ScoreKeeperRave.h b/stepmania/src/ScoreKeeperRave.h index 0130aa4c0f..0608a01c8b 100644 --- a/stepmania/src/ScoreKeeperRave.h +++ b/stepmania/src/ScoreKeeperRave.h @@ -12,7 +12,6 @@ class ScoreKeeperRave : public ScoreKeeper public: // Overrides ScoreKeeperRave( PlayerState* pPlayerState, PlayerStageStats* pPlayerStageStats ); - void Update( float fDelta ); void OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData ); // before a song plays (called multiple times if course) void HandleTapScore( TapNoteScore score ); void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow );