X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fteamradar.qc;h=f3ec99bfeebb526424a95dd5bf21cc7e84433b8f;hb=5c3c652b2dfd2191a415365a7931fc714ec2eacb;hp=788c32d82aa9d95def8bc931b89867b948f6ada4;hpb=49413c98cec6a272d0c103a85c1f71aad51ee77c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 788c32d82..f3ec99bfe 100644
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -14,7 +14,7 @@ float vlen2d(vector v)
 
 float vlen_maxnorm2d(vector v)
 {
-	return max4(v_x, v_y, -v_x, -v_y);
+	return max(v_x, v_y, -v_x, -v_y);
 }
 
 float vlen_minnorm2d(vector v)
@@ -80,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;
 
@@ -117,7 +117,7 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player =
 	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)
 {
@@ -170,16 +170,21 @@ void draw_teamradar_link(vector start, vector end, float colors)
 float hud_panel_radar_scale;
 float hud_panel_radar_foreground_alpha;
 float hud_panel_radar_rotation;
-vector hud_panel_radar_size;
+noref vector hud_panel_radar_size; // fteqcc sucks
 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") * 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!