Get rid of the leaveMatchButton and disconnectButton fields since they're no longer...

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
index a72fd1b0cddd0b313b64707733f54b47284f871b..a343c546c28827ded6d7f5888db2e2d535f3a6eb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
@@ -66,8 +66,6 @@ entity makeXonoticServerCreateTab()
        return me;
 }
 
-.entity leaveMatchButton;
-
 void XonoticServerCreateTab_fill(entity me)
 {
        entity e, e0;
@@ -211,7 +209,7 @@ void XonoticServerCreateTab_fill(entity me)
        // bottom row
        me.gotoRC(me, me.rows - 1, 0);
                me.TDempty(me, me.columns * 1/12);
-               me.TD(me, 1, me.columns * 5/12, me.leaveMatchButton = makeXonoticLeaveMatchButton('0 0 0', 0));
+               me.TD(me, 1, me.columns * 5/12, e = makeXonoticLeaveMatchButton('0 0 0', 0));
                me.TD(me, 1, me.columns * 5/12, e = makeXonoticButton(_("Start multiplayer!"), '0 0 0'));
                        e.onClick = MapList_LoadMap;
                        e.onClickEntity = me.mapListBox;

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index e826cd9c4d0763c2972d0f043b8e2f744bebd995..b63e8143271e72fc3ec5a11d369898e511ba5e39 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@ -23,8 +23,6 @@ void XonoticServerListTab_refresh(entity this, entity slist)
     slist.refreshServerList(slist, clear ? REFRESHSERVERLIST_RESET : REFRESHSERVERLIST_ASK);
 }
 
-.entity leaveMatchButton;
-
 void XonoticServerListTab_fill(entity me)
 {
        entity e, slist;
@@ -92,7 +90,7 @@ void XonoticServerListTab_fill(entity me)
                        e.onClickEntity = slist;
                        slist.infoButton = e;
        me.TR(me);
-               me.TD(me, 1, me.columns * 0.5, me.leaveMatchButton = makeXonoticLeaveMatchButton('0 0 0', 0));
+               me.TD(me, 1, me.columns * 0.5, e = makeXonoticLeaveMatchButton('0 0 0', 0));
                me.TD(me, 1, me.columns * 0.5, e = makeXonoticButton(_("Join!"), '0 0 0'));
                        e.onClick = ServerList_Connect_Click;
                        e.onClickEntity = slist;

diff --git a/qcsrc/menu/xonotic/dialog_quit.qc b/qcsrc/menu/xonotic/dialog_quit.qc
index 8cc75162121ac4c6abed169cbdbef03b6225db0d..89bfae806495085842fce9d19fc6d4573e28966f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.qc
+++ b/qcsrc/menu/xonotic/dialog_quit.qc
@@ -10,7 +10,7 @@ void XonoticQuitDialog_fill(entity me)
        entity e;
        me.TR(me);
                me.TDempty(me, 0.5);
-               me.TD(me, 1, 1, me.disconnectButton = makeXonoticLeaveMatchButton('0 0 0', COMMANDBUTTON_CLOSE));
+               me.TD(me, 1, 1, e = makeXonoticLeaveMatchButton('0 0 0', COMMANDBUTTON_CLOSE));
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quit Xonotic"), '1 0 0', "echo ]quit; quit", 0));

diff --git a/qcsrc/menu/xonotic/dialog_quit.qh b/qcsrc/menu/xonotic/dialog_quit.qh
index 7348a24c8bcb9cca17a5460589472304a3f68c6c..ddf89e3a7bb5f2874d3a1a55f0c6099bb89e7bd1 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.qh
+++ b/qcsrc/menu/xonotic/dialog_quit.qh
@@ -10,5 +10,4 @@ CLASS(XonoticQuitDialog, XonoticDialog)
        ATTRIB(XonoticQuitDialog, rows, float, 3);
        ATTRIB(XonoticQuitDialog, columns, float, 2);
        ATTRIB(XonoticQuitDialog, name, string, "Quit");
-       ATTRIB(XonoticQuitDialog, disconnectButton, entity);
 ENDCLASS(XonoticQuitDialog)

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc
index 686c0bfcb8b71aea686bc7fe45242064d44d620d..57184dc00f0a48103757f5491cbecf80fa26c9fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc
@@ -140,8 +140,6 @@ void InstantAction_LoadMap(entity btn, entity dummy)
        cvar_set("lastlevel", "1");
 }
 
-.entity leaveMatchButton;
-
 void XonoticSingleplayerDialog_fill(entity me)
 {
        entity e, btnPrev, btnNext, lblTitle;
@@ -174,7 +172,7 @@ void XonoticSingleplayerDialog_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "g_campaign_skill", "2", ZCTX(_("CSKL^Hard"))));
        me.TR(me);
                me.TDempty(me, me.columns * 1/13);
-               me.TD(me, 1, me.columns * 5/13, me.leaveMatchButton = makeXonoticLeaveMatchButton('0 0 0', 0));
+               me.TD(me, 1, me.columns * 5/13, e = makeXonoticLeaveMatchButton('0 0 0', 0));
                me.TDempty(me, me.columns * 1/13);
                me.TD(me, 1, me.columns * 5/13, e = makeXonoticButton(_("Play campaign!"), '0 0 0'));
                        e.onClick = CampaignList_LoadMap;

diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc
index b0f561d91efced1358ca4efc8a9155b70c484df9..d0a62668107b3c2834c67460af168cbe48944204 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qc
+++ b/qcsrc/menu/xonotic/serverlist.qc
@@ -533,7 +533,6 @@ void XonoticServerList_draw(entity me)
        else { me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT); }
 
        me.connectButton.disabled = (me.ipAddressBox.text == "");
-       //me.disconnectButton.disabled = (!(gamestatus & (GAME_ISSERVER | GAME_CONNECTED)));
        me.infoButton.disabled = !owned;
        me.favoriteButton.disabled = (me.ipAddressBox.text == "");
 

diff --git a/qcsrc/menu/xonotic/serverlist.qh b/qcsrc/menu/xonotic/serverlist.qh
index 77236e6d051d3590021ec1d35851e647053c850e..52630ef9a4ebd3c61d3cd7fa8547b247e3629aa1 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qh
+++ b/qcsrc/menu/xonotic/serverlist.qh
@@ -53,7 +53,6 @@ CLASS(XonoticServerList, XonoticListBox)
        ATTRIB(XonoticServerList, sortButton4, entity);
        ATTRIB(XonoticServerList, sortButton5, entity);
        ATTRIB(XonoticServerList, connectButton, entity);
-       //ATTRIB(XonoticServerList, disconnectButton, entity);
        ATTRIB(XonoticServerList, infoButton, entity);
        ATTRIB(XonoticServerList, currentSortOrder, float, 0);
        ATTRIB(XonoticServerList, currentSortField, float, -1);