From bec941520aaa86cf4d4bae4ffb8b8a122d3ffe76 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 15 Jan 2011 14:17:52 -0500 Subject: [PATCH] Add metric for Combo Stopped message flexibility. --- Docs/Changelog_sm-ssc.txt | 2 ++ Themes/_fallback/metrics.ini | 1 + src/Player.cpp | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index c0d71a1be3..2f8b6cb7e0 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -18,6 +18,8 @@ sm-ssc v1.2.1 | 2011011? * [ArrowEffects] Allow modifying modifier characteristics in the metrics. At present, Blink, Boost, Brake, and Wave can have modifications. [Wolfman2000] +* [Player] Allow Combo Stopped message to be flexible via metrics. The + default is 50, as it was before. [Wolfman2000] 20110112 -------- diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 75483a5825..3fa9058d52 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -938,6 +938,7 @@ MaxHoldLife=MaxHoldLife() RollBodyIncrementsCombo=GetGamePrefB("UserPrefComboOnRolls") ScoreMissedHoldsAndRolls=ScoreMissedHoldsAndRolls() PercentUntilColorCombo=0.25 +ComboStoppedAt=50 [PlayerShared] Fallback="Player" diff --git a/src/Player.cpp b/src/Player.cpp index c473e9ef68..bdc9534382 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -138,6 +138,7 @@ ThemeMetric ROLL_BODY_INCREMENTS_COMBO ( "Player", "RollBodyIncrementsComb ThemeMetric CHECKPOINTS_TAPS_SEPARATE_JUDGMENT ( "Player", "CheckpointsTapsSeparateJudgment" ); ThemeMetric SCORE_MISSED_HOLDS_AND_ROLLS ( "Player", "ScoreMissedHoldsAndRolls" ); // sm-ssc addition ThemeMetric PERCENT_UNTIL_COLOR_COMBO ( "Player", "PercentUntilColorCombo" ); +ThemeMetric COMBO_STOPPED_AT ( "Player", "ComboStoppedAt" ); float Player::GetWindowSeconds( TimingWindow tw ) { @@ -581,7 +582,7 @@ void Player::Load() void Player::SendComboMessages( int iOldCombo, int iOldMissCombo ) { const int iCurCombo = m_pPlayerStageStats ? m_pPlayerStageStats->m_iCurCombo : 0; - if( iOldCombo > 50 && iCurCombo < 50 ) + if( iOldCombo > COMBO_STOPPED_AT && iCurCombo < COMBO_STOPPED_AT ) { SCREENMAN->PostMessageToTopScreen( SM_ComboStopped, 0 ); }