Merge branch 'master' into terencehill/player_sorting

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / teamplay.qc

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 80892e652891804e7fa6f83ff2f4cd623dcdd840..c7c939d74d6e4f3c553f958b611f8008aec2c1a3 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -247,7 +247,6 @@ bool SetPlayerTeam(entity player, int team_index, int type)
        {
                KillPlayerForTeamChange(player);
                PlayerScore_Clear(player); // works only in game modes without teams
-               CS(player).parm_idlesince = time;
 
                if (!IS_BOT_CLIENT(player))
                        TeamBalance_AutoBalanceBots();
@@ -528,7 +527,7 @@ entity TeamBalance_CheckAllowedTeams(entity for_whom)
        }
 
        // TODO: Balance quantity of bots across > 2 teams when bot_vs_human is set (and remove next line)
-       if (autocvar_bot_vs_human && AvailableTeams() == 2 && for_whom)
+       if (autocvar_bot_vs_human && AVAILABLE_TEAMS == 2 && for_whom)
        {
                if (autocvar_bot_vs_human > 0)
                {