Merge branch 'Lyberta/TeamplayOverhaul' into 'master'

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 6db3916877347d81a9060a25ed67e15aa0f76429..25acdd3e01595b82a8f584c44bb8f8a72bf1e2d0 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -9,10 +9,10 @@
 
 #include "command/vote.qh"
 
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 
 #include "../common/deathtypes/all.qh"
-#include "../common/gamemodes/_mod.qh"
+#include <common/gamemodes/_mod.qh>
 #include "../common/teams.qh"
 
 /// \brief Describes a state of team balance entity.
@@ -170,9 +170,13 @@ bool Player_SetTeamIndex(entity player, int index)
        int new_team = Team_IndexToTeam(index);
        if (player.team == new_team)
        {
-               // This is important when players join the game and one of their color
-               // matches the team color while other doesn't. For example [BOT]Lion.
-               SetPlayerColors(player, new_team - 1);
+               if (new_team != -1)
+               {
+                       // This is important when players join the game and one of their
+                       // color matches the team color while other doesn't. For example
+                       // [BOT]Lion.
+                       SetPlayerColors(player, new_team - 1);
+               }
                return true;
        }
        int old_index = Team_TeamToIndex(player.team);
@@ -181,42 +185,47 @@ bool Player_SetTeamIndex(entity player, int index)
                // Mutator has blocked team change.
                return false;
        }
-       SetPlayerColors(player, new_team - 1);
+       if (new_team == -1)
+       {
+               player.team = -1;
+       }
+       else
+       {
+               SetPlayerColors(player, new_team - 1);
+       }
        MUTATOR_CALLHOOK(Player_ChangedTeam, player, old_index, index);
        return true;
 }
 
-bool SetPlayerTeam(entity player, int destination_team_index,
-       int source_team_index, bool no_print)
+bool SetPlayerTeam(entity player, int team_index, int type)
 {
-       if (!Player_SetTeamIndex(player, destination_team_index))
+       int old_team_index = Entity_GetTeamIndex(player);
+       if (!Player_SetTeamIndex(player, team_index))
        {
                return false;
        }
-       LogTeamchange(player.playerid, player.team, TEAM_CHANGE_MANUAL);
-       if (no_print)
+       LogTeamchange(player.playerid, player.team, type);
+       if (team_index != old_team_index)
        {
-               return true;
+               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(player.team,
+                       INFO_JOIN_PLAY_TEAM), player.netname);
+               KillPlayerForTeamChange(player);
        }
-       bprint(playername(player, false), "^7 has changed from ",
-               Team_IndexToColoredFullName(source_team_index), "^7 to ",
-               Team_IndexToColoredFullName(destination_team_index), "\n");
        return true;
 }
 
 bool MoveToTeam(entity client, int team_index, int type)
 {
+       //PrintToChatAll(sprintf("MoveToTeam: %s, %f", client.netname, team_index));
        int lockteams_backup = lockteams;  // backup any team lock
        lockteams = 0;  // disable locked teams
        PlayerScore_Clear(client);
-       if (!Player_SetTeamIndex(client, team_index))
+       if (!SetPlayerTeam(client, team_index, type))
        {
                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;
 }
 
@@ -255,6 +264,7 @@ entity TeamBalance_CheckAllowedTeams(entity for_whom)
                team_ent.m_num_players = TEAM_NOT_ALLOWED;
                team_ent.m_num_bots = 0;
        }
+       setthink(balance, TeamBalance_Destroy);
        
        int teams_mask = 0;     
        string teament_name = string_null;
@@ -623,6 +633,7 @@ int TeamBalance_FindBestTeams(entity balance, entity player, bool use_score)
 
 void TeamBalance_JoinBestTeam(entity this, bool force_best_team)
 {
+       //PrintToChatAll(sprintf("JoinBestTeam: %s, %f", this.netname, force_best_team));
        // don't join a team if we're not playing a team game
        if (!teamplay)
        {
@@ -649,8 +660,7 @@ void TeamBalance_JoinBestTeam(entity this, bool force_best_team)
                
                if (Team_IsValidIndex(selected_team_index))
                {
-                       Player_SetTeamIndex(this, selected_team_index);
-                       LogTeamchange(this.playerid, this.team, TEAM_CHANGE_AUTO_RELAXED);
+                       SetPlayerTeam(this, selected_team_index, TEAM_CHANGE_AUTO_RELAXED);
                        TeamBalance_Destroy(balance);
                        return;
                }
@@ -665,13 +675,14 @@ void TeamBalance_JoinBestTeam(entity this, bool force_best_team)
        int old_team_index = Team_TeamToIndex(this.team);
        TeamBalance_Destroy(balance);
        PlayerScore_Clear(this);
-       Player_SetTeamIndex(this, best_team_index);
-       LogTeamchange(this.playerid, this.team, TEAM_CHANGE_AUTO);
+       if (!SetPlayerTeam(this, best_team_index, TEAM_CHANGE_AUTO))
+       {
+               return;
+       }
        if ((old_team_index != -1) && !IS_BOT_CLIENT(this))
        {
                TeamBalance_AutoBalanceBots(best_team_index, old_team_index);
        }
-       KillPlayerForTeamChange(this);  
 }
 
 int TeamBalance_CompareTeams(entity balance, int team_index_a, int team_index_b,
@@ -863,10 +874,11 @@ int TeamBalance_CompareTeamsInternal(entity team_a, entity team_b,
        return TEAMS_COMPARE_EQUAL;
 }
 
+// Called when the player connects or when they change their color with "color"
+// command.
 void SV_ChangeTeam(entity this, float _color)
 {
-       int source_color, destination_color;
-       int source_team_index, destination_team_index;
+       //PrintToChatAll(sprintf("SV_ChangeTeam: %s, %f", this.netname, _color));
 
        // in normal deathmatch we can just apply the color and we're done
        if(!teamplay)
@@ -882,6 +894,9 @@ void SV_ChangeTeam(entity this, float _color)
        if(!teamplay)
                return;
 
+       int source_color, destination_color;
+       int source_team_index, destination_team_index;
+
        source_color = this.clientcolors & 0x0F;
        destination_color = _color & 0x0F;
 
@@ -919,7 +934,7 @@ void SV_ChangeTeam(entity this, float _color)
        // not changing teams
        if (source_color == destination_color)
        {
-               SetPlayerTeam(this, destination_team_index, source_team_index, true);
+               SetPlayerTeam(this, destination_team_index, TEAM_CHANGE_MANUAL);
                TeamBalance_Destroy(balance);
                return;
        }
@@ -947,15 +962,9 @@ void SV_ChangeTeam(entity this, float _color)
                // reduce frags during a team change
                PlayerScore_Clear(this);
        }
-       if (!SetPlayerTeam(this, destination_team_index, source_team_index,
-               !IS_CLIENT(this)))
+       if (!SetPlayerTeam(this, destination_team_index, TEAM_CHANGE_MANUAL))
        {
                return;
        }
        TeamBalance_AutoBalanceBots(destination_team_index, source_team_index);
-       if (!IS_PLAYER(this) || (source_team_index == destination_team_index))
-       {
-               return;
-       }
-       KillPlayerForTeamChange(this);
 }