From: Lyberta <lyberta@lyberta.net>
Date: Mon, 30 Apr 2018 23:23:51 +0000 (+0300)
Subject: Moved print functions to client.q[ch].
X-Git-Tag: xonotic-v0.8.5~2074^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09a39630071b7539e16fbf8f9c3e2c44a85d041e;p=xonotic%2Fxonotic-data.pk3dir.git

Moved print functions to client.q[ch].
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index d374876d0..9ecf2f9da 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1469,6 +1469,59 @@ void respawn(entity this)
 	PutClientInServer(this);
 }
 
+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)
+{
+	if (autocvar_developer)
+	{
+		PrintToChatTeam(teamnum, text);
+	}
+}
+
 void play_countdown(entity this, float finished, Sound samp)
 {
     TC(Sound, samp);
diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 7499ee8dd..94fa050bc 100644
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -225,6 +225,46 @@ METHOD(Client, m_unwind, bool(Client this))
     return false;
 }
 
+/** print(), but only print if the server is not local */
+void dedicated_print(string input);
+
+/// \brief Print the string to player's chat.
+/// \param[in] player Player to print to.
+/// \param[in] text Text to print.
+/// \return No return.
+void PrintToChat(entity player, string text);
+
+/// \brief Print the string to player's chat if the server cvar "developer" is
+/// not 0.
+/// \param[in] player Player to print to.
+/// \param[in] text Text to print.
+/// \return No return.
+void DebugPrintToChat(entity player, string text);
+
+/// \brief Prints the string to all players' chat.
+/// \param[in] text Text to print.
+/// \return No return.
+void PrintToChatAll(string text);
+
+/// \brief Prints the string to all players' chat if the server cvar "developer"
+/// is not 0.
+/// \param[in] text Text to print.
+/// \return No return.
+void DebugPrintToChatAll(string text);
+
+/// \brief Print the string to chat of all players of the specified team.
+/// \param[in] teamnum Team to print to. See NUM_TEAM constants.
+/// \param[in] text Text to print.
+/// \return No return.
+void PrintToChatTeam(int teamnum, string text);
+
+/// \brief Print the string to chat of all players of the specified team if the
+/// server cvar "developer" is not 0.
+/// \param[in] teamnum Team to print to. See NUM_TEAM constants.
+/// \param[in] text Text to print.
+/// \return No return.
+void DebugPrintToChatTeam(int teamnum, string text);
+
 void play_countdown(entity this, float finished, Sound samp);
 
 float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit);
diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 06bdb1428..408f44b64 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -679,60 +679,6 @@ bool MoveToTeam(entity client, int team_colour, int type)
 	return true;
 }
 
-/** 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)
-{
-	if (autocvar_developer)
-	{
-		PrintToChatTeam(teamnum, text);
-	}
-}
-
 /**
  * message "": do not say, just test flood control
  * return value:
diff --git a/qcsrc/server/player.qh b/qcsrc/server/player.qh
index ee073ccb4..5e6642e04 100644
--- a/qcsrc/server/player.qh
+++ b/qcsrc/server/player.qh
@@ -9,45 +9,6 @@
 void CopyBody_Think(entity this);
 void CopyBody(entity this, float keepvelocity);
 
-void dedicated_print(string input);
-
-/// \brief Print the string to player's chat.
-/// \param[in] player Player to print to.
-/// \param[in] text Text to print.
-/// \return No return.
-void PrintToChat(entity player, string text);
-
-/// \brief Print the string to player's chat if the server cvar "developer" is
-/// not 0.
-/// \param[in] player Player to print to.
-/// \param[in] text Text to print.
-/// \return No return.
-void DebugPrintToChat(entity player, string text);
-
-/// \brief Prints the string to all players' chat.
-/// \param[in] text Text to print.
-/// \return No return.
-void PrintToChatAll(string text);
-
-/// \brief Prints the string to all players' chat if the server cvar "developer"
-/// is not 0.
-/// \param[in] text Text to print.
-/// \return No return.
-void DebugPrintToChatAll(string text);
-
-/// \brief Print the string to chat of all players of the specified team.
-/// \param[in] teamnum Team to print to. See NUM_TEAM constants.
-/// \param[in] text Text to print.
-/// \return No return.
-void PrintToChatTeam(int teamnum, string text);
-
-/// \brief Print the string to chat of all players of the specified team if the
-/// server cvar "developer" is not 0.
-/// \param[in] teamnum Team to print to. See NUM_TEAM constants.
-/// \param[in] text Text to print.
-/// \return No return.
-void DebugPrintToChatTeam(int teamnum, string text);
-
 void player_setupanimsformodel(entity this);
 
 void player_anim(entity this);