From 7f08da77f1b400891a2f0d7f6aa24a8c94e41fa0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Jun 2007 13:38:26 +0000 Subject: [PATCH] set all lights modes in metrics (except for a couple programmatic ones for now) --- stepmania/src/Screen.cpp | 4 +--- stepmania/src/ScreenEvaluation.cpp | 1 - stepmania/src/ScreenGameplay.cpp | 5 ----- stepmania/src/ScreenSelect.cpp | 4 ---- stepmania/src/ScreenSelectMusic.cpp | 3 --- stepmania/src/ScreenSelectStyle.cpp | 3 --- stepmania/src/ScreenStage.cpp | 3 --- stepmania/src/ScreenTitleMenu.cpp | 4 ---- 8 files changed, 1 insertion(+), 26 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 3c1c7d032c..7c98d349a5 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -218,9 +218,7 @@ void Screen::HandleScreenMessage( const ScreenMessage SM ) if( REPEAT_DELAY != -1.0f ) INPUTFILTER->SetRepeatDelay( REPEAT_DELAY ); - LightsMode lm = LIGHTS_MODE; - if( lm != LightsMode_Invalid ) // leave alone - LIGHTSMAN->SetLightsMode( lm ); + LIGHTSMAN->SetLightsMode( LIGHTS_MODE ); } else if( SM == SM_LoseFocus ) { diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 309fd96d55..ddb8dd4642 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -183,7 +183,6 @@ void ScreenEvaluation::Init() LOG->Trace( "ScreenEvaluation::Init()" ); m_pStageStats = &STATSMAN->m_vPlayedStageStats.back(); - LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU ); ZERO( m_bSavedScreenshot ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index a0016ef5fe..26b6d81bd6 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -365,11 +365,6 @@ void ScreenGameplay::Init() if( !GAMESTATE->m_bDemonstrationOrJukebox ) MEMCARDMAN->PauseMountingThread(); - if( GAMESTATE->m_bDemonstrationOrJukebox ) - LIGHTSMAN->SetLightsMode( LIGHTSMODE_DEMONSTRATION ); - else - LIGHTSMAN->SetLightsMode( LIGHTSMODE_GAMEPLAY ); - m_pSoundMusic = NULL; m_bPaused = false; diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index c9d07c7dca..3b5616da3d 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -7,7 +7,6 @@ #include "GameState.h" #include "ThemeManager.h" #include "GameCommand.h" -#include "LightsManager.h" #include "InputEventPlus.h" #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") @@ -64,9 +63,6 @@ void ScreenSelect::BeginScreen() m_timerIdleComment.GetDeltaTime(); m_timerIdleTimeout.GetDeltaTime(); - - // derived classes can override if they want - LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU ); } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 235781b5b5..ca8f8dcdef 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -18,7 +18,6 @@ #include "ProfileManager.h" #include "Profile.h" #include "MenuTimer.h" -#include "LightsManager.h" #include "StatsManager.h" #include "StepsUtil.h" #include "Foreach.h" @@ -174,8 +173,6 @@ void ScreenSelectMusic::Init() void ScreenSelectMusic::BeginScreen() { - LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU ); - if( CommonMetrics::AUTO_SET_STYLE ) { vector vst; diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index c52b03840a..a0beb80173 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -8,7 +8,6 @@ #include "GameState.h" #include "AnnouncerManager.h" #include "ActorUtil.h" -#include "LightsManager.h" #include "CommonMetrics.h" #include "LocalizedString.h" #include "InputEventPlus.h" @@ -22,8 +21,6 @@ REGISTER_SCREEN_CLASS( ScreenSelectStyle ); void ScreenSelectStyle::Init() { - LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU ); - ScreenSelect::Init(); m_iSelection = 0; diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index c3c7691b82..9b03572668 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -8,7 +8,6 @@ #include "GameState.h" #include "GameSoundManager.h" #include "ThemeManager.h" -#include "LightsManager.h" #define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay") @@ -24,8 +23,6 @@ void ScreenStage::Init() SOUND->StopMusic(); - LIGHTSMAN->SetLightsMode( LIGHTSMODE_STAGE ); - m_sprOverlay.Load( THEME->GetPathB(m_sName,"overlay") ); m_sprOverlay->SetName( "Overlay" ); m_sprOverlay->SetDrawOrder( DRAW_ORDER_OVERLAY ); diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 4dffa6b6b8..24fb32fe5e 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -9,7 +9,6 @@ #include "ThemeManager.h" #include "GameSoundManager.h" #include "CodeDetector.h" -#include "LightsManager.h" #include "Game.h" #include "InputMapper.h" #include "InputEventPlus.h" @@ -27,9 +26,6 @@ ScreenTitleMenu::ScreenTitleMenu() * things stinks ... */ GAMESTATE->Reset(); - // TRICKY: Do this after GameState::Reset. - LIGHTSMAN->SetLightsMode( LIGHTSMODE_JOINING ); - this->SubscribeToMessage( GamePreferences::m_CoinMode.GetName()+"Changed" ); }