From ddd9b78af5dd1d42c438c3494aa2c16b8fd2e99e Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 2 Dec 2003 09:15:35 +0000
Subject: [PATCH] rename "AllSorts" code to "Menu"

---
 stepmania/Themes/default/metrics.ini | 4 ++--
 stepmania/src/CodeDetector.cpp       | 8 ++++----
 stepmania/src/CodeDetector.h         | 6 +++---
 stepmania/src/ScreenSelectMusic.cpp  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 5369c126e6..62b91d17cd 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2025,8 +2025,8 @@ Harder1=Down,Down
 Harder2=MenuDown,MenuDown
 NextSort1=MenuLeft-MenuRight-Start
 NextSort2=MenuLeft+MenuRight
-AllSorts1=Up,Down,Up,Down
-AllSorts2=MenuUp,MenuDown,MenuUp,MenuDown
+Menu1=Up,Down,Up,Down
+Menu2=MenuUp,MenuDown,MenuUp,MenuDown
 Mirror=Up,Left,Right,Left,Right
 Left=Up,Down,Right,Left
 Right=Up,Down,Left,Right
diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index 70a0e8868e..873ccaab85 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -29,8 +29,8 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = {
 	"Harder2",
 	"NextSort1",
 	"NextSort2",
-	"AllSorts1",
-	"AllSorts2",
+	"Menu1",
+	"Menu2",
 	"Mirror",
 	"Left",
 	"Right",
@@ -209,9 +209,9 @@ bool CodeDetector::EnteredNextSort( GameController controller )
 	return EnteredCode(controller,CODE_NEXT_SORT1) || EnteredCode(controller,CODE_NEXT_SORT2);
 }
 
-bool CodeDetector::EnteredAllSorts( GameController controller )
+bool CodeDetector::EnteredMenu( GameController controller )
 {
-	return EnteredCode(controller,CODE_ALL_SORTS1) || EnteredCode(controller,CODE_ALL_SORTS2);
+	return EnteredCode(controller,CODE_MENU1) || EnteredCode(controller,CODE_MENU2);
 }
 
 #define  TOGGLE(v,a,b)	if(v!=a) v=a; else v=b;
diff --git a/stepmania/src/CodeDetector.h b/stepmania/src/CodeDetector.h
index 63715d4b18..12617f4bb7 100644
--- a/stepmania/src/CodeDetector.h
+++ b/stepmania/src/CodeDetector.h
@@ -23,8 +23,8 @@ public:
 		CODE_HARDER2,
 		CODE_NEXT_SORT1,
 		CODE_NEXT_SORT2,
-		CODE_ALL_SORTS1,
-		CODE_ALL_SORTS2,
+		CODE_MENU1,
+		CODE_MENU2,
 		CODE_MIRROR,
 		CODE_LEFT,
 		CODE_RIGHT,
@@ -59,7 +59,7 @@ public:
 	static bool EnteredEasierDifficulty( GameController controller );
 	static bool EnteredHarderDifficulty( GameController controller );
 	static bool EnteredNextSort( GameController controller );
-	static bool EnteredAllSorts( GameController controller );
+	static bool EnteredMenu( GameController controller );
 	static bool DetectAndAdjustMusicOptions( GameController controller );
 	static bool EnteredCode( GameController controller, Code code );
 	static bool EnteredNextBannerGroup( GameController controller );
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index ed638673d3..23ed46ef05 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -699,7 +699,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
 				HarderDifficulty( pn );
 			return;
 		}
-		if( CodeDetector::EnteredAllSorts(GameI.controller) )
+		if( CodeDetector::EnteredMenu(GameI.controller) )
 		{
 			if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
 				m_soundLocked.Play();