fix broken GradeDisplay

stepmania/src/CatalogXml.cpp

@@ -340,7 +340,7 @@ void CatalogXml::Save( LoadingWindow *loading_window )
 
 		{
 			XNode* pNode2 = pNode->AppendChild( "Grade" );
-			FOREACH_UsedGrade( g )
+			FOREACH_PossibleGrade( g )
 			{
 				XNode* pNode3 = pNode2->AppendChild( "Grade", GradeToString(g) );
 				pNode3->AppendAttr( "DisplayAs", GradeToLocalizedString(g) );

stepmania/src/Grade.cpp

@@ -8,6 +8,19 @@
 
 LuaXType( Grade );
 
+ThemeMetric<int> NUM_GRADE_TIERS_USED("PlayerStageStats","NumGradeTiersUsed");
+
+Grade GetNextPossibleGrade( Grade g )
+{
+	if( g < NUM_GRADE_TIERS_USED - 1 )
+		return (Grade)(g+1);
+	else if( g == NUM_GRADE_TIERS_USED - 1 )
+		return Grade_Failed;
+	else
+		return Grade_Invalid;
+}
+
+
 RString GradeToLocalizedString( Grade g )
 {
 	RString s = GradeToString(g);

stepmania/src/Grade.h

@@ -5,6 +5,7 @@
 
 #include "RageUtil.h"
 #include "EnumHelper.h"
+#include "ThemeMetric.h"
 
 #define NUM_Grade_TierS 20
 enum Grade 
@@ -53,7 +54,10 @@ RString GradeToOldString( Grade g );	// "AAA", "B", etc for backward compatibili
 RString GradeToLocalizedString( Grade g );
 Grade StringToGrade( const RString &s );
 LuaDeclareType( Grade );
-#define FOREACH_UsedGrade( g ) FOREACH_ENUM_N( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g )
+extern ThemeMetric<int> NUM_GRADE_TIERS_USED;
+#define NUM_POSSIBLE_GRADES	(NUM_GRADE_TIERS_USED+1)
+Grade GetNextPossibleGrade( Grade g );
+#define FOREACH_PossibleGrade( g )	for( Grade g = (Grade)(0); g != Grade_Invalid; g = GetNextPossibleGrade(g) )
 
 #endif
 

stepmania/src/GradeDisplay.cpp

@@ -11,18 +11,22 @@ REGISTER_ACTOR_CLASS( GradeDisplay )
 void GradeDisplay::Load( RString sMetricsGroup )
 {
 	ASSERT( m_vSpr.empty() );
-	FOREACH_UsedGrade( g )
+	m_vSpr.resize( NUM_POSSIBLE_GRADES );
+	int i = 0;
+	FOREACH_PossibleGrade( g )
 	{
-		m_vSpr.resize( m_vSpr.size()+1 );
+		AutoActor &spr = m_vSpr[i];
-		m_vSpr.back().Load( THEME->GetPathG(sMetricsGroup,GradeToString(g)) );
+		spr.Load( THEME->GetPathG(sMetricsGroup,GradeToString(g)) );
-		m_vSpr.back()->SetVisible( false );
+		spr->SetVisible( false );
+		this->AddChild( spr ); 
+		i++;
 	}
 }
 
 void GradeDisplay::SetGrade( Grade grade )
 {
 	int i = 0;
-	FOREACH_UsedGrade( g )
+	FOREACH_PossibleGrade( g )
 	{
 		m_vSpr[i]->SetVisible( g == grade );
 		i++;
@@ -54,7 +58,7 @@ public:
 	}
 };
 
-LUA_REGISTER_DERIVED_CLASS( GradeDisplay, Sprite )
+LUA_REGISTER_DERIVED_CLASS( GradeDisplay, ActorFrame )
 // lua end
 
 /*

stepmania/src/GradeDisplay.h

@@ -3,13 +3,13 @@
 #ifndef GRADE_DISPLAY_H
 #define GRADE_DISPLAY_H
 
-#include "Sprite.h"
+#include "ActorFrame.h"
 #include "Grade.h"
 #include "PlayerNumber.h"
 #include "AutoActor.h"
 struct lua_State;
 
-class GradeDisplay : public Sprite
+class GradeDisplay : public ActorFrame
 {
 public:
 	virtual void Load( RString sMetricsGroup );