X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_violence.qc;h=2a885f901ab2f0b7100326430fa6963ea31c6855;hb=a97b89297fa91ae42b9d56c262662eb34ede3e45;hp=cae5e3520bc5043939e32f5abeb20952b0eb40b4;hpb=cd69940bb9c1aa5a98bf0653702b77d730419dde;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index cae5e3520..2a885f901 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -1,18 +1,21 @@
-float Violence_GibSplash_SendEntity(entity to, float sf)
+#include "g_violence.qh"
+#include "_all.qh"
+
+bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_GIBSPLASH);
 	WriteByte(MSG_ENTITY, self.state); // actually type
 	WriteByte(MSG_ENTITY, bound(1, self.cnt * 16, 255)); // gibbage amount multiplier
-	WriteShort(MSG_ENTITY, floor(self.origin_x / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(MSG_ENTITY, floor(self.origin_y / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(MSG_ENTITY, floor(self.origin_z / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(MSG_ENTITY, self.oldorigin_x); // acrually compressed velocity
-	return TRUE;
+	WriteShort(MSG_ENTITY, floor(self.origin.x / 4)); // not using a coord here, as gibs don't need this accuracy
+	WriteShort(MSG_ENTITY, floor(self.origin.y / 4)); // not using a coord here, as gibs don't need this accuracy
+	WriteShort(MSG_ENTITY, floor(self.origin.z / 4)); // not using a coord here, as gibs don't need this accuracy
+	WriteShort(MSG_ENTITY, self.oldorigin.x); // acrually compressed velocity
+	return true;
 }
 
 // TODO maybe convert this to a TE?
 void Violence_GibSplash_At(vector org, vector dir, float type, float amount, entity gibowner, entity attacker)
-{
+{SELFPARAM();
 	if(g_cts) // no gibs in CTS
 		return;
 
@@ -29,7 +32,7 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
 	// if this is a copied dead body, send the num of its player instead
 	// TODO: remove this field, read from model txt files
 	if(self.classname == "body")
-		e.team = num_for_edict(self.owner);
+		e.team = num_for_edict(self.enemy);
 	else
 		e.team = num_for_edict(self);
 
@@ -38,7 +41,7 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
 
 	e.oldorigin_x = compressShortVector(e.velocity);
 
-	Net_LinkEntity(e, FALSE, 0.2, Violence_GibSplash_SendEntity);
+	Net_LinkEntity(e, false, 0.2, Violence_GibSplash_SendEntity);
 }
 
 void Violence_GibSplash(entity source, float type, float amount, entity attacker)