From 34061bd9da57cb9988b9c6938b300e0dbf2f38b1 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 18 Mar 2004 06:38:18 +0000 Subject: [PATCH] fix per-diffculty award priority --- stepmania/src/ScreenEvaluation.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index eb6907d78f..4f699425e7 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -1028,15 +1028,14 @@ void ScreenEvaluation::CommitScores( { if( stageStats.FullComboOfScore( (PlayerNumber)p, TNS_GREAT ) ) vPdas.push_back( AWARD_FULL_COMBO_GREATS ); - if( stageStats.FullComboOfScore( (PlayerNumber)p, TNS_PERFECT ) ) - vPdas.push_back( AWARD_FULL_COMBO_PERFECTS ); - if( stageStats.FullComboOfScore( (PlayerNumber)p, TNS_MARVELOUS ) ) - vPdas.push_back( AWARD_FULL_COMBO_MARVELOUSES ); - if( stageStats.SingleDigitsOfScore( (PlayerNumber)p, TNS_GREAT ) ) vPdas.push_back( AWARD_SINGLE_DIGIT_GREATS ); + if( stageStats.FullComboOfScore( (PlayerNumber)p, TNS_PERFECT ) ) + vPdas.push_back( AWARD_FULL_COMBO_PERFECTS ); if( stageStats.SingleDigitsOfScore( (PlayerNumber)p, TNS_PERFECT ) ) vPdas.push_back( AWARD_SINGLE_DIGIT_PERFECTS ); + if( stageStats.FullComboOfScore( (PlayerNumber)p, TNS_MARVELOUS ) ) + vPdas.push_back( AWARD_FULL_COMBO_MARVELOUSES ); float fPercentGreats = stageStats.GetPercentageOfTaps((PlayerNumber)p, TNS_GREAT); if( fPercentGreats >= 0.8f )