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

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 2f97712b676a1dc67f0eb5bbbf2739507bb5f950..2003a7eeb7186c7e959d9d64e0c003a2f5fdb891 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -152,6 +152,12 @@ void GameCommand(string theCommand)
                return;
        }
 
                return;
        }
 

+       if (argv(0) == "settings")
+       {
+               m_goto("settings");
+               return;
+       }
+

        if (argv(0) == "inputsettings")
        {
                m_goto("inputsettings");
        if (argv(0) == "inputsettings")
        {
                m_goto("inputsettings");

diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qc b/qcsrc/menu/xonotic/dialog_gamemenu.qc
index 68d612de37620d44259ac837c4f1204ceb0e7574..a9ba16b4f0ff885f62e1b8773c893964576b2988 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_gamemenu.qc
+++ b/qcsrc/menu/xonotic/dialog_gamemenu.qc
@@ -48,7 +48,7 @@ void XonoticGameMenuDialog_fill(entity me)
                me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Profile"), '0 0 0', "menu_cmd profile", 0));
        me.TR(me);
                me.TDempty(me, 0.1);
                me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Profile"), '0 0 0', "menu_cmd profile", 0));
        me.TR(me);
                me.TDempty(me, 0.1);

-               me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Settings"), '0 0 0', "menu_cmd videosettings", 0));
+               me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Settings"), '0 0 0', "menu_cmd settings", 0));

        me.TR(me);
                me.TDempty(me, 0.1);
                me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Input"), '0 0 0', "menu_cmd inputsettings", 0));
        me.TR(me);
                me.TDempty(me, 0.1);
                me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Input"), '0 0 0', "menu_cmd inputsettings", 0));

diff --git a/qcsrc/menu/xonotic/dialog_settings.qh b/qcsrc/menu/xonotic/dialog_settings.qh
index 3564a02e87dd5bb9140f60d7216198992cd6969e..98495709539da99119188c24fefe382ab1a03347 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings.qh
+++ b/qcsrc/menu/xonotic/dialog_settings.qh
@@ -4,6 +4,7 @@
 CLASS(XonoticSettingsDialog, XonoticDialog)
        METHOD(XonoticSettingsDialog, fill, void(entity));
        ATTRIB(XonoticSettingsDialog, title, string, _("Settings"));
 CLASS(XonoticSettingsDialog, XonoticDialog)
        METHOD(XonoticSettingsDialog, fill, void(entity));
        ATTRIB(XonoticSettingsDialog, title, string, _("Settings"));

+       ATTRIB(XonoticSettingsDialog, name, string, "settings");

        ATTRIB(XonoticSettingsDialog, tooltip, string, _("Change the game settings"));
        ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS);
        ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96);
        ATTRIB(XonoticSettingsDialog, tooltip, string, _("Change the game settings"));
        ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS);
        ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96);