From 5a27d51068425e90c8d952b94e807f4588d13412 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 12 Feb 2003 00:41:56 +0000
Subject: [PATCH] fix options menu when in arcade input style

---
 stepmania/src/ScreenOptions.cpp     | 4 ++++
 stepmania/src/ScreenOptions.h       | 6 ++++--
 stepmania/src/ScreenOptionsMenu.cpp | 6 ++++++
 stepmania/src/ScreenOptionsMenu.h   | 3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 481026f8c0..214aabd00b 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -458,6 +458,10 @@ void ScreenOptions::MenuBack( PlayerNumber pn )
 	m_Wipe.CloseWipingLeft( SM_GoToPrevScreen );
 }
 
+void ScreenOptions::StartGoToNextState()
+{
+	this->SendScreenMessage( SM_TweenOffScreen, 0 );
+}
 
 void ScreenOptions::MenuStart( PlayerNumber pn )
 {
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index f3b6c66a8a..a81c706bb5 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -66,8 +66,10 @@ protected:
 	void UpdateEnabledDisabled();
 	virtual void OnChange();
 
-	void MenuBack( PlayerNumber pn );
-	void MenuStart( PlayerNumber pn );
+	virtual void MenuBack( PlayerNumber pn );
+	virtual void MenuStart( PlayerNumber pn );
+
+	void StartGoToNextState();
 
 	virtual void GoToNextState() = 0;
 	virtual void GoToPrevState() = 0;
diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp
index b5156ef1d0..567eb793ab 100644
--- a/stepmania/src/ScreenOptionsMenu.cpp
+++ b/stepmania/src/ScreenOptionsMenu.cpp
@@ -72,6 +72,12 @@ ScreenOptionsMenu::ScreenOptionsMenu() :
 	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","options menu music") );
 }
 
+/* We depend on the SM options navigation for this screen, not arcade. */
+void ScreenOptionsMenu::MenuStart( PlayerNumber pn )
+{
+	StartGoToNextState();
+}
+
 void ScreenOptionsMenu::ImportOptions()
 {
 }
diff --git a/stepmania/src/ScreenOptionsMenu.h b/stepmania/src/ScreenOptionsMenu.h
index 82d8bf33a0..de4dca78aa 100644
--- a/stepmania/src/ScreenOptionsMenu.h
+++ b/stepmania/src/ScreenOptionsMenu.h
@@ -23,6 +23,9 @@ class ScreenOptionsMenu : public ScreenOptions
 public:
 	ScreenOptionsMenu();
 
+protected:
+	void MenuStart( PlayerNumber pn );
+
 private:
 	void ImportOptions();
 	void ExportOptions();