From 56f2ae5acc3d8be64324423688b846709bfac64b Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 15 Aug 2008 00:08:01 +0000 Subject: [PATCH] remove mercifulBeginner grade tweaking weirdness --- stepmania/src/PlayerStageStats.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index da002c5060..e2ee3f20bd 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -21,7 +21,7 @@ static ThemeMetric g_MinScoreToMaintainCombo( "Gameplay", "MinScor const float LESSON_PASS_THRESHOLD = 0.8f; -Grade GetGradeFromPercent( float fPercent, bool bMerciful ); +Grade GetGradeFromPercent( float fPercent ); void PlayerStageStats::Init() { @@ -136,11 +136,8 @@ void PlayerStageStats::AddStats( const PlayerStageStats& other ) } } -Grade GetGradeFromPercent( float fPercent, bool bMerciful ) +Grade GetGradeFromPercent( float fPercent ) { - if( bMerciful ) - fPercent = SCALE( fPercent, 0.0f, 1.0f, 0.5f, 1.0f ); - Grade grade = Grade_Failed; FOREACH_ENUM( Grade,g) @@ -186,18 +183,7 @@ Grade PlayerStageStats::GetGrade() const float fPercent = (m_iPossibleGradePoints == 0) ? 0 : fActual / m_iPossibleGradePoints; - - bool bMerciful = - m_iStepsPlayed > 0 && - GAMESTATE->m_PlayMode == PLAY_MODE_REGULAR && - PREFSMAN->m_bMercifulBeginner; - for( int i = 0; i < m_iStepsPlayed; ++i ) - { - if( m_vpPossibleSteps[i]->GetDifficulty() != Difficulty_Beginner ) - bMerciful = false; - } - - Grade grade = GetGradeFromPercent( fPercent, bMerciful ); + Grade grade = GetGradeFromPercent( fPercent ); LOG->Trace( "GetGrade: Grade: %s, %i", GradeToString(grade).c_str(), GRADE_TIER02_IS_ALL_W2S ); if( GRADE_TIER02_IS_ALL_W2S ) @@ -660,7 +646,7 @@ bool PlayerStageStats::IsDisqualified() const return m_bDisqualified; } -LuaFunction( GetGradeFromPercent, GetGradeFromPercent( FArg(1), false ) ) +LuaFunction( GetGradeFromPercent, GetGradeFromPercent( FArg(1) ) ) LuaFunction( FormatPercentScore, PlayerStageStats::FormatPercentScore( FArg(1) ) )