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

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 9c4544bba..c565651d4 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,5 +1,6 @@
 #include "teamradar.qh"
 
+#include "autocvars.qh"
 #include "hud/_mod.qh"
 
 #include <common/mutators/mutator/waypoints/all.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;
 }
 
@@ -92,18 +93,19 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 
 	coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord3d));
 
-	makevectors(pangles - '0 1 0' * teamradar_angle);
+	vector forward, right, up;
+	MAKE_VECTORS(pangles - '0 1 0' * teamradar_angle, forward, right, up);
 	if(v_flipped)
 	{
-		v_forward.x = -v_forward.x;
-		v_right.x = -v_right.x;
-		v_up.x = -v_up.x;
+		forward.x = -forward.x;
+		right.x = -right.x;
+		up.x = -up.x; // TODO: unused!
 	}
-	v_forward.z = 0;
-	v_forward = normalize(v_forward);
-	v_forward.y *= -1.0;
-	v_right.x = -v_forward.y;
-	v_right.y = v_forward.x;
+	forward.z = 0;
+	forward = normalize(forward);
+	forward.y *= -1.0;
+	right.x = -forward.y;
+	right.y = forward.x;
 
 	if(rgb == '1 1 1')
 		rgb2 = '0 0 0';
@@ -111,17 +113,17 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 		rgb2 = '1 1 1';
 
 	R_BeginPolygon("", 0);
-	R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, panel_fg_alpha);
-	R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, panel_fg_alpha);
-	R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, panel_fg_alpha);
-	R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, panel_fg_alpha);
+	R_PolygonVertex(coord+forward*3, '0 0 0', rgb2, panel_fg_alpha);
+	R_PolygonVertex(coord+right*4-forward*2.5, '0 1 0', rgb2, panel_fg_alpha);
+	R_PolygonVertex(coord-forward*2, '1 0 0', rgb2, panel_fg_alpha);
+	R_PolygonVertex(coord-right*4-forward*2.5, '1 1 0', rgb2, panel_fg_alpha);
 	R_EndPolygon();
 
 	R_BeginPolygon("", 0);
-	R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, panel_fg_alpha);
-	R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, panel_fg_alpha);
-	R_PolygonVertex(coord-v_forward, '1 0 0', rgb, panel_fg_alpha);
-	R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, panel_fg_alpha);
+	R_PolygonVertex(coord+forward*2, '0 0 0', rgb, panel_fg_alpha);
+	R_PolygonVertex(coord+right*3-forward*2, '0 1 0', rgb, panel_fg_alpha);
+	R_PolygonVertex(coord-forward, '1 0 0', rgb, panel_fg_alpha);
+	R_PolygonVertex(coord-right*3-forward*2, '1 1 0', rgb, panel_fg_alpha);
 	R_EndPolygon();
 }
 
@@ -148,7 +150,7 @@ void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb,
 
 void draw_teamradar_link(vector start, vector end, int colors)
 {
-    TC(int, colors);
+	TC(int, colors);
 	vector c0, c1, norm;
 
 	start = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(start));
@@ -186,7 +188,7 @@ void teamradar_loadcvars()
 	hud_panel_radar_maximized_zoommode = autocvar_hud_panel_radar_maximized_zoommode;
 
 	// others default to 0
-	// match this to defaultXonotic.cfg!
+	// match this to default hud cfg file!
 	if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096;
 	if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * panel_fg_alpha;
 	if(!hud_panel_radar_size.x) hud_panel_radar_size.x = 128;
@@ -207,17 +209,13 @@ NET_HANDLE(ENT_CLIENT_RADARLINK, bool isnew)
 
 	if(sendflags & 1)
 	{
-		this.origin_x = ReadCoord();
-		this.origin_y = ReadCoord();
-		this.origin_z = ReadCoord();
+		this.origin = ReadVector();
 		setorigin(this, this.origin);
 	}
 
 	if(sendflags & 2)
 	{
-		this.velocity_x = ReadCoord();
-		this.velocity_y = ReadCoord();
-		this.velocity_z = ReadCoord();
+		this.velocity = ReadVector();
 	}
 
 	if(sendflags & 4)