DynamicThemeMetric -> ThemeMetric

This commit is contained in:
Glenn Maynard
2007-04-10 17:51:21 +00:00
parent c81013a321
commit eac521e34a
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
static RString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); }
DynamicThemeMetric<RString> CommonMetrics::INITIAL_SCREEN ("Common","InitialScreen");
ThemeMetric<RString> CommonMetrics::INITIAL_SCREEN ("Common","InitialScreen");
ThemeMetric<RString> CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen");
ThemeMetric<RString> CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" );
ThemeMetric<RString> CommonMetrics::DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" );
+1 -1
View File
@@ -50,7 +50,7 @@ private:
//
namespace CommonMetrics
{
extern DynamicThemeMetric<RString> INITIAL_SCREEN;
extern ThemeMetric<RString> INITIAL_SCREEN;
extern ThemeMetric<RString> FIRST_ATTRACT_SCREEN;
extern ThemeMetric<RString> DEFAULT_MODIFIERS;
extern ThemeMetric<RString> DEFAULT_CPU_MODIFIERS;
+2 -2
View File
@@ -97,8 +97,8 @@ Song* GameState::GetDefaultSong() const
static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1");
static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2");
static DynamicThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" );
static DynamicThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" );
static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED( "GameState","AreStagePlayerModsForced" );
static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED( "GameState","AreStageSongModsForced" );
static Preference<Premium> g_Premium( "Premium", Premium_Off );