Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/server/g_casings.qc b/qcsrc/server/g_casings.qc
index e2c1c29385f57acc74b6ae2eca04dfeb287cd18d..b9ad94e3f3910ec90f254a9a4ded0b3f2e9646e7 100644 (file)
--- a/qcsrc/server/g_casings.qc
+++ b/qcsrc/server/g_casings.qc
@@ -1,23 +1,27 @@
-float Casing_SendEntity(entity to, float sf)
+#include "_all.qh"
+
+#include "../common/util.qh"
+
+float Casing_SendEntity(entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_CASING);
        WriteByte(MSG_ENTITY, self.state); // actually type
-       WriteCoord(MSG_ENTITY, self.origin_x);
-       WriteCoord(MSG_ENTITY, self.origin_y);
-       WriteCoord(MSG_ENTITY, self.origin_z);
-       WriteShort(MSG_ENTITY, self.oldorigin_x); // acrually compressed velocity
-       WriteByte(MSG_ENTITY, self.angles_x * 256 / 360);
-       WriteByte(MSG_ENTITY, self.angles_y * 256 / 360);
-       WriteByte(MSG_ENTITY, self.angles_z * 256 / 360);
-       return TRUE;
+       WriteCoord(MSG_ENTITY, self.origin.x);
+       WriteCoord(MSG_ENTITY, self.origin.y);
+       WriteCoord(MSG_ENTITY, self.origin.z);
+       WriteShort(MSG_ENTITY, self.oldorigin.x); // acrually compressed velocity
+       WriteByte(MSG_ENTITY, self.angles.x * 256 / 360);
+       WriteByte(MSG_ENTITY, self.angles.y * 256 / 360);
+       WriteByte(MSG_ENTITY, self.angles.z * 256 / 360);
+       return true;
 }
 
-void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, float casingtype, entity casingowner)
+void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner)
 {
        entity e;
        vector org;
 
-       org = self.origin + self.view_ofs + self.weaponentity.spawnorigin_x * v_forward - self.weaponentity.spawnorigin_y * v_right + self.weaponentity.spawnorigin_z * v_up;
+       org = self.origin + self.view_ofs + self.weaponentity.spawnorigin.x * v_forward - self.weaponentity.spawnorigin.y * v_right + self.weaponentity.spawnorigin.z * v_up;
 
        if(!sound_allowed(MSG_BROADCAST, casingowner))
                casingtype |= 0x80;
@@ -29,6 +33,6 @@ void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float ran
        e.angles = ang;
        e.oldorigin_x = compressShortVector(e.velocity);
 
-       Net_LinkEntity(e, TRUE, 0.2, Casing_SendEntity);
+       Net_LinkEntity(e, true, 0.2, Casing_SendEntity);
                // 0.2s should be enough time for all clients to receive this ent once, do the gibbage and be done with it
 }