cleanup
This commit is contained in:
@@ -70,17 +70,6 @@ void ScreenBookkeeping::Input( const DeviceInput& DeviceI, const InputEventType
|
||||
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); // default handler
|
||||
}
|
||||
|
||||
void ScreenBookkeeping::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
switch( SM )
|
||||
{
|
||||
case SM_GoToNextScreen:
|
||||
case SM_GoToPrevScreen:
|
||||
SCREENMAN->SetNewScreen( "ScreenOptionsMenu" );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenBookkeeping::MenuLeft( PlayerNumber pn )
|
||||
{
|
||||
m_View = (View)(m_View-1);
|
||||
|
||||
@@ -20,7 +20,6 @@ public:
|
||||
|
||||
virtual void Update( float fDelta );
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
virtual void MenuLeft( PlayerNumber pn );
|
||||
virtual void MenuRight( PlayerNumber pn );
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
|
||||
|
||||
#define SECONDS_TO_SHOW THEME->GetMetricF(m_sName,"SecondsToShow")
|
||||
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
|
||||
#define ALLOW_STYLE_TYPES THEME->GetMetric (m_sName,"AllowStyleTypes")
|
||||
|
||||
REGISTER_SCREEN_CLASS( ScreenDemonstration );
|
||||
@@ -94,8 +93,6 @@ void ScreenDemonstration::HandleScreenMessage( const ScreenMessage SM )
|
||||
if( m_pSoundMusic )
|
||||
m_pSoundMusic->Stop();
|
||||
SOUNDMAN->SetPrefs( PREFSMAN->GetSoundVolume() ); // turn volume back on
|
||||
SCREENMAN->SetNewScreen( NEXT_SCREEN );
|
||||
return;
|
||||
}
|
||||
|
||||
ScreenJukebox::HandleScreenMessage( SM );
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
#include "ScreenTextEntry.h"
|
||||
#include "ScreenPrompt.h"
|
||||
|
||||
#define PREV_SCREEN THEME->GetMetric(m_sName,"PrevScreen")
|
||||
#define EXPLANATION_TEXT( row ) THEME->GetMetric(m_sName,"Explanation"+EditMenuRowToString(row))
|
||||
|
||||
AutoScreenMessage( SM_RefreshSelector )
|
||||
@@ -86,14 +85,6 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
|
||||
m_Selector.RefreshAll();
|
||||
RefreshNumStepsLoadedFromProfile();
|
||||
}
|
||||
else if( SM == SM_GoToPrevScreen )
|
||||
{
|
||||
SCREENMAN->SetNewScreen( PREV_SCREEN );
|
||||
}
|
||||
else if( SM == SM_GoToNextScreen )
|
||||
{
|
||||
SCREENMAN->SetNewScreen( "ScreenEdit" );
|
||||
}
|
||||
else if( SM == SM_Success )
|
||||
{
|
||||
LOG->Trace( "Delete successful; deleting steps from memory" );
|
||||
@@ -111,6 +102,8 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
|
||||
StartTransitioning( SM_GoToNextScreen );
|
||||
}
|
||||
}
|
||||
|
||||
ScreenWithMenuElements::HandleScreenMessage( SM );
|
||||
}
|
||||
|
||||
void ScreenEditMenu::MenuUp( PlayerNumber pn )
|
||||
|
||||
@@ -274,8 +274,6 @@ void ScreenJukebox::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
if( m_pSoundMusic )
|
||||
m_pSoundMusic->Stop();
|
||||
SCREENMAN->SetNewScreen( "ScreenJukebox" );
|
||||
return;
|
||||
}
|
||||
else if( SM == SM_GoToStartScreen )
|
||||
{
|
||||
|
||||
@@ -121,17 +121,6 @@ void ScreenTestInput::Input( const DeviceInput& DeviceI, const InputEventType ty
|
||||
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); // default handler
|
||||
}
|
||||
|
||||
void ScreenTestInput::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
switch( SM )
|
||||
{
|
||||
case SM_GoToNextScreen:
|
||||
case SM_GoToPrevScreen:
|
||||
SCREENMAN->SetNewScreen( "ScreenOptionsMenu" );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenTestInput::MenuStart( PlayerNumber pn )
|
||||
{
|
||||
MenuBack(pn);
|
||||
|
||||
@@ -16,7 +16,6 @@ public:
|
||||
|
||||
virtual void Update( float fDelta );
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
virtual void MenuStart( PlayerNumber pn );
|
||||
virtual void MenuBack( PlayerNumber pn );
|
||||
|
||||
@@ -100,9 +100,7 @@ void ScreenTestLights::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
switch( SM )
|
||||
{
|
||||
case SM_GoToNextScreen:
|
||||
case SM_GoToPrevScreen:
|
||||
SCREENMAN->SetNewScreen( "ScreenOptionsMenu" );
|
||||
case SM_LoseFocus:
|
||||
LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -201,10 +201,6 @@ void ScreenTestSound::Input( const DeviceInput& DeviceI, const InputEventType ty
|
||||
}
|
||||
|
||||
}
|
||||
void ScreenTestSound::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
Screen::HandleScreenMessage( SM );
|
||||
}
|
||||
|
||||
/*
|
||||
* (c) 2003 Glenn Maynard
|
||||
|
||||
@@ -15,7 +15,6 @@ public:
|
||||
~ScreenTestSound();
|
||||
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
void Update(float f);
|
||||
void UpdateText(int n);
|
||||
|
||||
Reference in New Issue
Block a user