X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=cccce7680b4c352eb5af05e821ac62f04cf31fd8;hp=1a4ec004516636b50d211c4e35746fe2f5e58e3a;hb=71b2295b8ed7e2d9a5785467e8d9f65b69494b89;hpb=b1a6464ea70a32dc63e3970d6c5f34a1b2fc7c2c

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 1a4ec00451..cccce7680b 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -4,8 +4,8 @@ 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_radar_scale; // window size = ...qu
-float hud_radar_nohudhack;
+float hud_panel_radar_scale; // window size = ...qu
+float hud_panel_radar_nohudhack;
 float v_flipped;
 
 float vlen2d(vector v)
@@ -53,19 +53,10 @@ vector yinvert(vector v)
 	return v;
 }
 
-void draw_teamradar_background(float bg, float fg)
+void draw_teamradar_background(float fg)
 {
 	float fga;
 	vector fgc;
-	if(bg > 0)
-	{
-		R_BeginPolygon("", 0);
-		R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y), '0 0 0', '0 0 0', bg);
-		R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5 + teamradar_extraclip_maxs_x) + '0 1 0' * (teamradar_origin2d_y - teamradar_size2d_y * 0.5 + teamradar_extraclip_mins_y), '0 0 0', '0 0 0', bg);
-		R_PolygonVertex('1 0 0' * (teamradar_origin2d_x + teamradar_size2d_x * 0.5 + teamradar_extraclip_maxs_x) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5 + teamradar_extraclip_maxs_y), '0 0 0', '0 0 0', bg);
-		R_PolygonVertex('1 0 0' * (teamradar_origin2d_x - teamradar_size2d_x * 0.5 + teamradar_extraclip_mins_x) + '0 1 0' * (teamradar_origin2d_y + teamradar_size2d_y * 0.5 + teamradar_extraclip_maxs_y), '0 0 0', '0 0 0', bg);
-		R_EndPolygon();
-	}
 
 	if(fg > 0 && minimapname != "")
 	{
@@ -115,17 +106,17 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
 		rgb2 = '1 1 1';
 
 	R_BeginPolygon("", 0);
-	R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, hud_alpha_fg);
-	R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, hud_alpha_fg);
-	R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, hud_alpha_fg);
-	R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, hud_alpha_fg);
+	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_EndPolygon();
 
 	R_BeginPolygon("", 0);
-	R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, hud_alpha_fg);
-	R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, hud_alpha_fg);
-	R_PolygonVertex(coord-v_forward, '1 0 0', rgb, hud_alpha_fg);
-	R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, hud_alpha_fg);
+	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_EndPolygon();
 };
 
@@ -170,41 +161,36 @@ void draw_teamradar_link(vector start, vector end, float colors)
 	c1 = colormapPaletteColor((colors & 0xF0) / 0x10, FALSE);
 
 	R_BeginPolygon("", 0);
-	R_PolygonVertex(start - norm, '0 0 0', c0, hud_alpha_fg);
-	R_PolygonVertex(start + norm, '0 1 0', c0, hud_alpha_fg);
-	R_PolygonVertex(end + norm, '1 1 0', c1, hud_alpha_fg);
-	R_PolygonVertex(end - norm, '1 0 0', c1, hud_alpha_fg);
+	R_PolygonVertex(start - norm, '0 0 0', c0, panel_fg_alpha);
+	R_PolygonVertex(start + norm, '0 1 0', c0, panel_fg_alpha);
+	R_PolygonVertex(end + norm, '1 1 0', c1, panel_fg_alpha);
+	R_PolygonVertex(end - norm, '1 0 0', c1, panel_fg_alpha);
 	R_EndPolygon();
 }
 
-float hud_radar_scale;
-float hud_radar_background_alpha;
-float hud_radar_foreground_alpha;
-float hud_radar_rotation;
-vector hud_radar_size;
-vector hud_radar_position;
-float hud_radar_zoommode;
+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;
 
 void teamradar_loadcvars()
 {
-	v_flipped = cvar("v_flipped");
-	hud_radar_scale = cvar("hud_radar_scale");
-	hud_radar_background_alpha = cvar("hud_radar_background_alpha") * hud_alpha_fg;
-	hud_radar_foreground_alpha = cvar("hud_radar_foreground_alpha") * hud_alpha_fg;
-	hud_radar_rotation = cvar("hud_radar_rotation");
-	hud_radar_zoommode = cvar("hud_radar_zoommode");
+	v_flipped = autocvar_v_flipped;
+	hud_panel_radar_scale = autocvar_hud_panel_radar_scale;
+	hud_panel_radar_foreground_alpha = autocvar_hud_panel_radar_foreground_alpha * panel_fg_alpha;
+	hud_panel_radar_rotation = autocvar_hud_panel_radar_rotation;
+	hud_panel_radar_zoommode = autocvar_hud_panel_radar_zoommode;
 
 	// others default to 0
 	// match this to defaultXonotic.cfg!
-	if(!hud_radar_scale) hud_radar_scale = 4096;
-	if(!hud_radar_background_alpha) hud_radar_background_alpha = 0.4 * hud_alpha_fg;
-	if(!hud_radar_foreground_alpha) hud_radar_foreground_alpha = 0.8 * hud_alpha_fg;
-	if(!hud_radar_size_x) hud_radar_size_x = 128;
-	if(!hud_radar_size_y) hud_radar_size_y = hud_radar_size_x;
-
-	hud_radar_size_z = 0;
-	hud_radar_nohudhack = hud_radar_position_z;
-	hud_radar_position_z = 0;
+	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;
+
+	hud_panel_radar_size_z = 0;
+	hud_panel_radar_nohudhack = 0;
 }
 
 // radar links