diff options
| author | oy <Tom_Adams@web.de> | 2010-06-27 13:24:47 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-06-27 13:24:47 +0200 |
| commit | 7325bdac42db7a19e6eeb3e4b2ede7dfe9d3a5a9 (patch) | |
| tree | e3c1f9b487c1074acd0232ef81c8c68bf71833c5 /src/game/server/gamecontroller.cpp | |
| parent | 29d29df4f043aecf7711e956da5076456241d68f (diff) | |
| download | zcatch-7325bdac42db7a19e6eeb3e4b2ede7dfe9d3a5a9.tar.gz zcatch-7325bdac42db7a19e6eeb3e4b2ede7dfe9d3a5a9.zip | |
don't consider sv_spectator_slots for team change when already in a team(red, blue). Closes #141
Diffstat (limited to 'src/game/server/gamecontroller.cpp')
| -rw-r--r-- | src/game/server/gamecontroller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 20ae867a..07f8bf86 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}; |