actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

This is almost completely a ScoreKeeperNormal now. Perhaps this should be put in SKNormal and this calls can be removed.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-17 01:03:30 +00:00
parent 58847ff1b9
commit 8db5d63e1e
2 changed files with 8 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScoreKeeperShared.cpp
+5 -55
View File
@@ -1,75 +1,25 @@
#include "global.h" #include "global.h"
#include "ScoreKeeperShared.h" #include "ScoreKeeperShared.h"
#include "ScoreKeeperNormal.h"
#include "GameState.h" #include "GameState.h"
#include "StatsManager.h" #include "StatsManager.h"
#include "NoteDataUtil.h" #include "NoteDataUtil.h"
#include "NoteData.h" #include "NoteData.h"
#include "PlayerState.h"
ScoreKeeperShared::ScoreKeeperShared() : ScoreKeeper( NULL, NULL ) ScoreKeeperShared::ScoreKeeperShared( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats ) :
ScoreKeeperNormal( pPlayerState, pPlayerStageStats )
{ {
FOREACH_PlayerNumber( pn )
{
PlayerState *pPS = GAMESTATE->m_pPlayerState[pn];
PlayerStageStats *pPSS = &STATSMAN->m_CurStageStats.m_player[pn];
m_pScoreKeepers[pn] = new ScoreKeeperNormal( pPS, pPSS );
}
}
ScoreKeeperShared::~ScoreKeeperShared()
{
FOREACH_PlayerNumber( pn )
delete m_pScoreKeepers[pn];
}
#define CALL( fun ) FOREACH_PlayerNumber( pn ) m_pScoreKeepers[pn]->fun
void ScoreKeeperShared::Load( const vector<Song *> &apSongs, const vector<Steps *> &apSteps,
const vector<AttackArray> &asModifiers )
{
CALL( Load(apSongs, apSteps, asModifiers) );
}
void ScoreKeeperShared::DrawPrimitives()
{
CALL( DrawPrimitives() );
}
void ScoreKeeperShared::Update( float fDelta )
{
CALL( Update(fDelta) );
} }
void ScoreKeeperShared::OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData ) void ScoreKeeperShared::OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData )
{ {
vector<NoteData> vParts; vector<NoteData> vParts;
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
NoteDataUtil::SplitCompositeNoteData( *pNoteData, vParts ); NoteDataUtil::SplitCompositeNoteData( *pNoteData, vParts );
CALL( OnNextSong(iSongInCourseIndex, pSteps, &vParts[pn]) ); ScoreKeeperNormal::OnNextSong( iSongInCourseIndex, pSteps, &vParts[pn] );
} }
void ScoreKeeperShared::HandleTapScore( const TapNote &tn )
{
DEBUG_ASSERT( tn.pn != PLAYER_INVALID );
if( tn.pn == PLAYER_INVALID )
CALL( HandleTapScore(tn) );
else
m_pScoreKeepers[tn.pn]->HandleTapScore( tn );
}
void ScoreKeeperShared::HandleTapRowScore( const NoteData &nd, int row )
{
CALL( HandleTapRowScore(nd, row) );
}
void ScoreKeeperShared::HandleHoldScore( const TapNote &tn )
{
DEBUG_ASSERT( tn.pn != PLAYER_INVALID );
if( tn.pn == PLAYER_INVALID )
CALL( HandleHoldScore(tn) );
else
m_pScoreKeepers[tn.pn]->HandleHoldScore( tn );
}
#undef CALL #undef CALL
/* /*
stepmania/src/ScoreKeeperShared.h
+3 -12
View File
@@ -1,24 +1,15 @@
#ifndef SCORE_KEEPER_SHARED_H #ifndef SCORE_KEEPER_SHARED_H
#define SCORE_KEEPER_SHARED_H #define SCORE_KEEPER_SHARED_H
#include "ScoreKeeper.h" #include "ScoreKeeperNormal.h"
#include "PlayerNumber.h" #include "PlayerNumber.h"
class ScoreKeeperShared : public ScoreKeeper class ScoreKeeperShared : public ScoreKeeperNormal
{ {
ScoreKeeper *m_pScoreKeepers[NUM_PLAYERS];
public: public:
ScoreKeeperShared(); ScoreKeeperShared( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats );
~ScoreKeeperShared();
void Load( const vector<Song *> &apSongs, const vector<Steps *> &apSteps,
const vector<AttackArray> &asModifiers );
void DrawPrimitives();
void Update( float fDelta );
void OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData ); void OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData );
void HandleTapScore( const TapNote &tn );
void HandleTapRowScore( const NoteData &nd, int row );
void HandleHoldScore( const TapNote &tn );
}; };
#endif #endif