Merge branch 'master' into terencehill/ca_fixes

diff --combined gamemodes.cfg
index 08b988273ef0302b9020a57af8a3c7872c87ba16,30352bba7be4bbeef4a341674f5151d4dfb030da..8aebf05bb9bc0ea27a452c277975e58567327ac4
--- 1/gamemodes.cfg
--- 2/gamemodes.cfg
+++ b/gamemodes.cfg
@@@ -203,10 -203,10 +203,10 @@@ set g_assault 0 "Assault: attack the en
  // ============
  //  clan arena
  // ============
 -set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
 -set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
 -set g_ca_point_leadlimit 0
 -set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games."
 +set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round"
 +seta g_ca_point_limit -1 "Clan Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 +seta g_ca_point_leadlimit -1 "Clan Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 +set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games"
  set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
  set g_ca_damage2score_multiplier 0.01
  set g_ca_round_timelimit 180 "round time limit in seconds"
@@@ -360,8 -360,6 +360,6 @@@ set g_keepawayball_effects 0 "Add toget
  set g_keepawayball_trail_color        254     "particle trail color from player/ball"
  set g_keepawayball_damageforcescale   3 "Scale of force which is applied to the ball by weapons/explosions/etc"
  set g_keepawayball_respawntime        10      "if no one picks up the ball, how long to wait until the ball respawns"
- seta g_keepaway_teams_override 0
- set g_keepaway_teams 0
  
  
  // ==========

diff --combined qcsrc/server/command/sv_cmd.qc
index 4816711d96d0b051479de1867fd8af1d3cc4b8ac,45871b7aeb60ad51101651ca3c019fdcd1c5a4d8..9e54e2287abfcaa46fe623994c0e08c976f04fc5
--- 1/qcsrc/server/command/sv_cmd.qc
--- 2/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@@ -216,8 -216,6 +216,8 @@@ void GameCommand_allspec(float request
                        FOR_EACH_REALPLAYER(client)
                        {
                                self = client;
 +                              if(self.caplayer)
 +                                      self.caplayer = 0;
                                PutObserverInServer();
                                ++i;
                        }
@@@ -1050,8 -1048,6 +1050,8 @@@ void GameCommand_moveplayer(float reque
                                                if(!IS_SPEC(client) && !IS_OBSERVER(client))
                                                {
                                                        self = client;
 +                                                      if(self.caplayer)
 +                                                              self.caplayer = 0;
                                                        PutObserverInServer();
  
                                                        successful = strcat(successful, (successful ? ", " : ""), client.netname);
@@@ -1083,6 -1079,7 +1083,7 @@@
                                                                }
                                                                else if(team_id == 0)  // auto team
                                                                {
+                                                                       CheckAllowedTeams(client);
                                                                        team_id = Team_NumberToTeam(FindSmallestTeam(client, FALSE));
                                                                }
                                                                else
@@@ -1156,10 -1153,9 +1157,10 @@@ void GameCommand_nospectators(float req
                {
                        blockSpectators = 1;
                        entity plr;
 -                      FOR_EACH_CLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
 +                      FOR_EACH_REALCLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
                        {
                                if(IS_SPEC(plr) || IS_OBSERVER(plr))
 +                              if(!plr.caplayer)
                                {
                                        plr.spectatortime = time;
                                        Send_Notification(NOTIF_ONE_ONLY, plr, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);