X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=c866a1b73e4eb1ef6d95a975531b3bab646c5926;hb=a0b626ee78db909c214cc0fc7e829f8a8379704f;hp=aa7923bafc7a74bddc21f3ac08c3dd29a100492b;hpb=1bc3ab0285f65c7ed0c75cbba00da2460921c973;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index aa7923baf..c866a1b73 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 "../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,6 +30,34 @@ vector teamradar_texcoord_to_2dcoord(vector in)
 	return out;
 }
 
+
+vector teamradar_2dcoord_to_texcoord(vector in)
+{
+	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;
+}
+
 vector yinvert(vector v)
 {
 	v.y = 1 - v.y;
@@ -119,10 +131,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(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon.m_radaricon)), '8 8 0', rgb, a, 0);
 
 	if(pingdata)
 	{
@@ -189,7 +201,7 @@ void teamradar_loadcvars()
 // radar links
 
 void Ent_RadarLink()
-{
+{SELFPARAM();
 	int sendflags = ReadByte();
 
 	InterpolateOrigin_Undo();