Merge branch 'master' into matthiaskrgr/hudsetup

diff --combined qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
index 0000000000000000000000000000000000000000,9f327c3f51245c96cf4df83480c6eaceb88c92e5..2c6f76f2ac8b454512cb70394a3a5c2f35557772
mode 000000,100644..100644
--- /dev/null
--- 2/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
@@@ -1,0 -1,40 +1,40 @@@
 -              localcmd("map hudsetup/hudsetup", "\n");
+ #ifdef INTERFACE
+ CLASS(XonoticHUDConfirmDialog) EXTENDS(XonoticDialog)
+       METHOD(XonoticHUDConfirmDialog, fill, void(entity))
+       ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor"))
+       ATTRIB(XonoticHUDConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
+       ATTRIB(XonoticHUDConfirmDialog, intendedWidth, float, 0.5)
+       ATTRIB(XonoticHUDConfirmDialog, rows, float, 4)
+       ATTRIB(XonoticHUDConfirmDialog, columns, float, 2)
+ ENDCLASS(XonoticHUDConfirmDialog)
+ #endif
+ 
+ #ifdef IMPLEMENTATION
+ void HUDSetup_Start(entity me, entity btn)
+ {
+       if (!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)))
++              localcmd("map hudsetup", "\n");
+       else
+               localcmd("togglemenu 0\n");
+ 
+       localcmd("_hud_configure 1", "\n");
+ }
+ 
+ void XonoticHUDConfirmDialog_fill(entity me)
+ {
+       entity e;
+ 
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("In order for the HUD editor to show, you must first be in game.")));
+       me.TR(me);
+               me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Do you wish to start a local game to set up the HUD?")));
+       me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticButton(_("Yes"), '1 0 0'));
+                       e.onClick = HUDSetup_Start;
+                       e.onClickEntity = me;
+               me.TD(me, 1, 1, e = makeXonoticButton(_("No"), '0 1 0'));
+                       e.onClick = Dialog_Close;
+                       e.onClickEntity = me;
+ }
+ #endif