From 4556c0f246aa5348ebb5d8747dcd838d7ad8c5af Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 22 Oct 2003 12:51:19 +0000 Subject: [PATCH] fix feat score --- stepmania/src/GameState.cpp | 5 ++++- stepmania/src/ScreenEvaluation.cpp | 7 +------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 4be03b17d5..6ac87fde1f 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -822,7 +822,10 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector &asFeatsO feat.Feat = ssprintf("MR #%d in %s %s", j+1, pSong->GetTranslitMainTitle().c_str(), DifficultyToString(pSteps->GetDifficulty()).c_str() ); feat.pStringToFill = &vMachineHighScores[j].sName; feat.g = vMachineHighScores[j].grade; - feat.Score = (float) vMachineHighScores[j].iScore; + if( PREFSMAN->m_bPercentageScoring ) + feat.Score = vMachineHighScores[j].fPercentDP; + else + feat.Score = (float) vMachineHighScores[j].iScore; // XXX: temporary hack if( pSong->HasBackground() ) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 13049fef2e..94aa2285fb 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -185,14 +185,9 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) case stage: { ASSERT( GAMESTATE->m_pCurNotes[p] ); - int score; - if( PREFSMAN->m_bPercentageScoring ) - score = stageStats.GetPercentDancePoints( (PlayerNumber)p ); - else - score = stageStats.iScore[p] + stageStats.iBonus[p]; Steps::MemCardData::HighScore hs; hs.grade = grade[p]; - hs.iScore = score; + hs.iScore = stageStats.iScore[p] + stageStats.iBonus[p]; hs.fPercentDP = stageStats.GetPercentDancePoints( (PlayerNumber)p ); GAMESTATE->m_pCurNotes[p]->AddHighScore( (PlayerNumber)p, hs, iPersonalHighScoreIndex[p], iMachineHighScoreIndex[p] );