X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=28c992b4d4430d0af87048549ec4be504e19e409;hb=a8f44b0e98aedacaae872b937ee023e24fc30878;hp=dbb884168d12630a94b22c4060918b815eb5a4c4;hpb=aa4c896acf8088d26fcbd5ff4e3f6e7a0acb0600;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index dbb884168..28c992b4d 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -5,7 +5,6 @@ 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 hud_panel_radar_nohudhack;
 float v_flipped;
 
 float vlen2d(vector v)
@@ -81,7 +80,7 @@ void draw_teamradar_background(float fg)
 	}
 }
 
-void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
+void draw_teamradar_player(vector coord3d, vector pangles, vector rgb)
 {
 	vector coord, rgb2;
 
@@ -106,19 +105,19 @@ 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, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, autocvar_hud_panel_fg_alpha);
+	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, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(coord-v_forward, '1 0 0', rgb, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, autocvar_hud_panel_fg_alpha);
+	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();
-};
+}
 
 void draw_teamradar_icon(vector coord, float icon, entity pingdata, vector rgb, float a)
 {
@@ -161,10 +160,10 @@ 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, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(start + norm, '0 1 0', c0, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(end + norm, '1 1 0', c1, autocvar_hud_panel_fg_alpha);
-	R_PolygonVertex(end - norm, '1 0 0', c1, autocvar_hud_panel_fg_alpha);
+	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();
 }
 
@@ -172,27 +171,27 @@ float hud_panel_radar_scale;
 float hud_panel_radar_foreground_alpha;
 float hud_panel_radar_rotation;
 vector hud_panel_radar_size;
-vector hud_panel_radar_position;
 float hud_panel_radar_zoommode;
 
 void teamradar_loadcvars()
 {
-	v_flipped = cvar("v_flipped");
-	hud_panel_radar_scale = cvar("hud_panel_radar_scale");
-	hud_panel_radar_foreground_alpha = cvar("hud_panel_radar_foreground_alpha") * autocvar_hud_panel_fg_alpha;
-	hud_panel_radar_rotation = cvar("hud_panel_radar_rotation");
-	hud_panel_radar_zoommode = cvar("hud_panel_radar_zoommode");
+	v_flipped = autocvar_v_flipped;
+	hud_panel_radar_scale = autocvar_hud_panel_radar_scale;
+	if (hud_panel_radar_maximized && !autocvar__hud_configure)
+	{
+		if (autocvar_hud_panel_radar_maximized_scale > 0)
+			hud_panel_radar_scale = autocvar_hud_panel_radar_maximized_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_panel_radar_scale) hud_panel_radar_scale = 4096;
-	if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * autocvar_hud_panel_fg_alpha;
+	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 = hud_panel_radar_position_z;
-	hud_panel_radar_position_z = 0;
 }
 
 // radar links