X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fradar.qc;h=269d870718e42663a431a3445c984876ff74b4c5;hb=a491650510dce3f774cce457ebf15ddcafcf393f;hp=9704f81c6af0dfaec059f674b1d7b22d3520175e;hpb=efba688caaab0ef2c280daa8ec8032e6c0454eab;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index 9704f81c6..269d87071 100644
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -137,17 +137,11 @@ void HUD_Radar_Mouse()
 		return;
 	}
 
-	if(!autocvar_hud_cursormode)
-	{
-		mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
+	if (!autocvar_hud_cursormode)
+		update_mousepos();
 
-		mousepos_x = bound(0, mousepos_x, vid_conwidth);
-		mousepos_y = bound(0, mousepos_y, vid_conheight);
-	}
-
-	if(1 - scoreboard_fade_alpha <= 0)
-		return;
-	HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+	panel = HUD_PANEL(RADAR);
+	HUD_Panel_LoadCvars();
 
 
 	panel_size = autocvar_hud_panel_radar_maximized_size;
@@ -199,9 +193,7 @@ void HUD_Radar()
 	if ( hud_panel_radar_temp_hidden )
 		return;
 
-	if(1 - scoreboard_fade_alpha <= 0)
-		return;
-	HUD_Panel_UpdateCvars(1 - scoreboard_fade_alpha);
+	HUD_Panel_LoadCvars();
 
 	float f = 0;
 
@@ -360,7 +352,7 @@ void HUD_Radar()
 	IL_EACH(g_radaricons, it.teamradar_icon, {
 		if ( hud_panel_radar_mouse )
 		if ( it.health >= 0 )
-		if ( it.team == myteam+1 || gametype == MAPINFO_TYPE_RACE || !(serverflags & SERVERFLAG_TEAMPLAY) )
+		if ( it.team == myteam + 1 || gametype == MAPINFO_TYPE_RACE || !teamplay )
 		{
 			vector coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(it.origin));
 			if(vdist((mousepos - coord), <, 8))