X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fradar.qc;h=8bbcc29e4ed88f7749a53a01e4737edf872ac381;hb=322dcc99506ae0f1e772fb0a8e535d90ca472e13;hp=33f4e1e649f2d69fb1fdaeb965e2237660ba867f;hpb=71ce27cd515d7e8157535466ef357f83253b64f0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index 33f4e1e64..8bbcc29e4 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;
@@ -79,7 +89,7 @@ float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary)
 				return false;
 		}
 
-		if ( getstati(STAT_HEALTH) <= 0 )
+		if ( STAT(HEALTH) <= 0 )
 		{
 			// Show scoreboard
 			if ( bInputType < 2 )
@@ -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()
@@ -333,17 +342,15 @@ 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 )
+		if ( it.team == myteam+1 || gametype == MAPINFO_TYPE_RACE )
 		{
 			vector coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(it.origin));
-			if ( vlen(mousepos-coord) < 8 )
+			if(vdist((mousepos - coord), <, 8))
 			{
 				vector brightcolor;
 				brightcolor_x = min(1,it.teamradar_color_x*1.5);
@@ -354,14 +361,14 @@ 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;
+		if (it.sv_entnum == current_player) 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');
+	});
+	draw_teamradar_player(entcs_receiver(current_player).origin, view_angles, '1 1 1');
 
 	drawresetcliparea();
 
@@ -369,7 +376,7 @@ void HUD_Radar()
 	{
 		string message = "Click to select teleport destination";
 
-		if ( getstati(STAT_HEALTH) <= 0 )
+		if ( STAT(HEALTH) <= 0 )
 		{
 			message = "Click to select spawn location";
 		}