From a37a18aadaf67b91eef416a8970935f079655965 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 18 Jul 2005 02:42:26 +0000
Subject: [PATCH] unneeded

---
 stepmania/src/ScreenPlayerOptions.cpp | 17 -----------------
 stepmania/src/ScreenPlayerOptions.h   |  2 --
 stepmania/src/ScreenSongOptions.cpp   | 22 ----------------------
 stepmania/src/ScreenSongOptions.h     |  3 ---
 4 files changed, 44 deletions(-)

diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 7e8cd76a7a..d4abaeeedd 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -141,23 +141,6 @@ void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM )
 		}
 	}
 
-	if( SM == SM_GoToNextScreen )
-	{
-		if( SCREENMAN->IsStackedScreen(this) )
-		{
-			SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
-			return;
-		}
-	}
-	else if( SM == SM_GoToPrevScreen )
-	{
-		if( SCREENMAN->IsStackedScreen(this) )
-		{
-			SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
-			return;
-		}
-	}
-
 	ScreenOptionsMaster::HandleScreenMessage( SM );
 }
 
diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h
index 5519a27b96..89315b14fe 100644
--- a/stepmania/src/ScreenPlayerOptions.h
+++ b/stepmania/src/ScreenPlayerOptions.h
@@ -4,8 +4,6 @@
 #include "ScreenOptionsMaster.h"
 struct lua_State;
 
-AutoScreenMessage( SM_BackFromPlayerOptions )
-
 class ScreenPlayerOptions : public ScreenOptionsMaster
 {
 public:
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index aecbbdaeef..526362aad0 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -36,28 +36,6 @@ void ScreenSongOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpn
 		GAMESTATE->m_bChangedFailTypeOnScreenSongOptions = true;
 }
 
-void ScreenSongOptions::HandleScreenMessage( const ScreenMessage SM )
-{
-	if( SM == SM_GoToNextScreen )
-	{
-		if( SCREENMAN->IsStackedScreen(this) )
-		{
-			SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
-			return;
-		}
-	}
-	else if( SM == SM_GoToPrevScreen )
-	{
-		if( SCREENMAN->IsStackedScreen(this) )
-		{
-			SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
-			return;
-		}
-	}
-
-	ScreenOptionsMaster::HandleScreenMessage( SM );
-}
-
 /*
  * (c) 2001-2004 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/ScreenSongOptions.h b/stepmania/src/ScreenSongOptions.h
index f76fa02d20..02690b4b37 100644
--- a/stepmania/src/ScreenSongOptions.h
+++ b/stepmania/src/ScreenSongOptions.h
@@ -3,14 +3,11 @@
 
 #include "ScreenOptionsMaster.h"
 
-AutoScreenMessage( SM_BackFromSongOptions )
-
 class ScreenSongOptions : public ScreenOptionsMaster
 {
 public:
 	ScreenSongOptions( CString sName );
 	virtual void Init();
-	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 private:
 	virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );