X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=7f84f0ef6ad7ed2c742c6c8f6f58cfe47956f501;hb=99facb38338832f539cec7022c414f7a6de458c3;hp=2456ee804c6d0fcba2b34729bad087efd29906a8;hpb=845401fd312c66c059aaee1772ac5d79555ab4fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 2456ee804..7f84f0ef6 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,11 +1,8 @@
-float teamradar_angle; // player yaw angle
-vector teamradar_origin3d_in_texcoord; // player origin
-vector teamradar_origin2d; // 2D origin
-vector teamradar_size2d; // 2D size
-vector teamradar_extraclip_mins, teamradar_extraclip_maxs; // for non-centered radar display
-float teamradar_size; // 2D scale factor
-float hud_panel_radar_scale; // window size = ...qu
-float v_flipped;
+#if defined(CSQC)
+	#include "teamradar.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
 
 float vlen2d(vector v)
 {
@@ -25,9 +22,9 @@ float vlen_minnorm2d(vector v)
 vector teamradar_3dcoord_to_texcoord(vector in)
 {
 	vector out;
-	out_x = (in.x - mi_picmin.x) / (mi_picmax.x - mi_picmin.x);
-	out_y = (in.y - mi_picmin.y) / (mi_picmax.y - mi_picmin.y);
-	out_z = 0;
+	out.x = (in.x - mi_picmin.x) / (mi_picmax.x - mi_picmin.x);
+	out.y = (in.y - mi_picmin.y) / (mi_picmax.y - mi_picmin.y);
+	out.z = 0;
 	return out;
 }
 
@@ -37,18 +34,18 @@ vector teamradar_texcoord_to_2dcoord(vector in)
 	in -= teamradar_origin3d_in_texcoord;
 
 	out = rotate(in, teamradar_angle * DEG2RAD);
-	out_y = - out.y; // screen space is reversed
+	out.y = - out.y; // screen space is reversed
 
 	out = out * teamradar_size;
 	if(v_flipped)
-		out_x = -out.x;
+		out.x = -out.x;
 	out += teamradar_origin2d;
 	return out;
 }
 
 vector yinvert(vector v)
 {
-	v_y = 1 - v.y;
+	v.y = 1 - v.y;
 	return v;
 }
 
@@ -89,15 +86,15 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 	makevectors(pangles - '0 1 0' * teamradar_angle);
 	if(v_flipped)
 	{
-		v_forward_x = -v_forward.x;
-		v_right_x = -v_right.x;
-		v_up_x = -v_up.x;
+		v_forward.x = -v_forward.x;
+		v_right.x = -v_right.x;
+		v_up.x = -v_up.x;
 	}
-	v_forward_z = 0;
+	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;
+	v_right.x = -v_forward.y;
+	v_right.y = v_forward.x;
 
 	if(rgb == '1 1 1')
 		rgb2 = '0 0 0';
@@ -151,10 +148,10 @@ void draw_teamradar_link(vector start, vector end, int colors)
 	start = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(start));
 	end = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(end));
 	norm = normalize(start - end);
-	norm_z = norm.x;
-	norm_x = -norm.y;
-	norm_y = norm.z;
-	norm_z = 0;
+	norm.z = norm.x;
+	norm.x = -norm.y;
+	norm.y = norm.z;
+	norm.z = 0;
 
 	c0 = colormapPaletteColor(colors & 0x0F, false);
 	c1 = colormapPaletteColor((colors & 0xF0) / 0x10, false);
@@ -167,14 +164,6 @@ void draw_teamradar_link(vector start, vector end, int colors)
 	R_EndPolygon();
 }
 
-float hud_panel_radar_scale;
-float hud_panel_radar_foreground_alpha;
-float hud_panel_radar_rotation;
-vector hud_panel_radar_size;
-float hud_panel_radar_zoommode;
-float hud_panel_radar_maximized_zoommode;
-float hud_panel_radar_maximized_rotation;
-
 void teamradar_loadcvars()
 {
 	v_flipped = autocvar_v_flipped;
@@ -194,8 +183,8 @@ void teamradar_loadcvars()
 	// match this to defaultXonotic.cfg!
 	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;
-	if(!hud_panel_radar_size.y) hud_panel_radar_size_y = hud_panel_radar_size.x;
+	if(!hud_panel_radar_size.x) hud_panel_radar_size.x = 128;
+	if(!hud_panel_radar_size.y) hud_panel_radar_size.y = hud_panel_radar_size.x;
 }
 
 // radar links