X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=71efa5f9d931233f32899305692f023ceaea5d96;hp=eedecf87b96ced564b4a0daf7d87d5d1e355617e;hb=ceb30359c438be5c6c6257d65e92191431465e1a;hpb=267433aa7d5dd80399b808f692b8bc1ef75f0851

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index eedecf87b9..71efa5f9d9 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -53,8 +53,8 @@ void send_CSQC_teamnagger() {
 	WriteByte(MSG_BROADCAST, TE_CSQC_TEAMNAGGER);
 }
 
-float ClientData_Send(entity to, int sf)
-{SELFPARAM();
+bool ClientData_Send(entity this, entity to, int sf)
+{
 	if(to != self.owner)
 	{
 		error("wtf");
@@ -667,8 +667,8 @@ void PutClientInServer()
 .float ebouncefactor, ebouncestop; // electro's values
 // TODO do we need all these fields, or should we stop autodetecting runtime
 // changes and just have a console command to update this?
-float ClientInit_SendEntity(entity to, int sf)
-{SELFPARAM();
+bool ClientInit_SendEntity(entity this, entity to, int sf)
+{
 	WriteByte(MSG_ENTITY, ENT_CLIENT_INIT);
 	WriteByte(MSG_ENTITY, g_nexball_meter_period * 32);
 	WriteInt24_t(MSG_ENTITY, compressShotOrigin(hook_shotorigin[0]));
@@ -1216,7 +1216,7 @@ void ClientConnect (void)
 	else
 		stuffcmd(self, "set _teams_available 0\n");
 
-	attach_entcs();
+	attach_entcs(self);
 
 	bot_relinkplayerlist();
 
@@ -1302,8 +1302,7 @@ void ClientDisconnect (void)
 
 	bot_clientdisconnect();
 
-	if(self.entcs)
-		detach_entcs();
+	detach_entcs(self);
 
 	if(autocvar_sv_eventlog)
 		GameLogEcho(strcat(":part:", ftos(self.playerid)));