Add a quitGameButton to the server list dialogue too

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index a65a4945b0276996635f5f1c8a98f0291d29b684..2c08476012d7c2975a10584c7ababdf225ee34c0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@ -22,6 +22,16 @@ void XonoticServerListTab_refresh(entity this, entity slist)
     slist.refreshServerList(slist, clear ? REFRESHSERVERLIST_RESET : REFRESHSERVERLIST_ASK);
 }
 
+.entity quitGameButton;
+void XonoticServerListTab_draw(entity me)
+{
+       entity e = me.quitGameButton;
+       e.disabled = !(gamestatus & (GAME_ISSERVER | GAME_CONNECTED));
+       e.setText(e, quitGameButton_getText(e));
+       setZonedTooltip(e, quitGameButton_getTooltip(e), string_null);
+       SUPER(XonoticServerListTab).draw(me);
+}
+
 void XonoticServerListTab_fill(entity me)
 {
        entity e, slist;
@@ -89,12 +99,8 @@ void XonoticServerListTab_fill(entity me)
                        e.onClickEntity = slist;
                        slist.infoButton = e;
        me.TR(me);
-               /*
-               me.TD(me, 1, 1, e = makeXonoticCommandButton_T(_("Disconnect"), '0 0 0', "disconnect", 0,
-                       _("Disconnect from the server")));
-                       slist.disconnectButton = e;
-               */
-               me.TD(me, 1, me.columns, e = makeXonoticButton(_("Join!"), '0 0 0'));
+               me.TD(me, 1, me.columns * 0.5, me.quitGameButton = makeXonoticCommandButton(string_null, '0 0 0', QUITGAME_CMD, 0));
+               me.TD(me, 1, me.columns * 0.5, e = makeXonoticButton(_("Join!"), '0 0 0'));
                        e.onClick = ServerList_Connect_Click;
                        e.onClickEntity = slist;
                        slist.connectButton = e;

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
index a663eb527be116ba9e0b75bf953e6aba47f2dc2c..33f63209e3bc2907690748109bd70ed470482663 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticServerListTab, XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity));
+       METHOD(XonoticServerListTab, draw, void(entity));
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticServerListTab, rows, float, 23);
        ATTRIB(XonoticServerListTab, columns, float, 6.5);