broadcast ScoreChanged with params
This commit is contained in:
@@ -77,8 +77,6 @@ static const char *MessageIDNames[] = {
|
||||
"StarMeterChangedP2",
|
||||
"LifeMeterChangedP1",
|
||||
"LifeMeterChangedP2",
|
||||
"ScoreChangedP1",
|
||||
"ScoreChangedP2",
|
||||
};
|
||||
XToString( MessageID );
|
||||
|
||||
|
||||
@@ -74,8 +74,6 @@ enum MessageID
|
||||
Message_StarMeterChangedP2,
|
||||
Message_LifeMeterChangedP1,
|
||||
Message_LifeMeterChangedP2,
|
||||
Message_ScoreChangedP1,
|
||||
Message_ScoreChangedP2,
|
||||
NUM_MessageID, // leave this at the end
|
||||
MessageID_Invalid
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "ScoreKeeperGuitar.h"
|
||||
#include "PlayerStageStats.h"
|
||||
#include "MessageManager.h"
|
||||
#include "PlayerState.h"
|
||||
|
||||
|
||||
ScoreKeeperGuitar::ScoreKeeperGuitar( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats ) :
|
||||
@@ -34,7 +35,10 @@ void ScoreKeeperGuitar::HandleHoldActiveSeconds( float fMusicSecondsHeld )
|
||||
{
|
||||
iScore += iPoints;
|
||||
iCurMaxScore += iPoints;
|
||||
MESSAGEMAN->Broadcast( Message_ScoreChangedP1 );
|
||||
Message msg( "ScoreChanged" );
|
||||
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
|
||||
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
|
||||
MESSAGEMAN->Broadcast( msg );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +66,10 @@ void ScoreKeeperGuitar::AddTapRowScore( TapNoteScore tns, const NoteData &nd, in
|
||||
ASSERT( iNumTapsInRow > 0 );
|
||||
|
||||
iScore += 50 * iNumTapsInRow * iNewCurScoreMultiplier;
|
||||
MESSAGEMAN->Broadcast( Message_ScoreChangedP1 );
|
||||
Message msg( "ScoreChanged" );
|
||||
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
|
||||
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
|
||||
MESSAGEMAN->Broadcast( msg );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -137,6 +137,11 @@ void ScoreKeeperNormal::Load(
|
||||
m_iNumTapsAndHolds = 0;
|
||||
m_bIsLastSongInCourse = false;
|
||||
|
||||
Message msg( "ScoreChanged" );
|
||||
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
|
||||
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
|
||||
MESSAGEMAN->Broadcast( msg );
|
||||
|
||||
memset( m_ComboBonusFactor, 0, sizeof(m_ComboBonusFactor) );
|
||||
switch( PREFSMAN->m_ScoringType )
|
||||
{
|
||||
@@ -431,6 +436,11 @@ void ScoreKeeperNormal::HandleTapScore( const TapNote &tn )
|
||||
m_pPlayerStageStats->m_iCurCombo,
|
||||
tn.result.fTapNoteOffset
|
||||
);
|
||||
Message msg( "ScoreChanged" );
|
||||
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
|
||||
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
|
||||
MESSAGEMAN->Broadcast( msg );
|
||||
|
||||
}
|
||||
|
||||
AddTapScore( tns );
|
||||
@@ -566,6 +576,10 @@ void ScoreKeeperNormal::HandleTapRowScore( const NoteData &nd, int iRow )
|
||||
NSMAN->ReportScore( pn, scoreOfLastTap,
|
||||
m_pPlayerStageStats->m_iScore,
|
||||
m_pPlayerStageStats->m_iCurCombo, offset );
|
||||
Message msg( "ScoreChanged" );
|
||||
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
|
||||
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
|
||||
MESSAGEMAN->Broadcast( msg );
|
||||
}
|
||||
|
||||
|
||||
@@ -593,6 +607,10 @@ void ScoreKeeperNormal::HandleHoldScore( const TapNote &tn )
|
||||
m_pPlayerStageStats->m_iScore,
|
||||
m_pPlayerStageStats->m_iCurCombo,
|
||||
tn.result.fTapNoteOffset );
|
||||
Message msg( "ScoreChanged" );
|
||||
msg.SetParam( "PlayerNumber", m_pPlayerState->m_PlayerNumber );
|
||||
msg.SetParam( "MultiPlayer", m_pPlayerState->m_mp );
|
||||
MESSAGEMAN->Broadcast( msg );
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user