Merge branch 'master' into Mario/cursor

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / radar.qc

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index bd94520d4e4292972e51277c0f27d6fc7fd7cd75..9176aa0ff99782b05ed207495bacf5134675ff4c 100644 (file)
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -19,7 +19,7 @@ bool HUD_Radar_Clickable()
 
 void HUD_Radar_Show_Maximized(bool doshow, bool clickable)
 {
 
 void HUD_Radar_Show_Maximized(bool doshow, bool clickable)
 {

-    TC(bool, doshow);
+       TC(bool, doshow);

        hud_panel_radar_maximized = doshow;
        hud_panel_radar_temp_hidden = 0;
 
        hud_panel_radar_maximized = doshow;
        hud_panel_radar_temp_hidden = 0;
 


@@ -27,8 +27,6 @@ void HUD_Radar_Show_Maximized(bool doshow, bool clickable)
        {
                if (clickable)
                {
        {
                if (clickable)
                {

-                       if(autocvar_hud_cursormode)
-                               setcursormode(1);

                        hud_panel_radar_mouse = 1;
 
                        // we must unset the player's buttons, as they aren't released elsewhere
                        hud_panel_radar_mouse = 1;
 
                        // we must unset the player's buttons, as they aren't released elsewhere


@@ -43,9 +41,6 @@ void HUD_Radar_Show_Maximized(bool doshow, bool clickable)
        {
                hud_panel_radar_mouse = 0;
                mouseClicked = 0;
        {
                hud_panel_radar_mouse = 0;
                mouseClicked = 0;

-               if(autocvar_hud_cursormode)
-               if(!mv_active)
-                       setcursormode(0);

        }
 }
 void HUD_Radar_Hide_Maximized()
        }
 }
 void HUD_Radar_Hide_Maximized()


@@ -56,7 +51,7 @@ void HUD_Radar_Hide_Maximized()
 
 float HUD_Radar_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
 
 float HUD_Radar_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {

-    TC(int, bInputType);
+       TC(int, bInputType);

        if(!hud_panel_radar_maximized || !hud_panel_radar_mouse ||
                autocvar__hud_configure || mv_active)
                return false;
        if(!hud_panel_radar_maximized || !hud_panel_radar_mouse ||
                autocvar__hud_configure || mv_active)
                return false;


@@ -141,9 +136,6 @@ void HUD_Radar_Mouse()
                return;
        }
 
                return;
        }
 

-       if (!autocvar_hud_cursormode)
-               update_mousepos();
-

        panel = HUD_PANEL(RADAR);
        HUD_Panel_LoadCvars();
 
        panel = HUD_PANEL(RADAR);
        HUD_Panel_LoadCvars();
 


@@ -169,9 +161,6 @@ void HUD_Radar_Mouse()
                HUD_Radar_Hide_Maximized();
                return;
        }
                HUD_Radar_Hide_Maximized();
                return;
        }

-
-
-       draw_cursor_normal(mousepos, '1 1 1', 0.8);

 }
 
 void HUD_Radar()
 }
 
 void HUD_Radar()