Add support to bind F10 as "show quit dialog" instead of instantly quitting

diff --git a/commands.cfg b/commands.cfg
index 8d8e086557083071c50bdf59416204f7bcef73e0..647425fa0cbd0a1e8708159ddea336e9706e2fd7 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -72,6 +72,7 @@ alias menu_showteamselect "menu_cmd directmenu TeamSelect"
 alias menu_showhudexit "menu_cmd directmenu HUDExit"
 alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}"
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
+alias menu_showquitdialog "menu_cmd directmenu Quit"
 
 // command executed before loading a map by the menu
 // makes sure maxplayers is at least minplayers or bot_number + 1

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9e443b846a4b500a6a3e5cb733d634192aa3e396..1e2e56e53c0c7434a237ca93282ede75d5fcc139 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1046,7 +1046,7 @@ bind u "+con_chat_maximize"
 bind m +hud_panel_radar_maximized
 bind i +show_info
 bind PAUSE pause
-bind F10 quit
+bind F10 menu_showquitdialog
 bind F11 disconnect
 bind F12 screenshot
 bind F4 ready

diff --git a/qcsrc/menu/xonotic/dialog_quit.c b/qcsrc/menu/xonotic/dialog_quit.c
index 6d9dde47b30d80dd2be57c1b396dde04e13f192f..fd84711861d76cf5b1f4cd3545420f07662b1959 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.c
+++ b/qcsrc/menu/xonotic/dialog_quit.c
@@ -6,6 +6,7 @@ CLASS(XonoticQuitDialog) EXTENDS(XonoticDialog)
        ATTRIB(XonoticQuitDialog, intendedWidth, float, 0.5)
        ATTRIB(XonoticQuitDialog, rows, float, 3)
        ATTRIB(XonoticQuitDialog, columns, float, 2)
+       ATTRIB(XonoticQuitDialog, name, string, "Quit")
 ENDCLASS(XonoticQuitDialog)
 #endif