set all lights modes in metrics (except for a couple programmatic ones

for now)
This commit is contained in:
Glenn Maynard
2007-06-14 13:38:26 +00:00
parent d1f0b1719e
commit 7f08da77f1
8 changed files with 1 additions and 26 deletions
+1 -3
View File
@@ -218,9 +218,7 @@ void Screen::HandleScreenMessage( const ScreenMessage SM )
if( REPEAT_DELAY != -1.0f ) if( REPEAT_DELAY != -1.0f )
INPUTFILTER->SetRepeatDelay( REPEAT_DELAY ); INPUTFILTER->SetRepeatDelay( REPEAT_DELAY );
LightsMode lm = LIGHTS_MODE; LIGHTSMAN->SetLightsMode( LIGHTS_MODE );
if( lm != LightsMode_Invalid ) // leave alone
LIGHTSMAN->SetLightsMode( lm );
} }
else if( SM == SM_LoseFocus ) else if( SM == SM_LoseFocus )
{ {
-1
View File
@@ -183,7 +183,6 @@ void ScreenEvaluation::Init()
LOG->Trace( "ScreenEvaluation::Init()" ); LOG->Trace( "ScreenEvaluation::Init()" );
m_pStageStats = &STATSMAN->m_vPlayedStageStats.back(); m_pStageStats = &STATSMAN->m_vPlayedStageStats.back();
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
ZERO( m_bSavedScreenshot ); ZERO( m_bSavedScreenshot );
-5
View File
@@ -365,11 +365,6 @@ void ScreenGameplay::Init()
if( !GAMESTATE->m_bDemonstrationOrJukebox ) if( !GAMESTATE->m_bDemonstrationOrJukebox )
MEMCARDMAN->PauseMountingThread(); MEMCARDMAN->PauseMountingThread();
if( GAMESTATE->m_bDemonstrationOrJukebox )
LIGHTSMAN->SetLightsMode( LIGHTSMODE_DEMONSTRATION );
else
LIGHTSMAN->SetLightsMode( LIGHTSMODE_GAMEPLAY );
m_pSoundMusic = NULL; m_pSoundMusic = NULL;
m_bPaused = false; m_bPaused = false;
-4
View File
@@ -7,7 +7,6 @@
#include "GameState.h" #include "GameState.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "GameCommand.h" #include "GameCommand.h"
#include "LightsManager.h"
#include "InputEventPlus.h" #include "InputEventPlus.h"
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
@@ -64,9 +63,6 @@ void ScreenSelect::BeginScreen()
m_timerIdleComment.GetDeltaTime(); m_timerIdleComment.GetDeltaTime();
m_timerIdleTimeout.GetDeltaTime(); m_timerIdleTimeout.GetDeltaTime();
// derived classes can override if they want
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
} }
-3
View File
@@ -18,7 +18,6 @@
#include "ProfileManager.h" #include "ProfileManager.h"
#include "Profile.h" #include "Profile.h"
#include "MenuTimer.h" #include "MenuTimer.h"
#include "LightsManager.h"
#include "StatsManager.h" #include "StatsManager.h"
#include "StepsUtil.h" #include "StepsUtil.h"
#include "Foreach.h" #include "Foreach.h"
@@ -174,8 +173,6 @@ void ScreenSelectMusic::Init()
void ScreenSelectMusic::BeginScreen() void ScreenSelectMusic::BeginScreen()
{ {
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
if( CommonMetrics::AUTO_SET_STYLE ) if( CommonMetrics::AUTO_SET_STYLE )
{ {
vector<StepsType> vst; vector<StepsType> vst;
-3
View File
@@ -8,7 +8,6 @@
#include "GameState.h" #include "GameState.h"
#include "AnnouncerManager.h" #include "AnnouncerManager.h"
#include "ActorUtil.h" #include "ActorUtil.h"
#include "LightsManager.h"
#include "CommonMetrics.h" #include "CommonMetrics.h"
#include "LocalizedString.h" #include "LocalizedString.h"
#include "InputEventPlus.h" #include "InputEventPlus.h"
@@ -22,8 +21,6 @@ REGISTER_SCREEN_CLASS( ScreenSelectStyle );
void ScreenSelectStyle::Init() void ScreenSelectStyle::Init()
{ {
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
ScreenSelect::Init(); ScreenSelect::Init();
m_iSelection = 0; m_iSelection = 0;
-3
View File
@@ -8,7 +8,6 @@
#include "GameState.h" #include "GameState.h"
#include "GameSoundManager.h" #include "GameSoundManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "LightsManager.h"
#define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay") #define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay")
@@ -24,8 +23,6 @@ void ScreenStage::Init()
SOUND->StopMusic(); SOUND->StopMusic();
LIGHTSMAN->SetLightsMode( LIGHTSMODE_STAGE );
m_sprOverlay.Load( THEME->GetPathB(m_sName,"overlay") ); m_sprOverlay.Load( THEME->GetPathB(m_sName,"overlay") );
m_sprOverlay->SetName( "Overlay" ); m_sprOverlay->SetName( "Overlay" );
m_sprOverlay->SetDrawOrder( DRAW_ORDER_OVERLAY ); m_sprOverlay->SetDrawOrder( DRAW_ORDER_OVERLAY );
-4
View File
@@ -9,7 +9,6 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "GameSoundManager.h" #include "GameSoundManager.h"
#include "CodeDetector.h" #include "CodeDetector.h"
#include "LightsManager.h"
#include "Game.h" #include "Game.h"
#include "InputMapper.h" #include "InputMapper.h"
#include "InputEventPlus.h" #include "InputEventPlus.h"
@@ -27,9 +26,6 @@ ScreenTitleMenu::ScreenTitleMenu()
* things stinks ... */ * things stinks ... */
GAMESTATE->Reset(); GAMESTATE->Reset();
// TRICKY: Do this after GameState::Reset.
LIGHTSMAN->SetLightsMode( LIGHTSMODE_JOINING );
this->SubscribeToMessage( GamePreferences::m_CoinMode.GetName()+"Changed" ); this->SubscribeToMessage( GamePreferences::m_CoinMode.GetName()+"Changed" );
} }