X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=aae39ea66eccbc9e9190e1797fedcabee3e366de;hb=3a4877cd66f71e3d958152d13c51f95c8ad94b18;hp=49d1c1b4691c3136f11c4fd3aa87c27a816c9ea9;hpb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 49d1c1b46..aae39ea66 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -1,10 +1,28 @@
 #include "cl_player.qh"
-#include "g_triggers.qh"
+#include "_all.qh"
+
+#include "bot/bot.qh"
+#include "cheats.qh"
+#include "g_damage.qh"
+#include "g_subs.qh"
 #include "g_violence.qh"
 #include "miscfunctions.qh"
+#include "portals.qh"
+#include "teamplay.qh"
+#include "waypointsprites.qh"
+#include "weapons/throwing.qh"
+#include "command/common.qh"
+#include "../common/animdecide.qh"
+#include "../common/csqcmodel_settings.qh"
+#include "../common/deathtypes.qh"
+#include "../common/triggers/subs.qh"
+#include "../common/playerstats.qh"
+#include "../csqcmodellib/sv_model.qh"
 
 #include "weapons/weaponstats.qh"
 
+#include "../common/animdecide.qh"
+
 void CopyBody_Think(void)
 {
 	if(self.CopyBody_nextthink && time > self.CopyBody_nextthink)
@@ -147,7 +165,7 @@ void player_anim (void)
 	}
 }
 
-void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
 	float take, save;
 	vector v;
@@ -767,9 +785,9 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 				flood = 2;
 			}
 
-			if(time >= source.flood_field)
+			if (time >= source.(flood_field))
 			{
-				source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + lines * flood_spl;
+				source.(flood_field) = max(time - flood_burst * flood_spl, source.(flood_field)) + lines * flood_spl;
 			}
 			else
 			{
@@ -779,14 +797,14 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 		}
 		else
 		{
-			if(time >= source.flood_field)
-				source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + flood_spl;
+			if (time >= source.(flood_field))
+				source.(flood_field) = max(time - flood_burst * flood_spl, source.(flood_field)) + flood_spl;
 			else
 				flood = 1;
 		}
 
 		if (timeout_status == TIMEOUT_ACTIVE) // when game is paused, no flood protection
-			source.flood_field = flood = 0;
+			source.(flood_field) = flood = 0;
 	}
 
 	if(flood == 2) // cannot happen for empty msgstr
@@ -831,9 +849,9 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 	}
 	else if(flood == 1)
 	{
-		if(autocvar_g_chat_flood_notify_flooder)
+		if (autocvar_g_chat_flood_notify_flooder)
 		{
-			sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.flood_field - time), "^3 seconds\n"));
+			sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.(flood_field) - time), "^3 seconds\n"));
 			ret = 0;
 		}
 		else
@@ -1003,9 +1021,9 @@ float LoadPlayerSounds(string f, float first)
 			field = GetVoiceMessageSampleField(argv(0));
 		if(GetPlayerSoundSampleField_notFound)
 			continue;
-		if(self.field)
-			strunzone(self.field);
-		self.field = strzone(strcat(argv(1), " ", argv(2)));
+		if (self.(field))
+			strunzone(self.(field));
+		self.(field) = strzone(strcat(argv(1), " ", argv(2)));
 	}
 	fclose(fh);
 	return 1;
@@ -1200,7 +1218,7 @@ void GlobalSound(string sample, float chan, float voicetype)
 
 void PlayerSound(.string samplefield, float chan, float voicetype)
 {
-	GlobalSound(self.samplefield, chan, voicetype);
+	GlobalSound(self.(samplefield), chan, voicetype);
 }
 
 void VoiceMessage(string type, string msg)
@@ -1221,10 +1239,10 @@ void VoiceMessage(string type, string msg)
 
 	flood = Say(self, ownteam, world, msg, 1);
 
-	if(IS_SPEC(self) || IS_OBSERVER(self) || flood < 0)
-		FakeGlobalSound(self.sample, CH_VOICE, voicetype);
+	if (IS_SPEC(self) || IS_OBSERVER(self) || flood < 0)
+		FakeGlobalSound(self.(sample), CH_VOICE, voicetype);
 	else if (flood > 0)
-		GlobalSound(self.sample, CH_VOICE, voicetype);
+		GlobalSound(self.(sample), CH_VOICE, voicetype);
 }
 
 void MoveToTeam(entity client, float team_colour, float type)