From: Lyberta <lyberta@lyberta.net>
Date: Mon, 11 Jun 2018 10:15:27 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=16bb4a51347c40ae0655bba054bc7cf201538e45;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/TeamplayOverhaul
---

16bb4a51347c40ae0655bba054bc7cf201538e45
diff --cc qcsrc/server/player.qc
index 693a9d295,4d59943b6..03e0bfb64
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@@ -663,60 -664,21 +664,6 @@@ void PlayerDamage(entity this, entity i
  	}
  }
  
- /** print(), but only print if the server is not local */
- void dedicated_print(string input)
- {
- 	if (server_is_dedicated) print(input);
- }
- 
- void PrintToChat(entity player, string text)
- {
- 	text = strcat("\{1}^7", text, "\n");
- 	sprint(player, text);
- }
- 
- void DebugPrintToChat(entity player, string text)
- {
- 	if (autocvar_developer)
- 	{
- 		PrintToChat(player, text);
- 	}
- }
- 
- void PrintToChatAll(string text)
- {
- 	text = strcat("\{1}^7", text, "\n");
- 	bprint(text);
- }
- 
- void DebugPrintToChatAll(string text)
- {
- 	if (autocvar_developer)
- 	{
- 		PrintToChatAll(text);
- 	}
- }
- 
- void PrintToChatTeam(int teamnum, string text)
- {
- 	text = strcat("\{1}^7", text, "\n");
- 	FOREACH_CLIENT(IS_REAL_CLIENT(it),
- 	{
- 		if (it.team == teamnum)
- 		{
- 			sprint(it, text);
- 		}
- 	});
- }
- 
- void DebugPrintToChatTeam(int teamnum, string text)
 -bool MoveToTeam(entity client, int team_colour, int type)
--{
- 	if (autocvar_developer)
 -	int lockteams_backup = lockteams;  // backup any team lock
 -	lockteams = 0;  // disable locked teams
 -	TeamchangeFrags(client);  // move the players frags
 -	if (!SetPlayerTeamSimple(client, team_colour))
--	{
- 		PrintToChatTeam(teamnum, text);
 -		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: