From 5e6038c83ae43beb4d1a5c295f877c3ed1161a25 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 2 May 2004 09:57:28 +0000
Subject: [PATCH] fix "possibleDP=0 will choose Grade=Tier20, which may not
 have a graphic"

---
 stepmania/src/ScreenNameEntryTraditional.cpp |  2 ++
 stepmania/src/StageStats.cpp                 | 11 ++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 53bd541021..39aa902812 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -412,6 +412,8 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S
 	m_soundInvalid.Load( THEME->GetPathToS("ScreenNameEntryTraditional invalid",true) );
 
 	SOUND->PlayMusic( THEME->GetPathToS("ScreenNameEntryTraditional music") );
+
+	this->SortByDrawOrder();
 }
 
 static inline int wrapn( int x, int n )
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index 2433f039bd..a34c5f8026 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -181,18 +181,15 @@ Grade StageStats::GetGrade( PlayerNumber pn ) const
 	LOG->Trace( "GetGrade: Actual: %f, Possible: %f", Actual, Possible );
 
 #define ROUNDING_ERROR 0.00001f
-	Grade grade = (Grade)(NUM_GRADE_TIERS-1);	// lowest non-failing grade
+	Grade grade;
 
-	if( Possible == 0 )
-		return grade;
+	float fPercent = (Possible == 0) ? 0 : Actual / Possible;
 
-	float fPercent = Actual / Possible;
-
-	for( int g=0; g<NUM_GRADE_TIERS; g++ )
+	FOREACH_Grade(g)
 	{
 		if( fPercent >= PREFSMAN->m_fGradePercent[g]-ROUNDING_ERROR )
 		{
-			grade = (Grade)g;
+			grade = g;
 			break;
 		}
 	}