Ez2 Checkin. (No song select yet)

stepmania/src/ScreenSelectStyle.cpp

@@ -47,11 +47,6 @@ ScreenSelectStyle::ScreenSelectStyle()
 {
 	LOG->WriteLine( "ScreenSelectStyle::ScreenSelectStyle()" );
 
-
-	// Reset the current style and game
-	GAMEMAN->m_CurStyle = STYLE_NONE;
-
-
 	for( int s=0; s<NUM_STYLES; s++ )
 	{
 		Style style = (Style)s;
@@ -136,7 +131,7 @@ void ScreenSelectStyle::HandleScreenMessage( const ScreenMessage SM )
 	switch( SM )
 	{
 	case SM_MenuTimer:
-		MenuStart(PLAYER_INVALID);
+		MenuStart(PLAYER_NONE);
 		break;
 	case SM_GoToPrevState:
 		MUSIC->Stop();
@@ -215,7 +210,7 @@ void ScreenSelectStyle::MenuRight( const PlayerNumber p )
 
 void ScreenSelectStyle::MenuStart( const PlayerNumber p )
 {
-	if( p != PLAYER_INVALID )
+	if( p != PLAYER_NONE )
 		GAMEMAN->m_sMasterPlayerNumber = p;
 	GAMEMAN->m_CurStyle = GetSelectedStyle();