Grudgily revoking Ez2SelectMusic until something is done about the API :)

stepmania/Themes/default/metrics.ini

@@ -2,7 +2,6 @@
 // - ScreenCaution
 // - ScreenEz2SelectPlayer
 // - ScreenEz2SelectStyle
-// - ScreenEz2SelectMusic
 // - ScreenHowToPlay
 // - ScreenSelectCourse
 // - ScreenSelectDifficulty

stepmania/src/GameManager.cpp

@@ -708,7 +708,7 @@ StyleDef g_StyleDefs[NUM_STYLES] =
 		"EZ2Double",							// m_szName
 		{ NOTES_TYPE_EZ2_DOUBLE,NOTES_TYPE_EZ2_DOUBLE },	// m_NotesTypes
 		NOTES_TYPE_INVALID,						// m_FallbackNotesType
-		StyleDef::ONE_PLAYER_TWO_CREDITS,		// m_StyleType
+		StyleDef::ONE_PLAYER_ONE_CREDIT,		// m_StyleType
 		{ 160, 480 },							// m_iCenterX
 		10,										// m_iColsPerPlayer
 		{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];

stepmania/src/ScreenEz2SelectMusic.cpp

@@ -11,7 +11,16 @@
 -----------------------------------------------------------------------------
 */
 
+/* OKAY!!!
+Sod it!
+I'll do this when you guys feel that it's OKAY to do it!!!
 
+  - ANDY
+
+*/
+
+
+/*
 #include "ScreenEz2SelectMusic.h"
 #include "ScreenManager.h"
 #include "PrefsManager.h"
@@ -505,7 +514,7 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
 	/* why do this? breaks tabs and roulette -glenn */
 //		if( pn != PLAYER_INVALID )
 //			this->SendScreenMessage( SM_MenuTimer, 1 );	// re-throw a timer message
-	}
+/*	}
 	else	// if !bResult
 	{
 		// a song was selected
@@ -518,7 +527,7 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
 					/* TODO: gray these out. 
 					 *
 					 * XXX: also, make sure they're not selected by roulette */
-					SCREENMAN->Prompt( SM_None, "ERROR:\n \nThis song does not have a music file\n and cannot be played." );
+/*					SCREENMAN->Prompt( SM_None, "ERROR:\n \nThis song does not have a music file\n and cannot be played." );
 					return;
 				}
 
@@ -733,3 +742,4 @@ void ScreenEz2SelectMusic::SortOrderChanged()
 	m_MusicSortDisplay.SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );		
 }
 
+*/

stepmania/src/ScreenEz2SelectMusic.h

@@ -9,7 +9,7 @@
 	Andrew Livy
 -----------------------------------------------------------------------------
 */
-
+/*
 #include "Screen.h"
 #include "Sprite.h"
 #include "BitmapText.h"
@@ -94,3 +94,5 @@ protected:
 	RageSoundSample		m_soundOptionsChange;
 	RageSoundSample		m_soundLocked;
 };
+
+  */

stepmania/src/ScreenManager.cpp

@@ -236,7 +236,7 @@ Screen* ScreenManager::MakeNewScreen( CString sClassName )
 	else if( 0==stricmp(sClassName, "ScreenSongOptions") )		return new ScreenSongOptions;
 	else if( 0==stricmp(sClassName, "ScreenStage") )			return new ScreenStage;
 	else if( 0==stricmp(sClassName, "ScreenTitleMenu") )		return new ScreenTitleMenu;
-	else if( 0==stricmp(sClassName, "ScreenEz2SelectMusic") )	return new ScreenEz2SelectMusic;
+//	else if( 0==stricmp(sClassName, "ScreenEz2SelectMusic") )	return new ScreenEz2SelectMusic;
 	else
 		throw RageException( "Invalid Screen class name '%s'", sClassName );
 }