commenting and such... things coming up

This commit is contained in:
AJ Kelly
2011-02-21 03:57:23 -06:00
parent b095069d7f
commit 59b186d72f
2 changed files with 17 additions and 9 deletions
+7 -7
View File
@@ -8,15 +8,16 @@
#include "ProductInfo.h" #include "ProductInfo.h"
#include "LuaManager.h" #include "LuaManager.h"
ThemeMetric<RString> CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen"); //ThemeMetric<RString> CommonMetrics::OPERATOR_MENU_SCREEN ("Common","OperatorMenuScreen");
ThemeMetric<RString> CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" ); ThemeMetric<RString> CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen");
LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle"); ThemeMetric<RString> CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" );
LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle");
ThemeMetric<int> CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious"); ThemeMetric<int> CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious");
ThemeMetric<float> CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); ThemeMetric<float> CommonMetrics::TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
ThemeMetric<RString> CommonMetrics::DEFAULT_NOTESKIN_NAME ("Common","DefaultNoteSkinName"); ThemeMetric<RString> CommonMetrics::DEFAULT_NOTESKIN_NAME ("Common","DefaultNoteSkinName");
ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow"); ThemeMetricDifficultiesToShow CommonMetrics::DIFFICULTIES_TO_SHOW ("Common","DifficultiesToShow");
ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow"); ThemeMetricCourseDifficultiesToShow CommonMetrics::COURSE_DIFFICULTIES_TO_SHOW ("Common","CourseDifficultiesToShow");
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 ThemeMetricStepsTypesToShow CommonMetrics::STEPS_TYPES_TO_SHOW ("Common","StepsTypesToHide");
ThemeMetric<bool> CommonMetrics::AUTO_SET_STYLE ("Common","AutoSetStyle"); ThemeMetric<bool> CommonMetrics::AUTO_SET_STYLE ("Common","AutoSetStyle");
ThemeMetric<int> CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES ("Common","PercentScoreDecimalPlaces"); ThemeMetric<int> CommonMetrics::PERCENT_SCORE_DECIMAL_PLACES ("Common","PercentScoreDecimalPlaces");
@@ -79,7 +80,6 @@ void ThemeMetricCourseDifficultiesToShow::Read()
} }
const vector<CourseDifficulty>& ThemeMetricCourseDifficultiesToShow::GetValue() const { return m_v; } const vector<CourseDifficulty>& ThemeMetricCourseDifficultiesToShow::GetValue() const { return m_v; }
static void RemoveStepsTypes( vector<StepsType>& inout, RString sStepsTypesToRemove ) static void RemoveStepsTypes( vector<StepsType>& inout, RString sStepsTypesToRemove )
{ {
vector<RString> v; vector<RString> v;
+10 -2
View File
@@ -45,9 +45,13 @@ private:
/** @brief The common metrics that are used throughout. */ /** @brief The common metrics that are used throughout. */
namespace CommonMetrics namespace CommonMetrics
{ {
/** @brief The first screen in the attract loop. */
extern ThemeMetric<RString> FIRST_ATTRACT_SCREEN; extern ThemeMetric<RString> FIRST_ATTRACT_SCREEN;
/** @brief The screen that appears when pressing the operator button. */
//extern ThemeMetric<RString> OPERATOR_MENU_SCREEN;
/** @brief The default modifiers to apply. */
extern ThemeMetric<RString> DEFAULT_MODIFIERS; extern ThemeMetric<RString> DEFAULT_MODIFIERS;
/** @brief the phrase that appears on the title bar. */ /** @brief The caption on the title bar. */
extern LocalizedString WINDOW_TITLE; extern LocalizedString WINDOW_TITLE;
/** @brief How many entries should be shown before showing "Various" instead. */ /** @brief How many entries should be shown before showing "Various" instead. */
extern ThemeMetric<int> MAX_COURSE_ENTRIES_BEFORE_VARIOUS; extern ThemeMetric<int> MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
@@ -59,7 +63,11 @@ namespace CommonMetrics
extern ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW; extern ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW;
/** @brief Which course difficulties are to be shown? */ /** @brief Which course difficulties are to be shown? */
extern ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW; extern ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW;
/** @brief Which step types are to be shown? */ /**
* @brief Which step types are to be shown?
*
* This metric (StepsTypesToHide) takes a list of StepsTypes to hide and
* returns a list of StepsTypes to show. */
extern ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW; extern ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW;
/** @brief Does the player need to explicitly set a style? */ /** @brief Does the player need to explicitly set a style? */
extern ThemeMetric<bool> AUTO_SET_STYLE; extern ThemeMetric<bool> AUTO_SET_STYLE;