Even more floats to bool/int

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_violence.qc

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index ba2426718a571ca706958e8de9b6c3ad94b35a71..4ef4f45ff23e1b1453ab33ec3a3d775c393385b9 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -1,13 +1,15 @@
-float Violence_GibSplash_SendEntity(entity to, float sf)
+#include "g_violence.qh"
+
+float Violence_GibSplash_SendEntity(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?
@@ -27,8 +29,9 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
        e.state |= 8 * self.species; // gib type, ranges from 0 to 15
 
        // 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);
 
@@ -37,7 +40,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)