Merge pull request #2007 from richardloxley/fix-announcer-evaluation-sounds-issue-2005

Fix issue 2005: incorrect announcer sounds on the evaluation screen

src/Grade.cpp

@@ -33,7 +33,7 @@ RString GradeToLocalizedString( Grade g )
 RString GradeToOldString( Grade g )
 {
 	// string is meant to be human readable
-	switch( g )
+	switch( GradeToOldGrade(g) )
 	{
 	case Grade_Tier01:	return "AAAA";
 	case Grade_Tier02:	return "AAA";
@@ -48,6 +48,16 @@ RString GradeToOldString( Grade g )
 	}
 };
 
+Grade GradeToOldGrade( Grade g )
+{
+	// There used to be 7 grades (plus fail) but grades can now be defined by themes.
+	// So we need to re-scale the grade bands based on how many actual grades the theme defines.
+	if( g < NUM_GRADE_TIERS_USED )
+		g = (Grade)round((double)g * Grade_Tier07 / (NUM_GRADE_TIERS_USED - 1));
+
+	return g;
+}
+
 Grade StringToGrade( const RString &sGrade )
 {
 	RString s = sGrade;

src/Grade.h

@@ -67,6 +67,7 @@ static inline RString GradeToString( Grade g )
  * @param g the current Grade.
  * @return the old styled grade string. */
 RString GradeToOldString( Grade g );
+Grade GradeToOldGrade( Grade g );
 RString GradeToLocalizedString( Grade g );
 /**
  * @brief Convert the given RString into a proper Grade.

src/ScreenEvaluation.cpp

@@ -709,7 +709,7 @@ void ScreenEvaluation::Init()
 		}
 	}
 
-	switch( best_grade )
+	switch( GradeToOldGrade(best_grade) )
 	{
 		case Grade_Tier01:
 		case Grade_Tier02: