Merge branch 'terencehill/lms_itemtimes_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / teamradar.qc

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 1a6322d9752ce7fd34b1865602220e1cf526689e..96fd5ee977695877739119e0ba69427588649859 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -2,7 +2,7 @@
 
 #include "hud/all.qh"
 
-#include "../common/mutators/mutator/waypoints/all.qh"
+#include <common/mutators/mutator/waypoints/all.qh>
 
 #include "../lib/csqcmodel/interpolate.qh"
 
@@ -58,12 +58,6 @@ vector teamradar_texcoord_to_3dcoord(vector in,float z)
        return out;
 }
 
-vector yinvert(vector v)
-{
-       v.y = 1 - v.y;
-       return v;
-}
-
 void draw_teamradar_background(float fg)
 {
        float fga;
@@ -200,34 +194,36 @@ void teamradar_loadcvars()
 
 // radar links
 
-void Ent_RadarLink()
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_RADARLINK, bool isnew)
+{
        int sendflags = ReadByte();
 
-       InterpolateOrigin_Undo();
+       InterpolateOrigin_Undo(this);
 
-       self.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN;
-       self.classname = "radarlink";
+       this.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN;
+       this.classname = "radarlink";
 
        if(sendflags & 1)
        {
-               self.origin_x = ReadCoord();
-               self.origin_y = ReadCoord();
-               self.origin_z = ReadCoord();
-               setorigin(self, self.origin);
+               this.origin_x = ReadCoord();
+               this.origin_y = ReadCoord();
+               this.origin_z = ReadCoord();
+               setorigin(this, this.origin);
        }
 
        if(sendflags & 2)
        {
-               self.velocity_x = ReadCoord();
-               self.velocity_y = ReadCoord();
-               self.velocity_z = ReadCoord();
+               this.velocity_x = ReadCoord();
+               this.velocity_y = ReadCoord();
+               this.velocity_z = ReadCoord();
        }
 
        if(sendflags & 4)
        {
-               self.team = ReadByte();
+               this.team = ReadByte();
        }
 
-       InterpolateOrigin_Note();
+       return = true;
+
+       InterpolateOrigin_Note(this);
 }