From 9b955535fd06686d8f9e0c12edc73aae588fe903 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 17 Mar 2007 07:55:00 +0000 Subject: [PATCH] simplify --- stepmania/src/PlayerStageStats.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index d15ea1c189..0aab496cea 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -193,26 +193,13 @@ Grade PlayerStageStats::GetGrade() const LOG->Trace( "GetGrade: Grade: %s, %i", GradeToString(grade).c_str(), GRADE_TIER02_IS_ALL_W2S ); if( GRADE_TIER02_IS_ALL_W2S ) { - if( m_iTapNoteScores[TNS_W1] > 0 && - m_iTapNoteScores[TNS_W2] == 0 && - m_iTapNoteScores[TNS_W3] == 0 && - m_iTapNoteScores[TNS_W4] == 0 && - m_iTapNoteScores[TNS_W5] == 0 && - m_iTapNoteScores[TNS_Miss] == 0 && - m_iTapNoteScores[TNS_HitMine] == 0 && - m_iHoldNoteScores[HNS_LetGo] == 0 ) + if( FullComboOfScore(TNS_W1) ) return Grade_Tier01; - if( m_iTapNoteScores[TNS_W2] > 0 && - m_iTapNoteScores[TNS_W3] == 0 && - m_iTapNoteScores[TNS_W4] == 0 && - m_iTapNoteScores[TNS_W5] == 0 && - m_iTapNoteScores[TNS_Miss] == 0 && - m_iTapNoteScores[TNS_HitMine] == 0 && - m_iHoldNoteScores[HNS_LetGo] == 0 ) + if( FullComboOfScore(TNS_W2) ) return Grade_Tier02; - return max( grade, Grade_Tier03 ); + grade = max( grade, Grade_Tier03 ); } return grade;