]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use Coord instead of Short for spawnpoint origins (potentially fixes effects on reall...
authorMario <mario@smbclan.net>
Sun, 6 Mar 2016 13:33:40 +0000 (23:33 +1000)
committerMario <mario@smbclan.net>
Sun, 6 Mar 2016 13:33:40 +0000 (23:33 +1000)
qcsrc/client/main.qc
qcsrc/server/spawnpoints.qc

index d787dc0f5472800b387ad9e42a048ed25887cffe..8cc5745182a2fb1e12f61eefab3e21f42875a192 100644 (file)
@@ -696,9 +696,9 @@ NET_HANDLE(ENT_CLIENT_SPAWNPOINT, bool is_new)
 {
        float teamnum = (ReadByte() - 1);
        vector spn_origin;
-       spn_origin.x = ReadShort();
-       spn_origin.y = ReadShort();
-       spn_origin.z = ReadShort();
+       spn_origin.x = ReadCoord();
+       spn_origin.y = ReadCoord();
+       spn_origin.z = ReadCoord();
 
        //if(is_new)
        //{
@@ -751,9 +751,9 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new)
 
        if(entnum)
        {
-               this.origin_x = ReadShort();
-               this.origin_y = ReadShort();
-               this.origin_z = ReadShort();
+               this.origin_x = ReadCoord();
+               this.origin_y = ReadCoord();
+               this.origin_z = ReadCoord();
 
                if(is_new)
                {
index 022e27608f34016794153f3dc1dbee12f0167b90..0692d90886521cabe42d84eb1477b32aff438cc6 100644 (file)
@@ -15,9 +15,9 @@ bool SpawnPoint_Send(entity this, entity to, int sf)
        WriteHeader(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT);
 
        WriteByte(MSG_ENTITY, self.team);
-       WriteShort(MSG_ENTITY, self.origin.x);
-       WriteShort(MSG_ENTITY, self.origin.y);
-       WriteShort(MSG_ENTITY, self.origin.z);
+       WriteCoord(MSG_ENTITY, self.origin.x);
+       WriteCoord(MSG_ENTITY, self.origin.y);
+       WriteCoord(MSG_ENTITY, self.origin.z);
 
        return true;
 }
@@ -31,9 +31,9 @@ bool SpawnEvent_Send(entity this, entity to, int sf)
        if(autocvar_g_spawn_alloweffects)
        {
                WriteByte(MSG_ENTITY, etof(self.owner));
-               WriteShort(MSG_ENTITY, self.owner.origin.x);
-               WriteShort(MSG_ENTITY, self.owner.origin.y);
-               WriteShort(MSG_ENTITY, self.owner.origin.z);
+               WriteCoord(MSG_ENTITY, self.owner.origin.x);
+               WriteCoord(MSG_ENTITY, self.owner.origin.y);
+               WriteCoord(MSG_ENTITY, self.owner.origin.z);
                send = true;
        }
        else if((to == self.owner) || (IS_SPEC(to) && (to.enemy == self.owner)) )