From 413e8e73b344f916fe015b672ac95d2917274f4d Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 18 Apr 2005 21:14:55 +0000 Subject: [PATCH] fix combo awards given when no steps attempted --- stepmania/src/PlayerStageStats.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 72863ae8f1..6e29c6ccf7 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -390,16 +390,26 @@ bool PlayerStageStats::FullComboOfScore( TapNoteScore tnsAllGreaterOrEqual ) con { ASSERT( tnsAllGreaterOrEqual >= TNS_GREAT ); ASSERT( tnsAllGreaterOrEqual <= TNS_MARVELOUS ); - + + // If missed any holds, then it's not a full combo if( iHoldNoteScores[HNS_NG] > 0 ) return false; + // If has any of the judgments below, then not a full combo for( int i=TNS_MISS; i 0 ) return false; } - return true; + + // If has at least one of the judgments equal to or above, then is a full combo. + for( int i=tnsAllGreaterOrEqual; i 0 ) + return true; + } + + return false; } bool PlayerStageStats::SingleDigitsOfScore( TapNoteScore tnsAllGreaterOrEqual ) const