From e7fdfa2132a82db5ac511f55bd1c4f62878dd6be Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 15 Sep 2006 05:56:43 +0000 Subject: [PATCH] prefer GAMESTATE->JoinPlayer to setting GAMESTATE->m_bSideIsJoined manually --- stepmania/src/GameCommand.cpp | 2 +- stepmania/src/ScreenEdit.cpp | 2 +- stepmania/src/ScreenEditMenu.cpp | 2 +- stepmania/src/ScreenEnding.cpp | 5 ++--- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenEz2SelectPlayer.cpp | 2 +- stepmania/src/ScreenOptionsMaster.cpp | 3 +-- stepmania/src/ScreenPackages.cpp | 2 +- stepmania/src/ScreenSelectMusic.cpp | 2 +- stepmania/src/ScreenSetTime.cpp | 2 +- 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index c22c7f022c..8d367c70b8 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -660,7 +660,7 @@ void GameCommand::ApplySelf( const vector &vpns ) const case TWO_PLAYERS_SHARED_SIDES: { FOREACH_PlayerNumber( p ) - GAMESTATE->m_bSideIsJoined[p] = true; + GAMESTATE->JoinPlayer( p ); } break; default: diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 9357a4b4f9..f92a2d5963 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/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; diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index c4730ea7ce..859d1c00cd 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/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(); diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index dccee64457..e778eff454 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/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->m_bSideIsJoined[PLAYER_2] = true; - GAMESTATE->m_MasterPlayerNumber = PLAYER_1; + GAMESTATE->JoinPlayer( PLAYER_1 ); + GAMESTATE->JoinPlayer( PLAYER_2 ); GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() ); GAMESTATE->m_pCurCourse.Set( SONGMAN->GetRandomCourse() ); GAMESTATE->m_pCurSteps[PLAYER_1].Set( GAMESTATE->m_pCurSong->GetAllSteps()[0] ); diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 4787a8cdc8..b9c3ce6df1 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/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 apTrails; GAMESTATE->m_pCurCourse->GetAllTrails( apTrails ); diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 339f48fb35..2ece889c7e 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/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 ); diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 52073d2a32..f2c031bfb2 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -35,8 +35,7 @@ void ScreenOptionsMaster::Init() if( FORCE_ALL_PLAYERS ) { FOREACH_PlayerNumber( pn ) - GAMESTATE->m_bSideIsJoined[pn] = true; - GAMESTATE->m_MasterPlayerNumber = PLAYER_1; + GAMESTATE->JoinPlayer( pn ); } if( NAVIGATION_MODE == "toggle" ) diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp index f8982b1bd6..eda03c7ded 100644 --- a/stepmania/src/ScreenPackages.cpp +++ b/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" ) ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 0745c0234c..3769d162cc 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/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; } } diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index bc3f17b42c..2b6893ea8d 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/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 ) {