Revert "Round 2 of this."

This reverts commit 1d7b5fe852.
2013-06-04 23:47:49 -04:00
parent 1220dbe085
commit 259e9b1e00
10 changed files with 87 additions and 5 deletions
@@ -134,6 +134,14 @@ void ScreenWithMenuElements::BeginScreen()

 	/* Evaluate FirstUpdateCommand. */
 	this->PlayCommand( "FirstUpdate" );
+
+	/* If AutoJoin and a player is already joined, then try to join a player.  (If no players
+	 * are joined, they'll join on the first JoinInput.) */
+	if( GAMESTATE->GetCoinMode() == CoinMode_Pay && GAMESTATE->m_bAutoJoin.Get() )
+	{
+		if( GAMESTATE->GetNumSidesJoined() > 0 && GAMESTATE->JoinPlayers() )
+			SCREENMAN->PlayStartSound();
+	}
 }

 void ScreenWithMenuElements::HandleScreenMessage( const ScreenMessage SM )