From 8ca885d8bd46fa653e0fb446f7456d532a3598c9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 26 Feb 2005 06:09:14 +0000 Subject: [PATCH] clean up INITIAL_BACKGROUND_BRIGHTNESS --- stepmania/Themes/default/metrics.ini | 7 +------ stepmania/src/ScreenGameplay.cpp | 6 ++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 9faecbf3a9..dc7a5c0ea0 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1035,12 +1035,7 @@ StaticBGY=SCREEN_CENTER_Y+0 StaticBGX=SCREEN_CENTER_X+0 PrevScreen=@SongSelectionScreen() NextScreen=@GetGameplayNextScreen() -InitialBackgroundBrightnessRegular=1 -InitialBackgroundBrightnessNonstop=1 -InitialBackgroundBrightnessOni=1 -InitialBackgroundBrightnessEndless=1 -InitialBackgroundBrightnessBattle=1 -InitialBackgroundBrightnessRave=1 +InitialBackgroundBrightness=1 BPMDisplayX=-1000 BPMDisplayY=-1000 BPMDisplayOnCommand=zoom,0 diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 03c9a71414..4f1a8f0cfa 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -57,10 +57,8 @@ #define EVAL_ON_FAIL THEME->GetMetricB(m_sName,"ShowEvaluationOnFail") #define SHOW_SCORE_IN_RAVE THEME->GetMetricB(m_sName,"ShowScoreInRave") #define SONG_POSITION_METER_WIDTH THEME->GetMetricF(m_sName,"SongPositionMeterWidth") -/* XXX: This is ugly; most people don't need to override this per-mode. This will - * go away eventually, once metrics can redirect to Lua calls. */ -#define INITIAL_BACKGROUND_BRIGHTNESS( play_mode ) THEME->GetMetricF(m_sName,"InitialBackgroundBrightness"+Capitalize(PlayModeToString(play_mode))) #define PLAYER_X( p, styleType ) THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str())) +static ThemeMetric INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","InitialBackgroundBrightness"); static ThemeMetric SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments"); static ThemeMetric TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); @@ -1062,7 +1060,7 @@ void ScreenGameplay::LoadNextSong() * black), or it might be 1, if the stage screen has the song BG and we're * coming from it (like Pump). This used to be done in SM_PlayReady, but * that means it's impossible to snap to the new brightness immediately. */ - m_Background.SetBrightness( INITIAL_BACKGROUND_BRIGHTNESS(GAMESTATE->m_PlayMode) ); + m_Background.SetBrightness( INITIAL_BACKGROUND_BRIGHTNESS ); m_Background.FadeToActualBrightness(); } }