From 09274b655bdfb57453ffa4df4dc3b9d2f0163c5c Mon Sep 17 00:00:00 2001 From: sillybear Date: Tue, 9 Dec 2014 23:52:22 +0800 Subject: [PATCH 1/2] Add --- src/Player.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Player.cpp b/src/Player.cpp index dbc5dbc1ec..0abb6b2466 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -142,6 +142,7 @@ ThemeMetric PENALIZE_TAP_SCORE_NONE ( "Player", "PenalizeTapScoreNone" ); ThemeMetric JUDGE_HOLD_NOTES_ON_SAME_ROW_TOGETHER ( "Player", "JudgeHoldNotesOnSameRowTogether" ); ThemeMetric CHECKPOINTS_FLASH_ON_HOLD ( "Player", "CheckpointsFlashOnHold" ); // sm-ssc addition ThemeMetric IMMEDIATE_HOLD_LET_GO ( "Player", "ImmediateHoldLetGo" ); +ThemeMetric COMBO_BREAK_ON_IMMEDIATE_HOLD_LET_GO( "Player", "ComboBreakOnImmediateHoldLetGo" ); /** * @brief Must a Player step on a hold head for a hold to activate? * @@ -1460,6 +1461,21 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vectorm_iCurCombo : 0; + const int iOldMissCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurMissCombo : 0; + + if( m_pPlayerStageStats ) + { + m_pPlayerStageStats->m_iCurCombo = 0; + m_pPlayerStageStats->m_iCurMissCombo++; + SetCombo( m_pPlayerStageStats->m_iCurCombo, m_pPlayerStageStats->m_iCurMissCombo ); + } + + SendComboMessages( iOldCombo, iOldMissCombo ); + } + if( hns != HNS_None ) { //LOG->Trace("tap note scoring time."); From e3bb49f9d833a1ca4e10753d07eebd26ed2c2662 Mon Sep 17 00:00:00 2001 From: sillybear Date: Wed, 10 Dec 2014 00:09:46 +0800 Subject: [PATCH 2/2] Update Player.cpp --- src/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Player.cpp b/src/Player.cpp index 0abb6b2466..6c8a3bfc56 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -142,7 +142,7 @@ ThemeMetric PENALIZE_TAP_SCORE_NONE ( "Player", "PenalizeTapScoreNone" ); ThemeMetric JUDGE_HOLD_NOTES_ON_SAME_ROW_TOGETHER ( "Player", "JudgeHoldNotesOnSameRowTogether" ); ThemeMetric CHECKPOINTS_FLASH_ON_HOLD ( "Player", "CheckpointsFlashOnHold" ); // sm-ssc addition ThemeMetric IMMEDIATE_HOLD_LET_GO ( "Player", "ImmediateHoldLetGo" ); -ThemeMetric COMBO_BREAK_ON_IMMEDIATE_HOLD_LET_GO( "Player", "ComboBreakOnImmediateHoldLetGo" ); +ThemeMetric COMBO_BREAK_ON_IMMEDIATE_HOLD_LET_GO ( "Player", "ComboBreakOnImmediateHoldLetGo" ); /** * @brief Must a Player step on a hold head for a hold to activate? *