Merge branch 'master' into Mario/duel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qh

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 94fa050bc69af862c951f32dc23c57efb5b68934..8b925680679f23006e8008d9d24de88ba35d1d7f 100644 (file)
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -17,7 +17,7 @@ CLASS(Client, Object)
     /** Client IP */
     ATTRIB(Client, netaddress, string, this.netaddress);
     ATTRIB(Client, playermodel, string, this.playermodel);
-    ATTRIB(Client, playerskin, int, this.playerskin);
+    ATTRIB(Client, playerskin, string, this.playerskin);
 
     /** fingerprint of CA key the player used to authenticate */
     ATTRIB(Client, crypto_keyfp, string, this.crypto_keyfp);
@@ -114,6 +114,7 @@ CLASS(Client, Object)
     ATTRIB(Client, cmd_floodtime, float, this.cmd_floodtime);
     ATTRIB(Client, wasplayer, bool, this.wasplayer);
     ATTRIB(Client, weaponorder_byimpulse, string, this.weaponorder_byimpulse);
+    ATTRIB(Client, autojoin_checked, bool, this.wasplayer);
 
     // networked cvars
 
@@ -225,45 +226,38 @@ METHOD(Client, m_unwind, bool(Client this))
     return false;
 }
 
-/** print(), but only print if the server is not local */
-void dedicated_print(string input);
+bool PlayerInList(entity player, string list);
 
-/// \brief Print the string to player's chat.
-/// \param[in] player Player to print to.
+/// \brief Print the string to the client's chat.
+/// \param[in] client Client to print to.
 /// \param[in] text Text to print.
-/// \return No return.
-void PrintToChat(entity player, string text);
+void PrintToChat(entity client, 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.
+/// \brief Print the string to the client's chat if the server cvar "developer"
+/// is not 0.
+/// \param[in] client Client to print to.
 /// \param[in] text Text to print.
-/// \return No return.
-void DebugPrintToChat(entity player, string text);
+void DebugPrintToChat(entity client, string text);
 
-/// \brief Prints the string to all players' chat.
+/// \brief Prints the string to all clients' 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"
+/// \brief Prints the string to all clients' 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.
+/// \brief Print the string to chat of all clients of the specified team.
+/// \param[in] team_num Team to print to. See NUM_TEAM constants.
 /// \param[in] text Text to print.
-/// \return No return.
-void PrintToChatTeam(int teamnum, string text);
+void PrintToChatTeam(int team_num, string text);
 
-/// \brief Print the string to chat of all players of the specified team if the
+/// \brief Print the string to chat of all clients 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] team_num Team to print to. See NUM_TEAM constants.
 /// \param[in] text Text to print.
-/// \return No return.
-void DebugPrintToChatTeam(int teamnum, string text);
+void DebugPrintToChatTeam(int team_num, string text);
 
 void play_countdown(entity this, float finished, Sound samp);
 
@@ -271,5 +265,21 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re
 
 bool Spectate(entity this, entity pl);
 
+void ClientInit_Spawn();
+
+void PutObserverInServer(entity this);
+
+void SetSpectatee(entity this, entity spectatee);
+void SetSpectatee_status(entity this, int spectatee_num);
+
+void FixPlayermodel(entity player);
+
+void ClientInit_misc(entity this);
+
+int GetPlayerLimit();
+
+bool joinAllowed(entity this);
+void Join(entity this);
+
 #define SPECTATE_COPY() ACCUMULATE void SpectateCopy(entity this, entity spectatee)
 #define SPECTATE_COPYFIELD(fld) SPECTATE_COPY() { this.(fld) = spectatee.(fld); }