From 43f9fd70ca69cfeb5740a3313873cc218ad30ed2 Mon Sep 17 00:00:00 2001 From: sigatrev Date: Mon, 3 Mar 2014 20:37:13 -0600 Subject: [PATCH] added iTrack to mine judgment message more information is better. --- src/Player.cpp | 7 ++++--- src/Player.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Player.cpp b/src/Player.cpp index 472f37145c..fd3c76abd9 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2845,10 +2845,10 @@ void Player::UpdateJudgedRows() bAllJudged = false; continue; case TNS_AvoidMine: - SetMineJudgment( tn.result.tns ); + SetMineJudgment( tn.result.tns , iter.Track() ); continue; case TNS_HitMine: - SetMineJudgment( tn.result.tns ); + SetMineJudgment( tn.result.tns , iter.Track() ); break; } if( m_pNoteField ) @@ -3329,13 +3329,14 @@ void Player::CacheAllUsedNoteSkins() m_pNoteField->CacheAllUsedNoteSkins(); } -void Player::SetMineJudgment( TapNoteScore tns ) +void Player::SetMineJudgment( TapNoteScore tns , int iTrack ) { if( m_bSendJudgmentAndComboMessages ) { Message msg("Judgment"); msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber ); msg.SetParam( "TapNoteScore", tns ); + msg.SetParam( "FirstTrack", iTrack ); MESSAGEMAN->Broadcast( msg ); if( m_pPlayerStageStats && ( ( tns == TNS_AvoidMine && AVOID_MINE_INCREMENTS_COMBO ) || diff --git a/src/Player.h b/src/Player.h index 3d271eda49..68cb9050dd 100644 --- a/src/Player.h +++ b/src/Player.h @@ -131,7 +131,7 @@ protected: void SendComboMessages( int iOldCombo, int iOldMissCombo ); void PlayKeysound( const TapNote &tn, TapNoteScore score ); - void SetMineJudgment( TapNoteScore tns ); + void SetMineJudgment( TapNoteScore tns , int iTrack ); void SetJudgment( TapNoteScore tns, int iFirstTrack, float fTapNoteOffset ); // -1 if no track as in TNS_Miss void SetHoldJudgment( TapNoteScore tns, HoldNoteScore hns, int iTrack ); void SetCombo( int iCombo, int iMisses );