X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fradar.qc;h=925050df1cca9c66dc533dd72be5930585979e9b;hb=632c547367cea91f7df73f4af95d79556dbc83d4;hp=4ab16d05290edea6a7dd0f6885e4dbaf946a3c3a;hpb=b0c2a2d4ced4c0be25796d273376bcb975697318;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index 4ab16d052..925050df1 100644
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -1,3 +1,11 @@
+#include "radar.qh"
+
+#include <common/ent_cs.qh>
+#include <common/mapinfo.qh>
+#include <client/mapvoting.qh>
+#include <client/teamradar.qh>
+#include <common/mutators/mutator/waypoints/all.qh>
+
 // Radar (#6)
 
 float HUD_Radar_Clickable()
@@ -7,6 +15,7 @@ float HUD_Radar_Clickable()
 
 void HUD_Radar_Show_Maximized(bool doshow,float clickable)
 {
+    TC(bool, doshow);
 	hud_panel_radar_maximized = doshow;
 	hud_panel_radar_temp_hidden = 0;
 
@@ -34,8 +43,9 @@ void HUD_Radar_Hide_Maximized()
 }
 
 
-float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary)
+float HUD_Radar_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
+    TC(int, bInputType);
 	if(!hud_panel_radar_maximized || !hud_panel_radar_mouse ||
 		autocvar__hud_configure || mv_active)
 		return false;
@@ -156,8 +166,7 @@ void HUD_Radar_Mouse()
 	}
 
 
-	const vector cursor_size = '32 32 0';
-	drawpic(mousepos-'8 4 0', strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), cursor_size, '1 1 1', 0.8, DRAWFLAG_NORMAL);
+	draw_cursor_normal(mousepos, '1 1 1', 0.8);
 }
 
 void HUD_Radar()
@@ -266,6 +275,7 @@ void HUD_Radar()
 	pos = panel_pos;
 	mySize = panel_size;
 
+	HUD_Scale_Enable();
 	HUD_Panel_DrawBg(1);
 	if(panel_bg_padding)
 	{
@@ -276,7 +286,7 @@ void HUD_Radar()
 	int color2;
 	float scale2d, normalsize, bigsize;
 
-	teamradar_origin2d = pos + 0.5 * mySize;
+	teamradar_origin2d = HUD_Shift(pos + 0.5 * mySize);
 	teamradar_size2d = mySize;
 
 	if(minimapname == "")
@@ -285,7 +295,7 @@ void HUD_Radar()
 	teamradar_loadcvars();
 
 	scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
-	teamradar_size2d = mySize;
+	teamradar_size2d = HUD_Scale(mySize);
 
 	teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center
 
@@ -333,11 +343,9 @@ void HUD_Radar()
 
 	draw_teamradar_background(hud_panel_radar_foreground_alpha);
 
-	FOREACH_ENTITY_CLASS("radarlink", true, LAMBDA(
-		draw_teamradar_link(it.origin, it.velocity, it.team);
-	));
+	FOREACH_ENTITY_CLASS("radarlink", true, draw_teamradar_link(it.origin, it.velocity, it.team));
 
-	FOREACH_ENTITY_FLAGS(teamradar_icon, 0xFFFFFF, LAMBDA(
+	FOREACH_ENTITY_FLAGS(teamradar_icon, 0xFFFFFF, {
 		if ( hud_panel_radar_mouse )
 		if ( it.health > 0 )
 		if ( it.team == myteam+1 || gametype == MAPINFO_TYPE_RACE )
@@ -354,13 +362,13 @@ void HUD_Radar()
 		}
 		entity icon = RadarIcons_from(it.teamradar_icon);
 		draw_teamradar_icon(it.origin, icon, it, spritelookupcolor(it, icon.netname, it.teamradar_color), panel_fg_alpha);
-	));
-	AL_EACH(_entcs, e, it != NULL, LAMBDA(
+	});
+	AL_EACH(_entcs, e, it != NULL, {
 		if (!it.m_entcs_private) continue;
 		if (entcs_is_self(it)) continue;
 		color2 = entcs_GetTeam(it.sv_entnum);
 		draw_teamradar_player(it.origin, it.angles, Team_ColorRGB(color2));
-	));
+	});
 	draw_teamradar_player(view_origin, view_angles, '1 1 1');
 
 	drawresetcliparea();