From 7325bdac42db7a19e6eeb3e4b2ede7dfe9d3a5a9 Mon Sep 17 00:00:00 2001 From: oy Date: Sun, 27 Jun 2010 13:24:47 +0200 Subject: [PATCH] don't consider sv_spectator_slots for team change when already in a team(red, blue). Closes #141 --- src/game/server/gamecontroller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 20ae867ae..07f8bf86a 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -541,7 +541,7 @@ int IGameController::GetAutoTeam(int Notthisid) bool IGameController::CanJoinTeam(int Team, int Notthisid) { - if(Team == -1) + if(Team == -1 || (GameServer()->m_apPlayers[Notthisid] && GameServer()->m_apPlayers[Notthisid]->GetTeam() != -1)) return true; int aNumplayers[2] = {0,0};