Fix #2727 "New esc-menu shouldn't open a standard settings page"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / command / menu_cmd.qc

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 8de4bf4f033a5c178b0f402fc3db0d6cf3fa8198..2003a7eeb7186c7e959d9d64e0c003a2f5fdb891 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -7,7 +7,7 @@
 
 #include <common/command/_mod.qh>
 
-.void(entity me, float argsbuf) readInputArgs;
+.void(entity me, int argsbuf) readInputArgs;
 .entity firstChild, nextSibling;
 
 string _dumptree_space;
@@ -93,12 +93,12 @@ void GameCommand(string theCommand)
                                LOG_HELP(" ", s);
                        });
                }
-               else if (argc == 2 && !isdemo())     // don't allow this command in demos
+               else if (argc == 2 && (!isdemo() || argv(1) == "Welcome")) // don't allow this command in demos
                {
                        m_play_click_sound(MENU_SOUND_OPEN);
                        m_goto(strcat(filter, argv(1))); // switch to a menu item
                }
-               else if(argc > 2 && !isdemo())
+               else if(argc > 2 && (!isdemo() || argv(1) == "Welcome"))
                {
                        entity e = NULL;
                        float argsbuf = 0;
@@ -122,6 +122,24 @@ void GameCommand(string theCommand)
                return;
        }
 
+       if (argv(0) == "nexposee")
+       {
+               m_goto("nexposee");
+               return;
+       }
+
+       if (argv(0) == "servers")
+       {
+               m_goto("servers");
+               return;
+       }
+
+       if (argv(0) == "profile")
+       {
+               m_goto("profile");
+               return;
+       }
+
        if (argv(0) == "skinselect")
        {
                m_goto("skinselector");
@@ -134,6 +152,18 @@ void GameCommand(string theCommand)
                return;
        }
 
+       if (argv(0) == "settings")
+       {
+               m_goto("settings");
+               return;
+       }
+
+       if (argv(0) == "inputsettings")
+       {
+               m_goto("inputsettings");
+               return;
+       }
+
        if (argv(0) == "videosettings")
        {
                m_goto("videosettings");