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

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index cccce7680..f3ec99bfe 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)
@@ -15,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)
@@ -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;
 
@@ -118,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)
 {
@@ -171,13 +170,18 @@ 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 = 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;
@@ -188,9 +192,6 @@ void teamradar_loadcvars()
 	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