X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=9c4544bba08c0afce4ed04c14b8546d979da4d70;hb=4ee2807b2d8f808928ef14b3e814945b3edb4350;hp=aa7923bafc7a74bddc21f3ac08c3dd29a100492b;hpb=9eb82dd6fc682e3ddecd471835f9047816236342;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index aa7923baf..9c4544bba 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,26 +1,10 @@
 #include "teamradar.qh"
-#include "_all.qh"
 
-#include "hud.qh"
+#include "hud/_mod.qh"
 
-#include "../common/util.qh"
+#include <common/mutators/mutator/waypoints/all.qh>
 
-#include "../csqcmodellib/interpolate.qh"
-
-float vlen2d(vector v)
-{
-	return sqrt(v.x * v.x + v.y * v.y);
-}
-
-float vlen_maxnorm2d(vector v)
-{
-	return max(v.x, v.y, -v.x, -v.y);
-}
-
-float vlen_minnorm2d(vector v)
-{
-	return min(max(v.x, -v.x), max(v.y, -v.y));
-}
+#include "../lib/csqcmodel/interpolate.qh"
 
 vector teamradar_3dcoord_to_texcoord(vector in)
 {
@@ -46,10 +30,32 @@ vector teamradar_texcoord_to_2dcoord(vector in)
 	return out;
 }
 
-vector yinvert(vector v)
+
+vector teamradar_2dcoord_to_texcoord(vector in)
 {
-	v.y = 1 - v.y;
-	return v;
+	vector out;
+	out = in;
+
+	out -= teamradar_origin2d;
+	if(v_flipped)
+		out_x = -out_x;
+	out = out / teamradar_size;
+
+	out_y = - out_y; // screen space is reversed
+	out = rotate(out, -teamradar_angle * DEG2RAD);
+
+	out += teamradar_origin3d_in_texcoord;
+
+	return out;
+}
+
+vector teamradar_texcoord_to_3dcoord(vector in,float z)
+{
+	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;
+	return out;
 }
 
 void draw_teamradar_background(float fg)
@@ -119,10 +125,10 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 	R_EndPolygon();
 }
 
-void draw_teamradar_icon(vector coord, float icon, entity pingdata, vector rgb, float a)
+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)), '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)
 	{
@@ -135,13 +141,14 @@ void draw_teamradar_icon(vector coord, float 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));
@@ -188,34 +195,37 @@ void teamradar_loadcvars()
 
 // radar links
 
-void Ent_RadarLink()
+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_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);
 }