Merge branch 'master' into Mario/hagar_notfixed

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

diff --git a/qcsrc/server/cl_player.qh b/qcsrc/server/cl_player.qh
index cf5ec0a7d1df502a7297636ed9d51ddcd061c079..22c595f66d3cd9ca4a59ce2e507e0d9f65dc2524 100644 (file)
--- a/qcsrc/server/cl_player.qh
+++ b/qcsrc/server/cl_player.qh
@@ -1,22 +1,19 @@
-#ifndef CL_PLAYER_H
-#define CL_PLAYER_H
+#pragma once
 
 .entity pusher;
 .float pushltime;
 .float istypefrag;
 
 .float CopyBody_nextthink;
-.void(void) CopyBody_think;
-void CopyBody_Think(void);
-void CopyBody(float keepvelocity);
-
-float player_getspecies();
+.void() CopyBody_think;
+void CopyBody_Think();
+void CopyBody(entity this, float keepvelocity);
 
 void player_setupanimsformodel();
 
-void player_anim (void);
+void player_anim();
 
-void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
+void PlayerCorpseDamage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
 
 // g_<gametype>_str:
 // If 0, default is used.
@@ -25,51 +22,18 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
 // For consistency, negative values there are mapped to zero too.
 #define GAMETYPE_DEFAULTED_SETTING(str) \
        ((gametype_setting_tmp = cvar(strcat("g_", GetGametype(), "_" #str))), \
-        (gametype_setting_tmp < 0) ? 0 : \
-        (gametype_setting_tmp == 0) ? max(0, autocvar_g_##str) : \
-        gametype_setting_tmp)
-
-
-void calculate_player_respawn_time();
-
-void ClientKill_Now_TeamChange();
-
-void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
-
-.float muted; // to be used by prvm_edictset server playernumber muted 1
-float Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol);
-// message "": do not say, just test flood control
-// return value:
-//   1 = accept
-//   0 = reject
-//  -1 = fake accept
-
-float GetVoiceMessageVoiceType(string type);
-
-string allvoicesamples;
-.string GetVoiceMessageSampleField(string type);
+       (gametype_setting_tmp < 0) ? 0 \
+       : (gametype_setting_tmp == 0 || autocvar_g_respawn_delay_forced) ? max(0, autocvar_g_##str) \
+       : gametype_setting_tmp)
 
-.string GetPlayerSoundSampleField(string type);
+void calculate_player_respawn_time(entity this);
 
-void PrecacheGlobalSound(string samplestring);
+void ClientKill_Now_TeamChange(entity this);
 
-void PrecachePlayerSounds(string f);
-
-void ClearPlayerSounds();
-
-float LoadPlayerSounds(string f, float first);
-
-.int modelindex_for_playersound;
-.int skin_for_playersound;
-void UpdatePlayerSounds();
-
-void FakeGlobalSound(string sample, float chan, float voicetype);
-
-void GlobalSound(string sample, float chan, float voicetype);
-
-void PlayerSound(.string samplefield, float chan, float voicetype);
+void MoveToTeam(entity client, float team_colour, float type);
 
-void VoiceMessage(string type, string msg);
+void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
 
-void MoveToTeam(entity client, float team_colour, float type);
-#endif
+/** to be used by `prvm_edictset server playernumber muted 1` */
+.float muted;
+int Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol);