Merge branch 'bones_was_here/font' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_welcome.qc

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc
index 14dabdc4c0085deee20d5b5f4ef38024f010e398..bf45084d73bc47b305d62ed831e09536e42f14b9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_welcome.qc
+++ b/qcsrc/menu/xonotic/dialog_welcome.qc
@@ -9,20 +9,42 @@
 
 void welcomeDialog_resetStrings(entity me)
 {
-       if(me.serverinfo_name)
-               strunzone(me.serverinfo_name);
-       me.serverinfo_name = strzone(_("<NO NAME>"));
+       strcpy(me.serverinfo_name, _("Welcome"));
+       strcpy(me.serverinfo_MOTD, "");
+}
 
-       if(me.serverinfo_MOTD)
-               strunzone(me.serverinfo_MOTD);
-       me.serverinfo_MOTD = strzone(_("<NO MOTD>"));
+float XonoticWelcomeDialog_keyDown(entity me, float key, float ascii, float shift)
+{
+       switch(key)
+       {
+               case K_KP_ENTER:
+               case K_ENTER:
+               case K_SPACE:
+                       XonoticCommandButton_Click(me.joinButton_ent, me);
+                       return true;
+               default:
+                       return SUPER(XonoticWelcomeDialog).keyDown(me, key, ascii, shift);
+       }
 }
-void XonoticWelcomeDialog_configureDialog(entity me)
+
+// the same implentation in mousePress apparently works, but for some reason if you try to open
+// the dialog again it doesn't show up and requires opening it a seconds time to show up
+bool XonoticWelcomeDialog_mouseRelease(entity me, vector pos)
 {
-       welcomeDialog_resetStrings(me);
-       SUPER(XonoticWelcomeDialog).configureDialog(me);
+       if (pos.x >= 0 && pos.y >= 0 && pos.x < 1 && pos.y < 1)
+       {
+               return SUPER(XonoticWelcomeDialog).mouseRelease(me, pos);
+       }
+       me.close(me);
+       return true;
 }
-void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf)
+
+void XonoticWelcomeDialog_destroy(entity me)
+{
+       cvar_set("_menu_welcome_dialog_available", "0");
+}
+
+void XonoticWelcomeDialog_readInputArgs(entity me, int argsbuf)
 {
        int i = 0;
        string s;
@@ -30,19 +52,14 @@ void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf)
        if(argsbuf >= 0)
        while((s = bufstr_get(argsbuf, i)) != "")
        {
-               if(s == "name")
-               {
-                       if(me.serverinfo_name)
-                               strunzone(me.serverinfo_name);
-                       me.serverinfo_name = strzone(bufstr_get(argsbuf, i + 1));
-                       ++i;
-               }
-               else if(s == "motd")
+               if(s == "HOSTNAME")
+                       strcpy(me.serverinfo_name, bufstr_get(argsbuf, ++i));
+               else if(s == "WELCOME")
+                       strcpy(me.serverinfo_MOTD, bufstr_get(argsbuf, ++i));
+               else if(s == "RESET")
                {
-                       if(me.serverinfo_MOTD)
-                               strunzone(me.serverinfo_MOTD);
-                       me.serverinfo_MOTD = strzone(bufstr_get(argsbuf, i + 1));
-                       ++i;
+                       welcomeDialog_resetStrings(me);
+                       break;
                }
                ++i;
        }
@@ -51,8 +68,40 @@ void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf)
        me.frame.setText(me.frame, me.serverinfo_name);
 }
 
+void XonoticWelcomeDialog_draw(entity me)
+{
+       SUPER(XonoticWelcomeDialog).draw(me);
+
+       if (!(gamestatus & (GAME_ISSERVER | GAME_CONNECTED)))
+               me.close(me);
+
+       if(me.serverinfo_MOTD == "" && gamestatus & (GAME_CONNECTED | GAME_ISSERVER))
+       {
+               // if serverinfo_MOTD is empty while connected it means we are connected to an old server
+               // in this case show the csqc welcome message and instantly close the dialog
+               localcmd("\n+show_info0; defer 2 -show_info0\n");
+               me.close(me);
+       }
+
+       if (isdemo())
+       {
+               me.joinButton_ent.disabled = true;
+               me.spectateButton_ent.disabled = true;
+       }
+       else
+       {
+               me.joinButton_ent.disabled = false;
+               me.spectateButton_ent.disabled = false;
+       }
+}
+
 void XonoticWelcomeDialog_fill(entity me)
 {
+       registercvar("_menu_welcome_dialog_available", "0", 0);
+       cvar_set("_menu_welcome_dialog_available", "1");
+
+       me.frame.allowColors = true; // allow color codes in the title
+
        entity e;
 
        me.TR(me);
@@ -61,8 +110,7 @@ void XonoticWelcomeDialog_fill(entity me)
                        me.serverinfo_MOTD_ent.allowColors = true;
                        me.serverinfo_MOTD_ent.escapedNewLines = true;
        me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
-                       e.onClick = Dialog_Close;
-                       e.onClickEntity = me;
-                       e.preferredFocusPriority = 1;
+               me.TD(me, 1, me.columns / 2, me.joinButton_ent = makeXonoticCommandButton(_("Join"), '0 1 0', "cmd join", COMMANDBUTTON_CLOSE));
+                       me.joinButton_ent.preferredFocusPriority = 1;
+               me.TD(me, 1, me.columns / 2, me.spectateButton_ent = makeXonoticCommandButton(_("Spectate"), '0 0 0', "cmd spectate", COMMANDBUTTON_CLOSE));
 }