From: Samual <samual@xonotic.org>
Date: Mon, 19 Dec 2011 22:59:58 +0000 (-0500)
Subject: Add support to bind F10 as "show quit dialog" instead of instantly quitting
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~96
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f9c749823e058ab1e5dfbaadca1eb7cdb8705458;p=xonotic%2Fxonotic-data.pk3dir.git

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

diff --git a/commands.cfg b/commands.cfg
index 8d8e08655..647425fa0 100644
--- 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 9e443b846..1e2e56e53 100644
--- 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 6d9dde47b..fd8471186 100644
--- 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