Add exit dialog. Not done yet though.

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 025efa3b6c470d830b49e224647c907fb533140b..0294ddd636dc64c03551cd34e8e0e91d58789f61 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1693,6 +1693,7 @@ exec turrets.cfg
 // must be at the bottom of this file:
 // alias for switching the teamselect menu
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"
+alias menu_showhudexit "menu_cmd directmenu HUDExit"
 alias menu_sync "menu_cmd sync"
 bind f5 menu_showteamselect
 

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 1f592d1945421029cda8aa788d16da54cbe35782..1cbed12940df793a0bc56f3626c34931872b9010 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1179,7 +1179,9 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
                }
        }
        else if(nPrimary == K_ESCAPE)
-               cvar_set("_hud_configure", "0");
+       {
+               localcmd("menu_showhudexit\n");
+       }
 
        return true; // Suppress ALL other input
 }

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 4800fac8d210b3ec3359d641778c2137b28778f0..b03c7ebcc4ba54d9767ea5a8617300e796550ce8 100644 (file)
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -83,3 +83,4 @@
 #include "xonotic/colorpicker.c"
 #include "xonotic/cvarlist.c"
 #include "xonotic/dialog_settings_misc_cvars.c"
+#include "xonotic/dialog_hudsetup_exit.c"

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 460bfd6767723e7ee34f1e6922da0becc190994d..5a4168f5421caf203bfac9b1fac3fb47af2b32f6 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -32,6 +32,10 @@ void configureMainWindowMainWindow(entity me)
        i = spawnXonoticTeamSelectDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDExitDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
        me.advancedDialog = i = spawnXonoticAdvancedDialog();
        i.configureDialog(i);