set all lights modes in metrics (except for a couple programmatic ones
for now)
This commit is contained in:
@@ -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 )
|
||||
{
|
||||
|
||||
@@ -183,7 +183,6 @@ void ScreenEvaluation::Init()
|
||||
LOG->Trace( "ScreenEvaluation::Init()" );
|
||||
|
||||
m_pStageStats = &STATSMAN->m_vPlayedStageStats.back();
|
||||
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
|
||||
|
||||
ZERO( m_bSavedScreenshot );
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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<StepsType> vst;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 );
|
||||
|
||||
@@ -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" );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user