Merge branch 'master' into z411/powerups_drop

[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 01fae6e0203104e2df63874db8581b32bdced4b5..e476e12f05007579d1285b01d0b08b7d59724f21 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -70,6 +70,7 @@ void QuickMenu_Page_ClearEntry(int i)
 bool HUD_QuickMenu_Forbidden()
 {
        return (mv_active
+               || scoreboard_ui_enabled
                || (hud_configure_prev && hud_configure_prev != -1)
                || HUD_MinigameMenu_IsOpened()
                || (QuickMenu_TimeOut && time > QuickMenu_TimeOut));
@@ -192,12 +193,7 @@ bool QuickMenu_Open(string mode, string submenu, string file)
        mouseClicked = 0;
        hudShiftState = 0;
 
-       // we must unset the player's buttons, as they aren't released elsewhere
-       localcmd("-fire\n");
-       localcmd("-fire2\n");
-       localcmd("-use\n");
-       localcmd("-hook\n");
-       localcmd("-jump\n");
+       Release_Common_Keys();
 
        QuickMenu_TimeOut_Set();
        return true;
@@ -872,6 +868,14 @@ void QuickMenu_Default(string target_submenu)
                QUICKMENU_ENTRY(CTX(_("QMCMD^Shuffle teams")), "vcall shuffleteams")
        QUICKMENU_SMENU(CTX(_("QMCMD^Call a vote")), "Call a vote")
 
+       if (autocvar__hud_panel_quickmenu_file_from_server != "")
+       {
+       string entry_name = _("Server's custom quickmenu");
+       if (autocvar__hud_panel_quickmenu_file_from_server == "wpeditor.txt")
+               entry_name = _("Waypoint editor quickmenu");
+       QUICKMENU_ENTRY(entry_name, "quickmenu; wait; quickmenu \"\" \"\" $_hud_panel_quickmenu_file_from_server")
+       }
+
        if(spectatee_status != 0)
        {
        QUICKMENU_SMENU_PL(CTX(_("QMCMD^Spectate a player")), "Spectate a player", "spectate \"%s^7\"", 0, 1)