Welcome dialog: use capitals in Join and Spectate, fix compilation unit test

diff --git a/qcsrc/menu/xonotic/commandbutton.qh b/qcsrc/menu/xonotic/commandbutton.qh
index cd1063523d59f7d3273e17b5eb5800d8aecaa2a9..7e5044c24fa8708378e07ac2fa1f02073ee757f5 100644 (file)
--- a/qcsrc/menu/xonotic/commandbutton.qh
+++ b/qcsrc/menu/xonotic/commandbutton.qh
@@ -9,6 +9,7 @@ ENDCLASS(XonoticCommandButton)
 
 entity makeXonoticCommandButton_T(string theText, vector theColor, string theCommand, int theFlags, string theTooltip);
 entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, int theFlags);
 
 entity makeXonoticCommandButton_T(string theText, vector theColor, string theCommand, int theFlags, string theTooltip);
 entity makeXonoticCommandButton(string theText, vector theColor, string theCommand, int theFlags);

+void XonoticCommandButton_Click(entity me, entity other);

 
 #ifndef COMMANDBUTTON_CLOSE
 # define COMMANDBUTTON_CLOSE 1
 
 #ifndef COMMANDBUTTON_CLOSE
 # define COMMANDBUTTON_CLOSE 1

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc
index bf4edb9c7b5f0a904febfd9869fb790eed50fd18..3c5c0b353ac5d4779f8286587728171cb27c148f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_welcome.qc
+++ b/qcsrc/menu/xonotic/dialog_welcome.qc
@@ -95,7 +95,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.serverinfo_MOTD_ent.allowColors = true;
                        me.serverinfo_MOTD_ent.escapedNewLines = true;
        me.gotoRC(me, me.rows - 1, 0);

-               me.TD(me, 1, me.columns / 2, me.joinButton_ent = makeXonoticCommandButton(_("join"), '0 1 0', "cmd join", COMMANDBUTTON_CLOSE));
+               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.joinButton_ent.preferredFocusPriority = 1;

-               me.TD(me, 1, me.columns / 2, makeXonoticCommandButton(_("spectate"), '0 0 0', "cmd spectate", COMMANDBUTTON_CLOSE));
+               me.TD(me, 1, me.columns / 2, makeXonoticCommandButton(_("Spectate"), '0 0 0', "cmd spectate", COMMANDBUTTON_CLOSE));

 }
 }