Merge branch 'master' into martin-t/dmgtext

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

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 9b5b4699337c971a0fbf2f4117dde2e75a1aa82a..bee8d0568ec2ac1afe7b7ba2704cb3dc77b08f9f 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -561,8 +561,6 @@ void Hud_Dynamic_Frame()
        HUD_Scale_Disable();
 }
 
-bool cursor_activestate;
-
 bool HUD_WouldShowCursor()
 {
        if(autocvar__hud_configure)
@@ -576,33 +574,12 @@ bool HUD_WouldShowCursor()
                //return true;
        if(HUD_Radar_Clickable())
                return true;
-       if(HUD_MinigameMenu_IsOpened() || active_minigame)
+       if(HUD_MinigameMenu_IsOpened())
                return true;
        if(QuickMenu_IsOpened())
                return true;
        return false;
 }
-void HUD_Cursor()
-{
-       if(HUD_WouldShowCursor())
-       {
-               if(!cursor_activestate)
-               {
-                       cursor_activestate = true;
-                       if(autocvar_hud_cursormode)
-                               setcursormode(1);
-               }
-       }
-       else
-       {
-               if(cursor_activestate)
-               {
-                       cursor_activestate = false;
-                       if(autocvar_hud_cursormode)
-                               setcursormode(0);
-               }
-       }
-}
 
 void HUD_Main()
 {
@@ -719,11 +696,14 @@ void HUD_Main()
                HUD_Panel_Draw(HUD_PANEL(RADAR));
        if(autocvar__con_chat_maximized)
                HUD_Panel_Draw(HUD_PANEL(CHAT));
-       if(hud_panel_quickmenu)
+       if (QuickMenu_IsOpened())
                HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
        HUD_Panel_Draw(HUD_PANEL(SCOREBOARD));
 
-       HUD_Cursor();
+       bool cursor_active_prev = cursor_active;
+       cursor_active = HUD_WouldShowCursor();
+       if (cursor_active_prev != cursor_active && autocvar_hud_cursormode)
+               setcursormode(cursor_active);
 
        if (intermission == 2)
                HUD_Reset();