From d46db6e9c027291ced3882647af1fdd4e33b1ff6 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Nov 2011 17:27:36 -0600 Subject: [PATCH] [PlayerStageStats] Hitting a mine no longer gives you full combo. TODO: make this work with [Gameplay] MineHitIncrementsMissCombo metric --- Docs/Changelog_sm5.txt | 4 ++++ src/PlayerStageStats.cpp | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 970298727d..5be1958ff2 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 $next | 20111xxx -------------------------------------------------------------------------------- +2011/11/25 +---------- +* [PlayerStageStats] Hitting a mine no longer gives you full combo. [AJ] + 2011/11/24 ---------- * [PlayerStageStats] Added GetFailed and GetNumControllerSteps Lua bindings. [AJ] diff --git a/src/PlayerStageStats.cpp b/src/PlayerStageStats.cpp index ba0ec78953..a48710f5eb 100644 --- a/src/PlayerStageStats.cpp +++ b/src/PlayerStageStats.cpp @@ -529,7 +529,11 @@ bool PlayerStageStats::FullComboOfScore( TapNoteScore tnsAllGreaterOrEqual ) con if( m_iTapNoteScores[i] > 0 ) return false; } - + + // hit any mines? It's not a full combo. + if( m_iTapNoteScores[TNS_HitMine] > 0 ) + return false; + // If has at least one of the judgments equal to or above, then is a full combo. for( int i=tnsAllGreaterOrEqual; i