prefer GAMESTATE->JoinPlayer to setting GAMESTATE->m_bSideIsJoined manually

stepmania/src/GameCommand.cpp

@@ -660,7 +660,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
 		case TWO_PLAYERS_SHARED_SIDES:
 			{
 				FOREACH_PlayerNumber( p )
-					GAMESTATE->m_bSideIsJoined[p] = true;
+					GAMESTATE->JoinPlayer( p );
 			}
 			break;
 		default:

stepmania/src/ScreenEdit.cpp

@@ -661,7 +661,7 @@ void ScreenEdit::Init()
 		m_InputPlayerNumber = PLAYER_INVALID;
 	// set both players to joined so the credit message doesn't show
 	FOREACH_PlayerNumber( p )
-		GAMESTATE->m_bSideIsJoined[p] = true;
+		GAMESTATE->JoinPlayer( p );
 	SCREENMAN->RefreshCreditsMessages();
 
 	m_pSong = GAMESTATE->m_pCurSong;

stepmania/src/ScreenEditMenu.cpp

@@ -33,7 +33,7 @@ void ScreenEditMenu::Init()
 {
 	/* Enable all players. */
 	FOREACH_PlayerNumber( pn )
-		GAMESTATE->m_bSideIsJoined[pn] = true;
+		GAMESTATE->JoinPlayer( pn );
 
 	ScreenWithMenuElements::Init();
 

stepmania/src/ScreenEnding.cpp

@@ -31,9 +31,8 @@ ScreenEnding::ScreenEnding() : ScreenAttract( false/*dont reset GAMESTATE*/ )
 
 		GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
 		GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(),"versus") );
-		GAMESTATE->m_bSideIsJoined[PLAYER_1] = true;
+		GAMESTATE->JoinPlayer( PLAYER_1 );
-		GAMESTATE->m_bSideIsJoined[PLAYER_2] = true;
+		GAMESTATE->JoinPlayer( PLAYER_2 );
-		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 		GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() );
 		GAMESTATE->m_pCurCourse.Set( SONGMAN->GetRandomCourse() );
 		GAMESTATE->m_pCurSteps[PLAYER_1].Set( GAMESTATE->m_pCurSong->GetAllSteps()[0] );

stepmania/src/ScreenEvaluation.cpp

@@ -107,7 +107,7 @@ ScreenEvaluation::ScreenEvaluation()
 			if( RandomInt(2) )
 				PO_GROUP_ASSIGN_N( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions, ModsLevel_Stage, m_bTransforms, PlayerOptions::TRANSFORM_ECHO, true );	// show "disqualified"
 
-			GAMESTATE->m_bSideIsJoined[p] = true;
+			GAMESTATE->JoinPlayer( p );
 			GAMESTATE->m_pCurSteps[p].Set( GAMESTATE->m_pCurSong->GetAllSteps()[0] );
 			vector<Trail*> apTrails;
 			GAMESTATE->m_pCurCourse->GetAllTrails( apTrails );

stepmania/src/ScreenEz2SelectPlayer.cpp

@@ -166,7 +166,7 @@ void ScreenEz2SelectPlayer::MenuStart( const InputEventPlus &input )
 	if( GAMESTATE->m_bSideIsJoined[pn] )	// already joined
 		return;	// ignore
 
-	GAMESTATE->m_bSideIsJoined[pn] = true;
+	GAMESTATE->JoinPlayer( pn );
 	SCREENMAN->RefreshCreditsMessages();
 	SCREENMAN->PlayStartSound();
 	m_sprJoinMessage[pn].SetState( pn+NUM_PLAYERS );

stepmania/src/ScreenOptionsMaster.cpp

@@ -35,8 +35,7 @@ void ScreenOptionsMaster::Init()
 	if( FORCE_ALL_PLAYERS )
 	{
 		FOREACH_PlayerNumber( pn )
-			GAMESTATE->m_bSideIsJoined[pn] = true;
+			GAMESTATE->JoinPlayer( pn );
-		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 	}
 
 	if( NAVIGATION_MODE == "toggle" )

stepmania/src/ScreenPackages.cpp

@@ -38,7 +38,7 @@ void ScreenPackages::Init()
 	m_iDownloaded = 0;
 
 	FOREACH_PlayerNumber( pn )
-		GAMESTATE->m_bSideIsJoined[pn] = true;
+		GAMESTATE->JoinPlayer( pn );
 
 	m_sprExistingBG.SetName( "PackagesBG" );
 	m_sprExistingBG.Load( THEME->GetPathG( m_sName, "PackagesBG" ) );

stepmania/src/ScreenSelectMusic.cpp

@@ -53,7 +53,7 @@ ScreenSelectMusic::ScreenSelectMusic()
 	{
 		GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
 		GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
-		GAMESTATE->m_bSideIsJoined[PLAYER_1] = true;
+		GAMESTATE->JoinPlayer( PLAYER_1 );
 		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 	}
 }

stepmania/src/ScreenSetTime.cpp

@@ -46,7 +46,7 @@ void ScreenSetTime::Init()
 	m_Selection = hour;
 
 	FOREACH_PlayerNumber( pn )
-		GAMESTATE->m_bSideIsJoined[pn] = true;
+		GAMESTATE->JoinPlayer( pn );
 
 	FOREACH_SetTimeSelection( s )
 	{