From cc2e166c18f8a5e1b6b21625abd9450757771fa3 Mon Sep 17 00:00:00 2001
From: Kyzentun Keeslala <kyzentun@gmail.com>
Date: Wed, 20 May 2015 22:26:47 -0600
Subject: [PATCH] Change JoinPlayer to look directly at SideIsJoined to avoid
 style-dependent logic in GetNumPlayersEnabled.

---
 src/GameState.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/GameState.cpp b/src/GameState.cpp
index 41346e3097..5caaa823e7 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -374,7 +374,11 @@ void GameState::JoinPlayer( PlayerNumber pn )
 {
 	// Make sure the join will be successful before doing it. -Kyz
 	{
-		int players_joined= GetNumPlayersEnabled();
+		int players_joined= 0;
+		for(int i= 0; i < NUM_PLAYERS; ++i)
+		{
+			players_joined+= m_bSideIsJoined[i];
+		}
 		if(players_joined > 0)
 		{
 			const Style* cur_style= GetCurrentStyle(PLAYER_INVALID);