Game menu dialog: add Servers button

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 8ba94a7865a4e6fd175d0c86c3693a9e6133494f..ce682de004af0d6bfbfef7f87576f19460fe48d6 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -106,6 +106,12 @@ void GameCommand(string theCommand)
                return;
        }
 
+       if (argv(0) == "servers")
+       {
+               m_goto("servers");
+               return;
+       }
+
        if (argv(0) == "profile")
        {
                m_goto("profile");

diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qc b/qcsrc/menu/xonotic/dialog_gamemenu.qc
index 5403c1e5ff5b47f1a418f3699ad98a78da818135..87892844994a7c184f132710142253a62ff31e0d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_gamemenu.qc
+++ b/qcsrc/menu/xonotic/dialog_gamemenu.qc
@@ -10,6 +10,9 @@ void XonoticGameMenuDialog_fill(entity me)
        entity e;
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Main menu"), '0 0 0', "menu_cmd nexposee", 0));
+       me.TR(me);
+               me.TDempty(me, 0.1);
+               me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Servers"), '0 0 0', "menu_cmd servers", 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));

diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qh b/qcsrc/menu/xonotic/dialog_gamemenu.qh
index 75ded66c50eb5d51f9cd60bd7840102342ffd074..272f882fe6b92ae70ec3323ab87db21fd7e7725d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_gamemenu.qh
+++ b/qcsrc/menu/xonotic/dialog_gamemenu.qh
@@ -6,7 +6,7 @@ CLASS(XonoticGameMenuDialog, XonoticRootDialog)
        ATTRIB(XonoticGameMenuDialog, title, string, _("Game menu"));
        ATTRIB(XonoticGameMenuDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
        ATTRIB(XonoticGameMenuDialog, intendedWidth, float, 0.3);
-       ATTRIB(XonoticGameMenuDialog, rows, float, 11);
+       ATTRIB(XonoticGameMenuDialog, rows, float, 12);
        ATTRIB(XonoticGameMenuDialog, columns, float, 1);
        ATTRIB(XonoticGameMenuDialog, name, string, "GameMenu");
        ATTRIB(XonoticGameMenuDialog, requiresConnection, bool, true);

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
index a663eb527be116ba9e0b75bf953e6aba47f2dc2c..38744f366de85800ac7693ebd6bf4b4afba93006 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
@@ -6,5 +6,7 @@ CLASS(XonoticServerListTab, XonoticTab)
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticServerListTab, rows, float, 23);
        ATTRIB(XonoticServerListTab, columns, float, 6.5);
+
+       ATTRIB(XonoticServerListTab, name, string, "servers");
 ENDCLASS(XonoticServerListTab)
 entity makeXonoticServerListTab();