Improved MoveToTeam.

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index ffa1399d4748bf1935f75da9efca1946d7fffd95..51e360a1978d6d508985438cbd632a036b240c89 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -222,6 +222,22 @@ bool SetPlayerTeam(entity player, int destination_team_index,
        return true;
 }
 
+bool MoveToTeam(entity client, int team_index, int type)
+{
+       int lockteams_backup = lockteams;  // backup any team lock
+       lockteams = 0;  // disable locked teams
+       TeamchangeFrags(client);  // move the players frags
+       if (!Player_SetTeamIndex(client, team_index))
+       {
+               lockteams = lockteams_backup;  // restore the team lock
+               return false;
+       }
+       KillPlayerForTeamChange(client);
+       lockteams = lockteams_backup;  // restore the team lock
+       LogTeamchange(client.playerid, client.team, type);
+       return true;
+}
+
 void KillPlayerForTeamChange(entity player)
 {
        if (IS_DEAD(player))