From 7258f57c63b7e4e5afa8de8b61222f4ebe491fc4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 8 May 2004 06:43:06 +0000 Subject: [PATCH] cleanup --- stepmania/src/ScreenSelectGroup.cpp | 20 ++------------------ stepmania/src/ScreenSelectGroup.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 2f8e27f9f5..695a1c4df7 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -32,7 +32,6 @@ #define BANNER_WIDTH THEME->GetMetricF("ScreenSelectGroup","BannerWidth") #define BANNER_HEIGHT THEME->GetMetricF("ScreenSelectGroup","BannerHeight") #define SLEEP_AFTER_TWEEN_OFF_SECONDS THEME->GetMetricF("ScreenSelectGroup","SleepAfterTweenOffSeconds") -#define NEXT_SCREEN THEME->GetMetric ("ScreenSelectGroup","NextScreen") 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 ) { LOG->Trace( "ScreenSelectGroup::Input()" ); @@ -176,17 +168,9 @@ void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM ) { case SM_BeginFadingOut: StartTransitioning( SM_GoToNextScreen ); - break; - case SM_MenuTimer: - MenuStart(PLAYER_1); - break; - case SM_GoToPrevScreen: - SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); - break; - case SM_GoToNextScreen: - SCREENMAN->SetNewScreen( NEXT_SCREEN ); - break; + return; } + Screen::HandleScreenMessage( SM ); } void ScreenSelectGroup::AfterChange() diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h index 529cb06ac8..d6c2ce08ff 100644 --- a/stepmania/src/ScreenSelectGroup.h +++ b/stepmania/src/ScreenSelectGroup.h @@ -21,7 +21,6 @@ class ScreenSelectGroup : public ScreenWithMenuElements { public: ScreenSelectGroup( CString sName ); - virtual ~ScreenSelectGroup(); virtual void DrawPrimitives(); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );