Add a file parameter to quickmenu, to allow loading different menus with different...

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

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 631090cc1f9b7d119a2a9847b9d6ee5619cdd568..f795784718dd269cbd48da5e820762e72982c796 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -248,7 +248,7 @@ void LocalCommand_handlevote(int request, int argc)
 
 bool QuickMenu_IsOpened();
 void QuickMenu_Close();
-bool QuickMenu_Open(string mode, string submenu);
+bool QuickMenu_Open(string mode, string submenu, string file);
 
 bool HUD_MinigameMenu_IsOpened();
 void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger);
@@ -278,15 +278,17 @@ void LocalCommand_hud(int request, int argc)
                                {
                                        if (argv(2) == "help")
                                        {
-                                               LOG_INFO(" quickmenu [[default | file | \"\"] submenu]\n");
+                                               LOG_INFO(" quickmenu [[default | file | \"\"] submenu file]\n");
                                                LOG_INFO("Called without options (or with \"\") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n");
                                                LOG_INFO("A submenu name can be given to open the quickmenu directly in a submenu; it requires to specify 'default', 'file' or '\"\"' option.\n");
+                                               LOG_INFO("A file name can also be given to open a different quickmenu\n");
                                                return;
                                        }
+                                       string file = ((argv(4) == "") ? autocvar_hud_panel_quickmenu_file : argv(4));
                                        if (QuickMenu_IsOpened())
                                                QuickMenu_Close();
                                        else
-                                               QuickMenu_Open(argv(2), argv(3));  // mode, submenu
+                                               QuickMenu_Open(argv(2), argv(3), file);  // mode, submenu
                                        return;
                                }