From 8f10f429eaca75abf04c06b01e997e9c3ccce2e8 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 13 Mar 2004 18:35:25 +0000
Subject: [PATCH] fix GradePercent pref names

---
 stepmania/src/Grade.cpp        |  2 +-
 stepmania/src/PrefsManager.cpp | 18 +++++++++---------
 stepmania/src/PrefsManager.h   |  2 +-
 stepmania/src/StageStats.cpp   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp
index 319061465f..7feb88d560 100644
--- a/stepmania/src/Grade.cpp
+++ b/stepmania/src/Grade.cpp
@@ -74,7 +74,7 @@ Grade StringToGrade( const CString &sGrade )
 	else if( s == "NODATA" )	return GRADE_NO_DATA;
 
 	int iTier;
-	if( sscanf(sGrade.c_str(),"TIER%02d",&iTier) == 1 )	// if it's a two digit number...
+	if( sscanf(sGrade.c_str(),"TIER%02d",&iTier) == 1 )
 		return (Grade)(iTier-1);
 
 	ASSERT(0);
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index ca7b3d212c..82b89e8d17 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -117,13 +117,13 @@ PrefsManager::PrefsManager()
 	m_iGradeWeightNG = 0;
 	m_iNumGradeTiersUsed = 7;
 	for( int i=0; i<NUM_GRADE_TIERS; i++ )
-		m_fGradePercentTier[i] = 0;
-	m_fGradePercentTier[GRADE_TIER_1] = 1.0f;
-	m_fGradePercentTier[GRADE_TIER_2] = 1.0f;
-	m_fGradePercentTier[GRADE_TIER_3] = 0.93f;	// AA
-	m_fGradePercentTier[GRADE_TIER_4] = 0.80f;	// A
-	m_fGradePercentTier[GRADE_TIER_5] = 0.65f;	// B
-	m_fGradePercentTier[GRADE_TIER_6] = 0.45f;	// C
+		m_fGradePercent[i] = 0;
+	m_fGradePercent[GRADE_TIER_1] = 1.0f;
+	m_fGradePercent[GRADE_TIER_2] = 1.0f;
+	m_fGradePercent[GRADE_TIER_3] = 0.93f;	// AA
+	m_fGradePercent[GRADE_TIER_4] = 0.80f;	// A
+	m_fGradePercent[GRADE_TIER_5] = 0.65f;	// B
+	m_fGradePercent[GRADE_TIER_6] = 0.45f;	// C
 	m_bGradeTier02IsAllPerfects = true;
 	
 	m_fSuperMeterPercentChangeMarvelous =	+0.05f;
@@ -385,7 +385,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk()
 	{
 		Grade grade = (Grade)g;
 		CString s = GradeToString( grade );
-		ini.GetValue( "Options", "GradePercentTier"+s,			m_fGradePercentTier[g] );
+		ini.GetValue( "Options", "GradePercent"+s,				m_fGradePercent[g] );
 	}
 	ini.GetValue( "Options", "GradeTier02IsAllPerfects",		m_bGradeTier02IsAllPerfects );
 
@@ -600,7 +600,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const
 	{
 		Grade grade = (Grade)g;
 		CString s = GradeToString( grade );
-		ini.SetValue( "Options", "GradePercentTier"+s,			m_fGradePercentTier[g] );
+		ini.SetValue( "Options", "GradePercentTier"+s,			m_fGradePercent[g] );
 	}
 	ini.SetValue( "Options", "GradeTier02IsAllPerfects",		m_bGradeTier02IsAllPerfects );
 
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 6297e14fa5..6e0635c476 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -120,7 +120,7 @@ public:
 	int				m_iGradeWeightNG;
 
 	int				m_iNumGradeTiersUsed;
-	float			m_fGradePercentTier[NUM_GRADE_TIERS];	// the minimum percent necessary achieve a grade
+	float			m_fGradePercent[NUM_GRADE_TIERS];	// the minimum percent necessary achieve a grade
 	bool			m_bGradeTier02IsAllPerfects;	// DDR special case.  If true, m_fGradePercentTier[GRADE_TIER_2] is ignored
 
 	float			m_fSuperMeterPercentChangeMarvelous;
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index acf3e5e7c4..937e65f30b 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -190,7 +190,7 @@ Grade StageStats::GetGrade( PlayerNumber pn ) const
 
 	for( int g=0; g<NUM_GRADE_TIERS; g++ )
 	{
-		if( fPercent >= PREFSMAN->m_fGradePercentTier[g]-ROUNDING_ERROR )
+		if( fPercent >= PREFSMAN->m_fGradePercent[g]-ROUNDING_ERROR )
 		{
 			grade = (Grade)g;
 			break;