From 841b888ba5ae723cd74f3499720f45498ba09054 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 8 May 2004 06:26:24 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenInstructions.cpp | 16 ----------------
 stepmania/src/ScreenInstructions.h   |  1 -
 stepmania/src/ScreenSelect.cpp       | 15 +++------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp
index 847ec09421..bdd017e5c1 100644
--- a/stepmania/src/ScreenInstructions.cpp
+++ b/stepmania/src/ScreenInstructions.cpp
@@ -81,22 +81,6 @@ void ScreenInstructions::Input( const DeviceInput& DeviceI, const InputEventType
 	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
 
-void ScreenInstructions::HandleScreenMessage( const ScreenMessage SM )
-{
-	switch( SM )
-	{
-	case SM_MenuTimer:
-		this->MenuStart(PLAYER_1);
-		break;
-	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( PREV_SCREEN );		
-		break;
-	case SM_GoToNextScreen:
-		SCREENMAN->SetNewScreen( NEXT_SCREEN );
-		break;
-	}
-}
-
 void ScreenInstructions::MenuBack( PlayerNumber pn )
 {
 	Back( SM_GoToPrevScreen );
diff --git a/stepmania/src/ScreenInstructions.h b/stepmania/src/ScreenInstructions.h
index 33c8ba3c99..859d3e48ff 100644
--- a/stepmania/src/ScreenInstructions.h
+++ b/stepmania/src/ScreenInstructions.h
@@ -22,7 +22,6 @@ public:
 	ScreenInstructions( CString sName );
 
 	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 MenuBack( PlayerNumber pn );
 	virtual void MenuStart( PlayerNumber pn );
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 7b43aaea1c..518d0ed66b 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -212,17 +212,6 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 		if( !IsTransitioning() )
 			StartTransitioning( SM_GoToNextScreen );
 		break;
-	case SM_MenuTimer:
-		{
-			for( int p=0; p<NUM_PLAYERS; p++ )
-				if( GAMESTATE->IsHumanPlayer(p) )
-					MenuStart( (PlayerNumber)p );
-		}
-		break;
-	case SM_GoToPrevScreen:
-		SOUND->StopMusic();
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
-		break;
 	case SM_GoToNextScreen:
 		{
 			/* Apply here, not in SM_AllDoneChoosing, because applying can take a very
@@ -238,8 +227,10 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 			else
 				SCREENMAN->SetNewScreen( NEXT_SCREEN(iSelectionIndex) );
 		}
-		break;
+		return;
 	}
+
+	Screen::HandleScreenMessage( SM );
 }
 
 void ScreenSelect::MenuBack( PlayerNumber pn )