From 1de53984add6a1caf9196e47c8bc5c1804b6aa6c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 10 Apr 2007 23:09:28 +0000
Subject: [PATCH] Remove #SELECTABLE:ROULETTE.

---
 stepmania/src/NotesLoaderSM.cpp | 2 --
 stepmania/src/NotesWriterSM.cpp | 1 -
 stepmania/src/Song.cpp          | 1 -
 stepmania/src/song.h            | 6 ++----
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 4100cb1cb6..6714f49f43 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -355,8 +355,6 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
 				out.m_SelectionDisplay = out.SHOW_ALWAYS;
 			else if(!stricmp(sParams[1],"NO"))
 				out.m_SelectionDisplay = out.SHOW_NEVER;
-			else if(!stricmp(sParams[1],"ROULETTE"))
-				out.m_SelectionDisplay = out.SHOW_ROULETTE;
 			else
 				LOG->UserLog( "Song file", sPath, "has an unknown #SELECTABLE value, \"%s\"; ignored.", sParams[1].c_str() );
 		}
diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index 6d2fcf7d27..a7ff528ea4 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -63,7 +63,6 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
 	default: ASSERT(0);  /* fallthrough */
 	case Song::SHOW_ALWAYS:		f.Write( "YES" );		break;
 	case Song::SHOW_NEVER:		f.Write( "NO" );		break;
-	case Song::SHOW_ROULETTE:	f.Write( "ROULETTE" );	break;
 	}
 	f.PutLine( ";" );
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 7a1f9f00d6..8aa1e7948e 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -1027,7 +1027,6 @@ Song::SelectionDisplay Song::GetDisplayed() const
 }
 bool Song::NormallyDisplayed() const { return GetDisplayed() == SHOW_ALWAYS; }
 bool Song::NeverDisplayed() const { return GetDisplayed() == SHOW_NEVER; }
-bool Song::RouletteDisplayed() const { if(IsTutorial()) return false; return GetDisplayed() != SHOW_NEVER; }
 bool Song::ShowInDemonstrationAndRanking() const { return !IsTutorial() && NormallyDisplayed(); }
 
 
diff --git a/stepmania/src/song.h b/stepmania/src/song.h
index 1c9999d575..5c767053a8 100644
--- a/stepmania/src/song.h
+++ b/stepmania/src/song.h
@@ -45,9 +45,8 @@ public:
 	/* Set when this song should be displayed in the music wheel: */
 	enum SelectionDisplay
 	{ 
-		SHOW_ALWAYS,	/* all the time */
-		SHOW_ROULETTE,	/* only when rouletting */
-		SHOW_NEVER		/* never (unless song hiding is turned off) */
+		SHOW_ALWAYS,	/* always */
+		SHOW_NEVER	/* never (unless song hiding is turned off) */
 	} m_SelectionDisplay;
 
 	Song();
@@ -193,7 +192,6 @@ public:
 	SelectionDisplay GetDisplayed() const;
 	bool NormallyDisplayed() const;
 	bool NeverDisplayed() const;
-	bool RouletteDisplayed() const;
 	bool ShowInDemonstrationAndRanking() const;
 
 	void AddSteps( Steps* pSteps );		// we are responsible for deleting the memory pointed to by pSteps!