From 6c8fd11e9306e799e716d294fd935c4baea1b4b6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 12 Aug 2005 03:16:44 +0000
Subject: [PATCH] merge common code

---
 stepmania/src/HighScore.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/HighScore.cpp b/stepmania/src/HighScore.cpp
index 5c33cd3246..87999cba10 100644
--- a/stepmania/src/HighScore.cpp
+++ b/stepmania/src/HighScore.cpp
@@ -197,16 +197,14 @@ bool HighScore::operator>=( const HighScore& other ) const
 	{
 		if( GetPercentDP() != other.GetPercentDP() )
 			return GetPercentDP() >= other.GetPercentDP();
-		else
-			return GetGrade() >= other.GetGrade();
 	}
 	else
 	{
 		if( GetScore() != other.GetScore() )
 			return GetScore() >= other.GetScore();
-		else
-			return GetGrade() >= other.GetGrade();
 	}
+
+	return GetGrade() >= other.GetGrade();
 }
 
 bool HighScore::operator==( const HighScore& other ) const