From 0dcf81e3d72481aea4afe50fe5de8eabbc875da5 Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Sun, 6 Jun 2021 14:00:45 +0200
Subject: [PATCH] Get rid of the leaveMatchButton and disconnectButton fields
since they're no longer needed
---
qcsrc/menu/xonotic/dialog_multiplayer_create.qc | 4 +---
qcsrc/menu/xonotic/dialog_multiplayer_join.qc | 4 +---
qcsrc/menu/xonotic/dialog_quit.qc | 2 +-
qcsrc/menu/xonotic/dialog_quit.qh | 1 -
qcsrc/menu/xonotic/dialog_singleplayer.qc | 4 +---
qcsrc/menu/xonotic/serverlist.qc | 1 -
qcsrc/menu/xonotic/serverlist.qh | 1 -
7 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
index a72fd1b0cd..a343c546c2 100644
--- 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 e826cd9c4d..b63e814327 100644
--- 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 8cc7516212..89bfae8064 100644
--- 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 7348a24c8b..ddf89e3a7b 100644
--- 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 686c0bfcb8..57184dc00f 100644
--- 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 b0f561d91e..d0a6266810 100644
--- 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 77236e6d05..52630ef9a4 100644
--- 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);
--
2.39.5