Merge branch 'DefaultUser/gametype_votescreen' into 'master'

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

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index 73003b0f12299a3d83d74dde0c12d87c208d4e6c..e242ae895881a89d05baf81eb6da4c3197fdf4e7 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -1,8 +1,7 @@
 #include "quickmenu.qh"
 
-#include "scoreboard.qh"
 #include <common/ent_cs.qh>
-#include <client/hud/all.qh>
+#include <client/hud/_mod.qh>
 #include <client/mapvoting.qh>
 
 // QuickMenu (#23)
@@ -497,17 +496,11 @@ void QuickMenu_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_LoadCvars(1 - scoreboard_fade_alpha);
+       panel = HUD_PANEL(QUICKMENU);
+       HUD_Panel_LoadCvars();
 
        if(panel_bg_padding)
        {
@@ -621,9 +614,7 @@ void HUD_QuickMenu()
                }
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        HUD_Scale_Disable();
        HUD_Panel_DrawBg();