}
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;
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;
HUD_Scale_Disable();
}
+bool HUD_WouldShowCursor()
+{
+ if(autocvar__hud_configure)
+ return true;
+ if(mv_active)
+ return true;
+ //entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); // TODO: doesn't use regular cursor handling
+ //if(local_player.viewloc && (local_player.viewloc.spawnflags & VIEWLOC_FREEAIM))
+ //return true;
+ if(HUD_Radar_Clickable())
+ return true;
+ if(HUD_MinigameMenu_IsOpened())
+ return true;
+ if(QuickMenu_IsOpened())
+ return true;
+ return false;
+}
+
void HUD_Main()
{
int i;
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));
+ 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();