From 3c5e4c6af8636ecc5d10884204dec05e1f62bd54 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 8 May 2004 06:19:14 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenSelectCourse.cpp | 9 +--------
 stepmania/src/ScreenSelectMusic.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp
index 486818d09d..ea351ca6be 100644
--- a/stepmania/src/ScreenSelectCourse.cpp
+++ b/stepmania/src/ScreenSelectCourse.cpp
@@ -292,14 +292,7 @@ void ScreenSelectCourse::HandleScreenMessage( const ScreenMessage SM )
 	case SM_AllowOptionsMenuRepeat:
 		m_bAllowOptionsMenuRepeat = true;
 		break;
-	case SM_MenuTimer:
-		MenuStart(PLAYER_1);
-		break;
-	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
-		break;
 	case SM_GoToNextScreen:
-
 		// find out if the Next button is being held down on any of the pads
 		bool bIsHoldingNext;
 		bIsHoldingNext = false;
@@ -316,7 +309,7 @@ void ScreenSelectCourse::HandleScreenMessage( const ScreenMessage SM )
 		else
 			SCREENMAN->SetNewScreen( "ScreenStage" );
 
-		break;
+		return;
 	case SM_SongChanged:
 		AfterCourseChange();
 		break;
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index d12f1716c5..627276e853 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -979,14 +979,14 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 				m_MusicWheel.StartRandom();
 			MenuStart(PLAYER_INVALID);
 		}
-		break;
+		return;
 	case SM_GoToPrevScreen:
 		SCREENMAN->SetNewScreen( PREV_SCREEN );
 		/* We may have stray SM_SongChanged messages from the music wheel.  We can't
 		 * handle them anymore, since the title menu (and attract screens) reset
 		 * the game state, so just discard them. */
 		ClearMessageQueue();
-		break;
+		return;
 	case SM_BeginFadingOut:
 		/* XXX: yuck.  Later on, maybe this can be done in one BGA with lua ... */
 		if( m_bGoToOptions )
@@ -1005,7 +1005,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 			SOUND->StopMusic();
 			SCREENMAN->SetNewScreen( NEXT_SCREEN );
 		}
-		break;
+		return;
 	case SM_SongChanged:
 		AfterMusicChange();
 		break;