Ez2dancer "Working Version" Update (Can only Play 1p Easy)

stepmania/src/GameManager.cpp

@@ -128,10 +128,10 @@ GameDef g_GameDefs[NUM_GAMES] =
 			"UpLeft",
 			"UpLeftHand",
 			"LrLeftHand",
-			"UpRight",
-			"UpRightHand",
-			"LrRightHand",
 			"Down",
+			"LrRightHand",
+			"UpRightHand",
+			"UpRight",
 			"Back"
 		},
 		{	// m_iMenuButtons[NUM_MENU_BUTTONS];	// map from MenuButton to m_szButtonNames
@@ -146,8 +146,6 @@ GameDef g_GameDefs[NUM_GAMES] =
 
 };
 
-
-
 StyleDef g_StyleDefs[NUM_STYLES] = 
 {
 	{	// STYLE_DANCE_SINGLE
@@ -408,11 +406,11 @@ StyleDef g_StyleDefs[NUM_STYLES] =
 		5,										// m_iColsPerPlayer
 		{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 			{	// PLAYER_1
-				{ TRACK_1,	INSTRUMENT_1,	EZ2_BUTTON_UPLEFT,		-EZ2_COL_SPACING*1.5f },   // CHANGE THESE WHEN WE CAN SEE THE
+				{ TRACK_1,	INSTRUMENT_1,	EZ2_BUTTON_UPLEFT,		-EZ2_COL_SPACING*1.0f },   // CHANGE THESE WHEN WE CAN SEE THE
 				{ TRACK_2,	INSTRUMENT_1,	EZ2_BUTTON_UPLEFTHAND,	-EZ2_COL_SPACING*0.5f },  // NOTES IN-GAME !!!!!!!!!!
 				{ TRACK_3,	INSTRUMENT_1,	EZ2_BUTTON_DOWN,		+EZ2_COL_SPACING*0 },
 				{ TRACK_4,	INSTRUMENT_1,	EZ2_BUTTON_UPRIGHTHAND,	+EZ2_COL_SPACING*0.5f },
-				{ TRACK_5,	INSTRUMENT_1,	EZ2_BUTTON_UPRIGHT,		+EZ2_COL_SPACING*1.5f },
+				{ TRACK_5,	INSTRUMENT_1,	EZ2_BUTTON_UPRIGHT,		+EZ2_COL_SPACING*1.0f },
 			},
 			{	// PLAYER_2
 				{ TRACK_1,	INSTRUMENT_1,	EZ2_BUTTON_UPLEFT,		-EZ2_COL_SPACING*2 },   // CHANGE THESE WHEN WE CAN SEE THE

stepmania/src/ScreenEz2SelectStyle.cpp

@@ -179,7 +179,7 @@ ScreenEz2SelectStyle::ScreenEz2SelectStyle()
 
 	m_soundChange.Load( THEME->GetPathTo(SOUND_SELECT_STYLE_CHANGE) );
 	m_soundSelect.Load( THEME->GetPathTo(SOUND_MENU_START) );
-
+	m_soundInvalid.Load( THEME->GetPathTo(SOUND_MENU_INVALID) );
 
 //	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_SELECT_STYLE_INTRO) );
 
@@ -312,12 +312,19 @@ void ScreenEz2SelectStyle::MenuBack( const PlayerNumber p )
 	MUSIC->Stop();
 
 	m_Menu.TweenOffScreenToBlack( SM_GoToPrevState, true );
+	GAMEMAN->m_CurStyle = STYLE_NONE; // Make sure that both players can scroll around title menu...
 
 //	m_Fade.CloseWipingLeft( SM_GoToPrevState );
 
 //	TweenOffScreen();
 }
 
+/************************************
+MenuDown
+Desc: Actions performed when a player 
+presses the button bound to down
+************************************/
+
 void ScreenEz2SelectStyle::MenuDown( const PlayerNumber p )
 {
 	MenuStart(p);
@@ -623,11 +630,38 @@ void ScreenEz2SelectStyle::MenuStart( PlayerNumber p )
 	}
 	else
 	{
+		if (m_iSelectedPlayer == 2) // both players
+		{
+			m_soundInvalid.PlayRandom();
+			return;
+		}
+		else
+		{
+			if (m_iSelectedStyle == 0) // easy
+			{
+				GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;	
+			}
+			else if (m_iSelectedStyle == 1) // hard
+			{
+				m_soundInvalid.PlayRandom();
+				return;
+			}
+			else if (m_iSelectedStyle == 2) // real
+			{
+				// GAMEMAN->m_CurStyle = STYLE_EZ2_REAL;	
+				m_soundInvalid.PlayRandom();
+				return;
+			}
+			else // club
+			{
+				m_soundInvalid.PlayRandom();
+				return;
+			}
+		}
 		m_soundSelect.PlayRandom();
 	
 		this->ClearMessageQueue();
-
-		GAMEMAN->m_CurStyle = STYLE_EZ2_SINGLE;		
+	
 		PREFSMAN->m_PlayMode = PLAY_MODE_ARCADE;
 
 		m_Menu.TweenOffScreenToMenu( SM_GoToNextState );

stepmania/src/ScreenEz2SelectStyle.h

@@ -56,6 +56,6 @@ private:
 	int m_iSelectedPlayer;
 	RandomSample m_soundChange;
 	RandomSample m_soundSelect;	
-
+	RandomSample m_soundInvalid;
 protected:
 };