From 2abd14b9294e962473a393a97c717908c5055aaa Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 20 Jan 2004 07:38:48 +0000 Subject: [PATCH] fix grade calculation. duh. --- stepmania/src/StageStats.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp index c1cb0a67b6..58fbf46fe3 100644 --- a/stepmania/src/StageStats.cpp +++ b/stepmania/src/StageStats.cpp @@ -178,17 +178,24 @@ Grade StageStats::GetGrade( PlayerNumber pn ) const Possible += iHoldNoteScores[pn][i] * HoldScoreValues[HNS_OK]; } - float fPercent = Actual / Possible; - LOG->Trace( "GetGrade: Actual: %f, Possible: %f, Percent: %f", Actual, Possible, fPercent ); - - // calculate grade + LOG->Trace( "GetGrade: Actual: %f, Possible: %f", Actual, Possible ); #define ROUNDING_ERROR 0.00001f Grade grade = (Grade)(NUM_GRADE_TIERS-1); // lowest non-failing grade - for( int g=0; g= PREFSMAN->m_fGradePercentTier[g]-ROUNDING_ERROR ) + { grade = (Grade)g; + break; + } + } if( PREFSMAN->m_bGradeTier02IsAllPerfects && iTapNoteScores[pn][TNS_PERFECT] > 0 && @@ -200,6 +207,8 @@ Grade StageStats::GetGrade( PlayerNumber pn ) const iHoldNoteScores[pn][HNS_NG] == 0 ) return GRADE_TIER_2; + LOG->Trace( "GetGrade: Grade: %s", GradeToString(grade).c_str() ); + return grade; }