From 37a1143576b72ddce85bac54565d5e4f2a79e4f3 Mon Sep 17 00:00:00 2001 From: otta8634 Date: Tue, 13 May 2025 21:56:18 +0800 Subject: [PATCH] Add a Guide button to the Game Menu This required !1483. --- qcsrc/menu/xonotic/dialog_gamemenu.qc | 3 +++ qcsrc/menu/xonotic/dialog_gamemenu.qh | 2 +- qcsrc/menu/xonotic/dialog_singleplayer_guide.qh | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qc b/qcsrc/menu/xonotic/dialog_gamemenu.qc index ac8c6c6c9f..2eabfb1293 100644 --- 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 0aa0cf4017..def53f3441 100644 --- 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 d6703d85ca..32e0945c99 100644 --- 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)); -- 2.39.5