X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=d8264f42989f8b6810776afbdc2364a5d9b5e0c7;hb=0df9efc608a567dcbff2f81680174626a43e78aa;hp=af43dae0373f125aa37d7856b65667dbb4880281;hpb=b6a34dc838763a87c285482ecee9f130f687deaa;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index af43dae03..d8264f429 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,8 +1,9 @@
 #include "teamradar.qh"
 
-#include "hud/all.qh"
+#include "autocvars.qh"
+#include "hud/_mod.qh"
 
-#include "../common/mutators/mutator/waypoints/all.qh"
+#include <common/mutators/mutator/waypoints/all.qh>
 
 #include "../lib/csqcmodel/interpolate.qh"
 
@@ -20,7 +21,7 @@ vector teamradar_texcoord_to_2dcoord(vector in)
 	vector out;
 	in -= teamradar_origin3d_in_texcoord;
 
-	out = rotate(in, teamradar_angle * DEG2RAD);
+	out = Rotate(in, teamradar_angle * DEG2RAD);
 	out.y = - out.y; // screen space is reversed
 
 	out = out * teamradar_size;
@@ -42,19 +43,19 @@ vector teamradar_2dcoord_to_texcoord(vector in)
 	out = out / teamradar_size;
 
 	out_y = - out_y; // screen space is reversed
-	out = rotate(out, -teamradar_angle * DEG2RAD);
+	out = Rotate(out, -teamradar_angle * DEG2RAD);
 
 	out += teamradar_origin3d_in_texcoord;
 
 	return out;
 }
 
-vector teamradar_texcoord_to_3dcoord(vector in,float z)
+vector teamradar_texcoord_to_3dcoord(vector in,float oz)
 {
 	vector out;
 	out_x = in_x * (mi_picmax_x - mi_picmin_x) + mi_picmin_x;
 	out_y = in_y * (mi_picmax_y - mi_picmin_y) + mi_picmin_y;
-	out_z = z;
+	out_z = oz;
 	return out;
 }
 
@@ -128,7 +129,7 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb, float a)
 {
 	coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord));
-	drawpic(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon.m_radaricon)), '8 8 0', rgb, a, 0);
+	drawpic_builtin(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon.m_radaricon)), '8 8 0', rgb, a, 0);
 
 	if(pingdata)
 	{
@@ -141,13 +142,14 @@ void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb,
 			if(dt >= 1 || dt <= 0)
 				continue;
 			vector v = '2 2 0' * teamradar_size * dt;
-			drawpic(coord - 0.5 * v, "gfx/teamradar_ping", v, '1 1 1', (1 - dt) * a, DRAWFLAG_ADDITIVE);
+			drawpic_builtin(coord - 0.5 * v, "gfx/teamradar_ping", v, '1 1 1', (1 - dt) * a, DRAWFLAG_ADDITIVE);
 		}
 	}
 }
 
 void draw_teamradar_link(vector start, vector end, int colors)
 {
+    TC(int, colors);
 	vector c0, c1, norm;
 
 	start = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(start));
@@ -198,32 +200,29 @@ 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 (isnew) IL_PUSH(g_radarlinks, this);
 
 	if(sendflags & 1)
 	{
-		self.origin_x = ReadCoord();
-		self.origin_y = ReadCoord();
-		self.origin_z = ReadCoord();
-		setorigin(self, self.origin);
+		this.origin = ReadVector();
+		setorigin(this, this.origin);
 	}
 
 	if(sendflags & 2)
 	{
-		self.velocity_x = ReadCoord();
-		self.velocity_y = ReadCoord();
-		self.velocity_z = ReadCoord();
+		this.velocity = ReadVector();
 	}
 
 	if(sendflags & 4)
 	{
-		self.team = ReadByte();
+		this.team = ReadByte();
 	}
 
 	return = true;
 
-	InterpolateOrigin_Note();
+	InterpolateOrigin_Note(this);
 }