Move RadarValues::WriteSimpleValues, WriteComplexValues into ThemeMetric objects for maintainability.

stepmania/src/CatalogXml.cpp

@@ -54,8 +54,8 @@ void CatalogXml::Save( LoadingWindow *loading_window )
 	const vector<StepsType> &vStepsTypesToShow = CommonMetrics::STEPS_TYPES_TO_SHOW.GetValue();
 	const vector<Difficulty> &vDifficultiesToShow = CommonMetrics::DIFFICULTIES_TO_SHOW.GetValue();
 	const vector<CourseDifficulty> &vCourseDifficultiesToShow = CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW.GetValue();
-	const bool bWriteSimpleValues = THEME->GetMetricB( "RadarValues", "WriteSimpleValues" );
+	const bool bWriteSimpleValues = RadarValues::WRITE_SIMPLE_VALIES;
-	const bool bWriteComplexValues = THEME->GetMetricB( "RadarValues", "WriteComplexValues" );
+	const bool bWriteComplexValues = RadarValues::WRITE_COMPLEX_VALIES;
 
 	{
 		XNode* pNode = xml.AppendChild( "Totals" );

stepmania/src/CommonMetrics.cpp

@@ -22,7 +22,7 @@ ThemeMetric<float>			CommonMetrics::TICK_EARLY_SECONDS		("ScreenGameplay","TickE
 ThemeMetric<RString>			CommonMetrics::DEFAULT_NOTESKIN_NAME		("Common","DefaultNoteSkinName");
 ThemeMetricDifficultiesToShow		CommonMetrics::DIFFICULTIES_TO_SHOW		("Common","DifficultiesToShow");
 ThemeMetricCourseDifficultiesToShow	CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW	("Common","CourseDifficultiesToShow");
-ThemeMetricStepsTypesToShow		CommonMetrics::STEPS_TYPES_TO_SHOW		("Common","StepsTypesToHide");
+ThemeMetricStepsTypesToShow		CommonMetrics::STEPS_TYPES_TO_SHOW		("Common","StepsTypesToHide");	// This metric takes a list of StepsTypes to hide and returns a list of StepsTypes to show
 ThemeMetric<bool>			CommonMetrics::ALL_STEPS_TYPES_IN_ONE_LIST	("Common","AllStepsTypeInOneList");
 
 

stepmania/src/HighScore.cpp

@@ -80,8 +80,8 @@ HighScoreImpl::HighScoreImpl()
 XNode *HighScoreImpl::CreateNode() const
 {
 	XNode *pNode = new XNode( "HighScore" );
-	const bool bWriteSimpleValues = THEME->GetMetricB( "RadarValues", "WriteSimpleValues" );
+	const bool bWriteSimpleValues = RadarValues::WRITE_SIMPLE_VALIES;
-	const bool bWriteComplexValues = THEME->GetMetricB( "RadarValues", "WriteComplexValues" );
+	const bool bWriteComplexValues = RadarValues::WRITE_COMPLEX_VALIES;
 
 	// TRICKY:  Don't write "name to fill in" markers.
 	pNode->AppendChild( "Name", IsRankingToFillIn(sName) ? RString("") : sName );

stepmania/src/RadarValues.cpp

@@ -5,6 +5,9 @@
 #include "XmlFile.h"
 #include "ThemeManager.h"
 
+ThemeMetric<bool> RadarValues::WRITE_SIMPLE_VALIES( "RadarValues", "WriteSimpleValues" );
+ThemeMetric<bool> RadarValues::WRITE_COMPLEX_VALIES( "RadarValues", "WriteComplexValues" );
+
 RadarValues::RadarValues()
 {
 	MakeUnknown();

stepmania/src/RadarValues.h

@@ -4,6 +4,7 @@
 #define RARAR_VALUES_H
 
 #include "GameConstantsAndTypes.h"
+#include "ThemeMetric.h"
 
 #define RADAR_VAL_UNKNOWN -1
 
@@ -65,6 +66,9 @@ struct RadarValues
 	RString ToString( int iMaxValues = -1 ) const; // default = all
 	void FromString( RString sValues );
 
+	static ThemeMetric<bool> WRITE_SIMPLE_VALIES;
+	static ThemeMetric<bool> WRITE_COMPLEX_VALIES;
+
 	// Lua
 	void PushSelf( lua_State *L );
 };