unneeded

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 );
 }
 

stepmania/src/ScreenPlayerOptions.h

@@ -4,8 +4,6 @@
 #include "ScreenOptionsMaster.h"
 struct lua_State;
 
-AutoScreenMessage( SM_BackFromPlayerOptions )
-
 class ScreenPlayerOptions : public ScreenOptionsMaster
 {
 public:

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.

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 );