cleanup
This commit is contained in:
@@ -32,7 +32,6 @@
|
|||||||
#define BANNER_WIDTH THEME->GetMetricF("ScreenSelectGroup","BannerWidth")
|
#define BANNER_WIDTH THEME->GetMetricF("ScreenSelectGroup","BannerWidth")
|
||||||
#define BANNER_HEIGHT THEME->GetMetricF("ScreenSelectGroup","BannerHeight")
|
#define BANNER_HEIGHT THEME->GetMetricF("ScreenSelectGroup","BannerHeight")
|
||||||
#define SLEEP_AFTER_TWEEN_OFF_SECONDS THEME->GetMetricF("ScreenSelectGroup","SleepAfterTweenOffSeconds")
|
#define SLEEP_AFTER_TWEEN_OFF_SECONDS THEME->GetMetricF("ScreenSelectGroup","SleepAfterTweenOffSeconds")
|
||||||
#define NEXT_SCREEN THEME->GetMetric ("ScreenSelectGroup","NextScreen")
|
|
||||||
|
|
||||||
|
|
||||||
ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuElements( sClassName )
|
ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuElements( sClassName )
|
||||||
@@ -148,13 +147,6 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ScreenSelectGroup::~ScreenSelectGroup()
|
|
||||||
{
|
|
||||||
LOG->Trace( "ScreenSelectGroup::~ScreenSelectGroup()" );
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ScreenSelectGroup::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
void ScreenSelectGroup::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenSelectGroup::Input()" );
|
LOG->Trace( "ScreenSelectGroup::Input()" );
|
||||||
@@ -176,17 +168,9 @@ void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
{
|
{
|
||||||
case SM_BeginFadingOut:
|
case SM_BeginFadingOut:
|
||||||
StartTransitioning( SM_GoToNextScreen );
|
StartTransitioning( SM_GoToNextScreen );
|
||||||
break;
|
return;
|
||||||
case SM_MenuTimer:
|
|
||||||
MenuStart(PLAYER_1);
|
|
||||||
break;
|
|
||||||
case SM_GoToPrevScreen:
|
|
||||||
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
|
|
||||||
break;
|
|
||||||
case SM_GoToNextScreen:
|
|
||||||
SCREENMAN->SetNewScreen( NEXT_SCREEN );
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
Screen::HandleScreenMessage( SM );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenSelectGroup::AfterChange()
|
void ScreenSelectGroup::AfterChange()
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ class ScreenSelectGroup : public ScreenWithMenuElements
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenSelectGroup( CString sName );
|
ScreenSelectGroup( CString sName );
|
||||||
virtual ~ScreenSelectGroup();
|
|
||||||
|
|
||||||
virtual void DrawPrimitives();
|
virtual void DrawPrimitives();
|
||||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||||
|
|||||||
Reference in New Issue
Block a user