Some respect for OOP. (MasterPlayerNumber)

This commit is contained in:
Jason Felds
2011-06-06 20:40:11 -04:00
parent 963cc9d4f1
commit 0a7b9ce170
33 changed files with 106 additions and 94 deletions
+10 -10
View File
@@ -16,7 +16,7 @@ void ScoreKeeperShared::Load(
const vector<Steps*> &apSteps,
const vector<AttackArray> &asModifiers )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::Load( apSongs, apSteps, asModifiers );
}
@@ -24,63 +24,63 @@ void ScoreKeeperShared::Load(
// These ScoreKeepers don't get to draw.
void ScoreKeeperShared::DrawPrimitives()
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::DrawPrimitives();
}
void ScoreKeeperShared::Update( float fDelta )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::Update( fDelta );
}
void ScoreKeeperShared::OnNextSong( int iSongInCourseIndex, const Steps* pSteps, const NoteData* pNoteData )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::OnNextSong( iSongInCourseIndex, pSteps, pNoteData );
}
void ScoreKeeperShared::HandleTapScore( const TapNote &tn )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::HandleTapScore( tn );
}
void ScoreKeeperShared::HandleTapRowScore( const NoteData &nd, int iRow )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::HandleTapRowScore( nd, iRow );
}
void ScoreKeeperShared::HandleHoldScore( const TapNote &tn )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::HandleHoldScore( tn );
}
void ScoreKeeperShared::HandleHoldActiveSeconds( float fMusicSecondsHeld )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::HandleHoldActiveSeconds( fMusicSecondsHeld );
}
void ScoreKeeperShared::HandleHoldCheckpointScore( const NoteData &nd, int iRow, int iNumHoldsHeldThisRow, int iNumHoldsMissedThisRow )
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::HandleHoldCheckpointScore( nd, iRow, iNumHoldsHeldThisRow, iNumHoldsMissedThisRow );
}
void ScoreKeeperShared::HandleTapScoreNone()
{
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->m_MasterPlayerNumber )
if( m_pPlayerState->m_PlayerNumber != GAMESTATE->GetMasterPlayerNumber() )
return;
ScoreKeeperNormal::HandleTapScoreNone();
}