Add a Guide button to the Game Menu

This required !1483.

diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qc b/qcsrc/menu/xonotic/dialog_gamemenu.qc
index ac8c6c6c9f0af970eca6689fe6a1c2510b721c05..2eabfb12932433b343311051334ff1e1567dd8d5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_gamemenu.qc
+++ b/qcsrc/menu/xonotic/dialog_gamemenu.qc
@@ -53,6 +53,9 @@ void XonoticGameMenuDialog_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.1);
                me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Input"), '0 0 0', "menu_cmd directmenu inputsettings", 0));
+       me.TR(me);
+               me.TDempty(me, 0.1);
+               me.TD(me, 1, 0.8, e = makeXonoticCommandButton(_("Guide"), '0 0 0', "menu_cmd directmenu guide", 0));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quick menu"), '0 0 0', "quickmenu", COMMANDBUTTON_CLOSE));
        me.TR(me);

diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qh b/qcsrc/menu/xonotic/dialog_gamemenu.qh
index 0aa0cf4017b565b67585bbc4462257fe1acabeff..def53f34418ffd96d428e60b4e3a2592a114d6ed 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_gamemenu.qh
+++ b/qcsrc/menu/xonotic/dialog_gamemenu.qh
@@ -8,7 +8,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, 13);
+       ATTRIB(XonoticGameMenuDialog, rows, float, 14);
        ATTRIB(XonoticGameMenuDialog, columns, float, 1);
        ATTRIB(XonoticGameMenuDialog, name, string, "GameMenu");
        ATTRIB(XonoticGameMenuDialog, requiresConnection, bool, true);

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh
index d6703d85ca6d0589e0a6263b1bce7055b72c3de2..32e0945c9920369882ab9deaf9f5fa29fda20c8b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh
+++ b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh
@@ -9,6 +9,7 @@ CLASS(XonoticGuideDialog, XonoticDialog)
        ATTRIB(XonoticGuideDialog, color, vector, SKINCOLOR_DIALOG_GUIDE);
        ATTRIB(XonoticGuideDialog, rows, float, 21);
        ATTRIB(XonoticGuideDialog, columns, float, 6);
+       ATTRIB(XonoticGuideDialog, name, string, "guide");
        ATTRIB(XonoticGuideDialog, intendedWidth, float, 0.96);
        METHOD(XonoticGuideDialog, fill, void(entity));
        METHOD(XonoticGuideDialog, topicChangeNotify, void(entity, entity));