From ac1a67763b9ffdadcef6cddf4e367647f967d6be Mon Sep 17 00:00:00 2001 From: Lyberta Date: Thu, 17 May 2018 12:33:24 +0300 Subject: [PATCH] Fixed incorrect merge. --- qcsrc/server/player.qc | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 43878e0fb..8b8291988 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -664,21 +664,6 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, } } -bool MoveToTeam(entity client, int team_colour, int type) -{ - int lockteams_backup = lockteams; // backup any team lock - lockteams = 0; // disable locked teams - TeamchangeFrags(client); // move the players frags - if (!SetPlayerTeamSimple(client, team_colour)) - { - return false; - } - Damage(client, client, client, 100000, DEATH_AUTOTEAMCHANGE.m_id, DMG_NOWEP, client.origin, '0 0 0'); // kill the player - lockteams = lockteams_backup; // restore the team lock - LogTeamchange(client.playerid, client.team, type); - return true; -} - /** * message "": do not say, just test flood control * return value: -- 2.39.2