From 535ef4db29eb76bae4934283a3bc9c2558b36f64 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 23 Jan 2012 21:53:18 -0500 Subject: [PATCH] Two new options for JudgmentMessageCommand. You can now use AvoidMine and HitMine. Obviously, not at the same time. Thanks to Saturn2888 and shakesoda for the fix. --- Docs/Changelog_sm5.txt | 5 +++++ src/Player.cpp | 13 +++++++++++++ src/Player.h | 1 + 3 files changed, 19 insertions(+) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 7a9c6a00ae..9629d9fb12 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,11 @@ ________________________________________________________________________________ StepMania 5.0 alpha 1a | 201201?? -------------------------------------------------------------------------------- +2012/01/23 +---------- +* [Player] Tap Note Scores (tns) can now be "AvoidMine" or "HitMine" in +JudgmentMessageCommand. [Saturn2888, shakesoda] + 2012/01/15 ---------- * [WheelNotifyIcon] Add the NumIconsToShow metric. [Wolfman2000] diff --git a/src/Player.cpp b/src/Player.cpp index 97a62e2f91..bd30597f47 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2834,8 +2834,10 @@ void Player::UpdateJudgedRows() bAllJudged = false; continue; case TNS_AvoidMine: + SetMineJudgment( tn.result.tns ); continue; case TNS_HitMine: + SetMineJudgment( tn.result.tns ); break; } if( m_pNoteField ) @@ -3339,6 +3341,17 @@ void Player::CacheAllUsedNoteSkins() m_pNoteField->CacheAllUsedNoteSkins(); } +void Player::SetMineJudgment( TapNoteScore tns ) +{ + if( m_bSendJudgmentAndComboMessages ) + { + Message msg("Judgment"); + msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber ); + msg.SetParam( "TapNoteScore", tns ); + MESSAGEMAN->Broadcast( msg ); + } +} + void Player::SetJudgment( TapNoteScore tns, int iTrack, float fTapNoteOffset ) { if( m_bSendJudgmentAndComboMessages ) diff --git a/src/Player.h b/src/Player.h index f2cb2c9b5c..df5ee9e081 100644 --- a/src/Player.h +++ b/src/Player.h @@ -132,6 +132,7 @@ protected: void SendComboMessages( int iOldCombo, int iOldMissCombo ); void PlayKeysound( const TapNote &tn, TapNoteScore score ); + void SetMineJudgment( TapNoteScore tns ); 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 );