Fix map timer not being displayed if scoreboard is enabled during map vote; don't...

[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 bee8d0568ec2ac1afe7b7ba2704cb3dc77b08f9f..9da25ebe9145e27f7cf400afd30e4b1f74343fc5 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -425,7 +425,11 @@ void HUD_Panel_Draw(entity panent)
        }
 
        bool draw_allowed = false;
-       if (active_minigame && HUD_MinigameMenu_IsOpened())
+       if (scoreboard_fade_alpha && panel.panel_showflags & PANEL_SHOW_WITH_SB)
+       {
+               draw_allowed = true;
+       }
+       else if (active_minigame && HUD_MinigameMenu_IsOpened())
        {
                if (panel.panel_showflags & PANEL_SHOW_MINIGAME)
                        draw_allowed = true;
@@ -441,7 +445,12 @@ void HUD_Panel_Draw(entity panent)
        if (draw_allowed)
        {
                if (panel.panel_showflags & PANEL_SHOW_WITH_SB)
-                       panel_fade_alpha = 1;
+               {
+                       if (scoreboard_fade_alpha && intermission == 2 && !(panel.panel_showflags & PANEL_SHOW_MAPVOTE))
+                               panel_fade_alpha = scoreboard_fade_alpha;
+                       else
+                               panel_fade_alpha = 1;
+               }
                else
                {
                        panel_fade_alpha = 1 - scoreboard_fade_alpha;
@@ -565,8 +574,6 @@ bool HUD_WouldShowCursor()
 {
        if(autocvar__hud_configure)
                return true;
-       if(hud_panel_radar_mouse)
-               return true;
        if(mv_active)
                return true;
        //entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); // TODO: doesn't use regular cursor handling
@@ -700,10 +707,15 @@ void HUD_Main()
                HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
        HUD_Panel_Draw(HUD_PANEL(SCOREBOARD));
 
-       bool cursor_active_prev = cursor_active;
+       int cursor_active_prev = cursor_active;
        cursor_active = HUD_WouldShowCursor();
        if (cursor_active_prev != cursor_active && autocvar_hud_cursormode)
+       {
                setcursormode(cursor_active);
+               // cursor inactive this frame, will be set to 1 the next frame
+               if (cursor_active)
+                       cursor_active = -1;
+       }
 
        if (intermission == 2)
                HUD_Reset();