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

Merge pull request #71 from sigatrev/MineTracks

Browse Source 
added iTrack to mine judgment message
This commit is contained in:
AJ Kelly
2014-03-07 14:11:54 -06:00
parent e18bbc72ea 43f9fd70ca
commit 95343dc27b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cpp
+4 -3
View File
@@ -2846,10 +2846,10 @@ void Player::UpdateJudgedRows()
bAllJudged = false; bAllJudged = false;
continue; continue;
case TNS_AvoidMine: case TNS_AvoidMine:
SetMineJudgment( tn.result.tns ); SetMineJudgment( tn.result.tns , iter.Track() );
continue; continue;
case TNS_HitMine: case TNS_HitMine:
SetMineJudgment( tn.result.tns ); SetMineJudgment( tn.result.tns , iter.Track() );
break; break;
} }
if( m_pNoteField ) if( m_pNoteField )
@@ -3330,13 +3330,14 @@ void Player::CacheAllUsedNoteSkins()
m_pNoteField->CacheAllUsedNoteSkins(); m_pNoteField->CacheAllUsedNoteSkins();
} }
void Player::SetMineJudgment( TapNoteScore tns ) void Player::SetMineJudgment( TapNoteScore tns , int iTrack )
{ {
if( m_bSendJudgmentAndComboMessages ) if( m_bSendJudgmentAndComboMessages )
{ {
Message msg("Judgment"); Message msg("Judgment");
msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber ); msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber );
msg.SetParam( "TapNoteScore", tns ); msg.SetParam( "TapNoteScore", tns );
msg.SetParam( "FirstTrack", iTrack );
MESSAGEMAN->Broadcast( msg ); MESSAGEMAN->Broadcast( msg );
if( m_pPlayerStageStats && if( m_pPlayerStageStats &&
( ( tns == TNS_AvoidMine && AVOID_MINE_INCREMENTS_COMBO ) || ( ( tns == TNS_AvoidMine && AVOID_MINE_INCREMENTS_COMBO ) ||
src/Player.h
+1 -1
View File
@@ -131,7 +131,7 @@ protected:
void SendComboMessages( int iOldCombo, int iOldMissCombo ); void SendComboMessages( int iOldCombo, int iOldMissCombo );
void PlayKeysound( const TapNote &tn, TapNoteScore score ); 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 SetJudgment( TapNoteScore tns, int iFirstTrack, float fTapNoteOffset ); // -1 if no track as in TNS_Miss
void SetHoldJudgment( TapNoteScore tns, HoldNoteScore hns, int iTrack ); void SetHoldJudgment( TapNoteScore tns, HoldNoteScore hns, int iTrack );
void SetCombo( int iCombo, int iMisses ); void SetCombo( int iCombo, int iMisses );