From 2e55c565964b084e0e3fd83b78c8baa715eb9845 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 26 Apr 2005 08:14:46 +0000 Subject: [PATCH] fix wrong grade calculation when using mods --- stepmania/src/PlayerStageStats.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 1aa02b6d53..f11ac79e0d 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -130,13 +130,6 @@ Grade PlayerStageStats::GetGrade() const /* XXX: This entire calculation should be in ScoreKeeper, but final evaluation * is tricky since at that point the ScoreKeepers no longer exist. */ - float fPossible = 0; - FOREACH_CONST( Steps*, vpPossibleSteps, s ) - { - fPossible += (*s)->GetRadarValues().m_Values.v.fNumTapsAndHolds * PREFSMAN->m_iGradeWeightMarvelous; - fPossible += (*s)->GetRadarValues().m_Values.v.fNumHolds * PREFSMAN->m_iGradeWeightOK; - } - float fActual = 0; FOREACH_TapNoteScore( tns ) { @@ -170,10 +163,10 @@ Grade PlayerStageStats::GetGrade() const fActual += iHoldNoteScores[hns] * iHoldScoreValue; } - LOG->Trace( "GetGrade: fActual: %f, fPossible: %f", fActual, fPossible ); + LOG->Trace( "GetGrade: fActual: %f, fPossible: %d", fActual, iPossibleDancePoints ); - float fPercent = (fPossible == 0) ? 0 : fActual / fPossible; + float fPercent = (iPossibleDancePoints == 0) ? 0 : fActual / iPossibleDancePoints; Grade grade = GetGradeFromPercent( fPercent );