Merge branch 'master' into terencehill/quickmenu

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

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 2252f6f61cec427d69ebe63d9a26eca8394955f3..6bf64d1b4183559f19b151532cc7c9cd052473f9 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -511,6 +511,14 @@ void GameCommand(string msg)
                else
                        hud_panel_radar_maximized = (stof(argv(1)) != 0);
        }
+       else if(cmd == "hud_panel_quickmenu")
+       {
+               if(argc == 1 && HUD_QuickMenu_IsOpened())
+                       HUD_QuickMenu_Close();
+               else
+                       if (HUD_QuickMenu_Buffer_Init())
+                               HUD_QuickMenu_Open("", 0);
+       }
        else if(cmd == "settemp") {
                cvar_clientsettemp(argv(1), argv(2));
        }
@@ -646,6 +654,9 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
        if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
                return true;
 
+       if (HUD_QuickMenu_InputEvent(bInputType, nPrimary, nSecondary))
+               return true;
+
        if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
                return true;