From 405639bc787c696ae8db4bb754e66ed29f108c4f Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 14 Aug 2020 21:05:23 -0700
Subject: [PATCH 1/3] Disable showjoinaddress by default

---
 src/d_clisrv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7ccb4ef92..8c8dad4cc 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -157,7 +157,7 @@ ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
 static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
 
 
-consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showjoinaddress = {"showjoinaddress", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
 consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

From beba43cffc00eaac196f66d8b39f0d88afc7b87f Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 14 Aug 2020 21:13:15 -0700
Subject: [PATCH 2/3] Add a menu option for showjoinaddress

I also had to make the "alphaKey" UINT16. Hopefully nothing breaks!
---
 src/m_menu.c | 3 +++
 src/m_menu.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index f0f4e85ae..92dfe8ff4 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1663,8 +1663,11 @@ static menuitem_t OP_ServerOptionsMenu[] =
 #ifndef NONET
 	{IT_HEADER, NULL, "Advanced", NULL, 225},
 	{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server",        &cv_masterserver,       231},
+
 	{IT_STRING | IT_CVAR,    NULL, "Join delay",                       &cv_joindelay,          246},
 	{IT_STRING | IT_CVAR,    NULL, "Attempts to resynchronise",        &cv_resynchattempts,    251},
+
+	{IT_STRING | IT_CVAR,    NULL, "Show IP Address of Joiners",       &cv_showjoinaddress,    256},
 #endif
 };
 
diff --git a/src/m_menu.h b/src/m_menu.h
index 88c06ae6f..0465128ef 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -327,7 +327,7 @@ typedef struct menuitem_s
 	void *itemaction;
 
 	// hotkey in menu or y of the item
-	UINT8 alphaKey;
+	UINT16 alphaKey;
 } menuitem_t;
 
 extern menuitem_t MP_RoomMenu[];

From 300436825dd4ac9a447e1dc095bbf77435d5878d Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 18 Aug 2020 11:18:42 -0700
Subject: [PATCH 3/3] Cast UINT16 for unlockable_t.height -> alphaKey

---
 src/m_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index 92dfe8ff4..b80ace3cb 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8020,7 +8020,7 @@ static void M_SecretsMenu(INT32 choice)
 
 		skyRoomMenuTranslations[i-1] = (UINT8)ul;
 		SR_MainMenu[i].text = unlockables[ul].name;
-		SR_MainMenu[i].alphaKey = (UINT8)unlockables[ul].height;
+		SR_MainMenu[i].alphaKey = (UINT16)unlockables[ul].height;
 
 		if (unlockables[ul].type == SECRET_HEADER)
 		{