From e19aa8c84a2afaa22bc468b5c1798aa4986c354d Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 16 Dec 2018 16:40:40 -0500
Subject: [PATCH 01/33] Pull expanded NMUSlist from 2.2

---
 src/w_wad.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/w_wad.c b/src/w_wad.c
index e1cd16ae9..bc5473eab 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1667,15 +1667,26 @@ int W_VerifyNMUSlumps(const char *filename)
 	// ENDOOM text and palette lumps
 	lumpchecklist_t NMUSlist[] =
 	{
-		{"D_", 2},
-		{"O_", 2},
-		{"DS", 2},
-		{"ENDOOM", 6},
-		{"PLAYPAL", 7},
-		{"COLORMAP", 8},
-		{"PAL", 3},
-		{"CLM", 3},
-		{"TRANS", 5},
+		{"D_", 2}, // MIDI music
+		{"O_", 2}, // Digital music
+		{"DS", 2}, // Sound effects
+
+		{"ENDOOM", 6}, // ENDOOM text lump
+
+		{"PLAYPAL", 7}, // Palette changes
+		{"PAL", 3}, // Palette changes
+		{"COLORMAP", 8}, // Colormap changes
+		{"CLM", 3}, // Colormap changes
+		{"TRANS", 5}, // Translucency map changes
+
+		{"LTFNT", 5}, // Level title font changes
+		{"TTL", 3}, // Act number changes
+		{"STCFN", 5}, // Console font changes
+		{"TNYFN", 5}, // Tiny console font changes
+		{"STT", 3}, // Acceptable HUD changes (Score Time Rings)
+		{"YB_", 3}, // Intermission graphics, goes with the above
+		{"M_", 2}, // As does menu stuff
+
 		{NULL, 0},
 	};
 	return W_VerifyFile(filename, NMUSlist, false);

From 76d6a4d2d5c6a607e94ae363ff82ff0e77df4320 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 16 Dec 2018 16:53:13 -0500
Subject: [PATCH 02/33] 2.1 Score/Time/Rings lump name

---
 src/w_wad.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/w_wad.c b/src/w_wad.c
index bc5473eab..b67974a10 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1683,7 +1683,8 @@ int W_VerifyNMUSlumps(const char *filename)
 		{"TTL", 3}, // Act number changes
 		{"STCFN", 5}, // Console font changes
 		{"TNYFN", 5}, // Tiny console font changes
-		{"STT", 3}, // Acceptable HUD changes (Score Time Rings)
+		{"SBO", 3}, // Acceptable HUD changes (Score Time Rings)
+		{"RRINGS", 6}, // Rings HUD (not named as SBO)
 		{"YB_", 3}, // Intermission graphics, goes with the above
 		{"M_", 2}, // As does menu stuff
 

From 2ba11a6d693d1074f7fdef73cc8d9529c4bd7f55 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 21 Oct 2018 14:51:49 -0400
Subject: [PATCH 03/33] Support for per-map intermission music

---
 src/dehacked.c   |  3 +++
 src/doomstat.h   |  3 +++
 src/lua_maplib.c |  2 ++
 src/p_setup.c    |  2 ++
 src/y_inter.c    | 12 ++++++++++--
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 871fa0a44..011936688 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1198,6 +1198,9 @@ static void readlevelheader(MYFILE *f, INT32 num)
 				mapheaderinfo[num-1]->mustrack = ((UINT16)i - 1);
 			else if (fastcmp(word, "MUSICPOS"))
 				mapheaderinfo[num-1]->muspos = (UINT32)get_number(word2);
+			else if (fastcmp(word, "MUSICINTER"))
+				deh_strlcpy(mapheaderinfo[num-1]->musintername, word2,
+					sizeof(mapheaderinfo[num-1]->musintername), va("Level header %d: intermission music", num));
 			else if (fastcmp(word, "FORCECHARACTER"))
 			{
 				strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1);
diff --git a/src/doomstat.h b/src/doomstat.h
index ad989f365..716c4d654 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -247,6 +247,9 @@ typedef struct
 	UINT8 numGradedMares;   ///< Internal. For grade support.
 	nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
 
+	// Music stuff.
+	char musintername[7];    ///< Intermission screen music.
+
 	// Lua stuff.
 	// (This is not ifdeffed so the map header structure can stay identical, just in case.)
 	UINT8 numCustomOptions;     ///< Internal. For Lua custom value support.
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index e63ea34d8..d77e636b3 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -1470,6 +1470,8 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushinteger(L, header->mustrack);
 	else if (fastcmp(field,"muspos"))
 		lua_pushinteger(L, header->muspos);
+	else if (fastcmp(field,"musintername"))
+		lua_pushstring(L, header->musintername);
 	else if (fastcmp(field,"forcecharacter"))
 		lua_pushstring(L, header->forcecharacter);
 	else if (fastcmp(field,"weather"))
diff --git a/src/p_setup.c b/src/p_setup.c
index db7379fbb..4409ec356 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -189,6 +189,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
 	mapheaderinfo[num]->mustrack = 0;
 	DEH_WriteUndoline("MUSICPOS", va("%d", mapheaderinfo[num]->muspos), UNDO_NONE);
 	mapheaderinfo[num]->muspos = 0;
+	DEH_WriteUndoline("MUSICINTER", mapheaderinfo[num]->musintername, UNDO_NONE);
+	mapheaderinfo[num]->musintername[0] = '\0';
 	DEH_WriteUndoline("FORCECHARACTER", va("%d", mapheaderinfo[num]->forcecharacter), UNDO_NONE);
 	mapheaderinfo[num]->forcecharacter[0] = '\0';
 	DEH_WriteUndoline("WEATHER", va("%d", mapheaderinfo[num]->weather), UNDO_NONE);
diff --git a/src/y_inter.c b/src/y_inter.c
index 4b340cabd..e6e5a1d22 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -696,7 +696,12 @@ void Y_Ticker(void)
 		boolean anybonuses = false;
 
 		if (!intertic) // first time only
-			S_ChangeMusicInternal("lclear", false); // don't loop it
+		{
+			if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
+				S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
+			else
+				S_ChangeMusicInternal("lclear", false); // don't loop it
+		}
 
 		if (intertic < TICRATE) // one second pause before tally begins
 			return;
@@ -757,7 +762,10 @@ void Y_Ticker(void)
 
 		if (!intertic) // first time only
 		{
-			S_ChangeMusicInternal("lclear", false); // don't loop it
+			if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
+				S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
+			else
+				S_ChangeMusicInternal("lclear", false); // don't loop it
 			tallydonetic = 0;
 		}
 

From 5807384dbd7fe2a15facdecd80a5994bc6e4316a Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 2 Jan 2019 06:26:18 -0500
Subject: [PATCH 04/33] Remove S_MusicExists lua

---
 src/lua_baselib.c | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index f5f3aeb76..d3443312a 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1899,42 +1899,6 @@ static int lib_sSpeedMusic(lua_State *L)
 	return 0;
 }
 
-static int lib_sMusicExists(lua_State *L)
-{
-	boolean checkMIDI = lua_opttrueboolean(L, 2);
-	boolean checkDigi = lua_opttrueboolean(L, 3);
-#ifdef MUSICSLOT_COMPATIBILITY
-	const char *music_name;
-	UINT32 music_num;
-	char music_compat_name[7];
-	UINT16 music_flags = 0;
-	NOHUD
-	if (lua_isnumber(L, 1))
-	{
-		music_num = (UINT32)luaL_checkinteger(L, 1);
-		music_flags = (UINT16)(music_num & 0x0000FFFF);
-		if (music_flags && music_flags <= 1035)
-			snprintf(music_compat_name, 7, "%sM", G_BuildMapName((INT32)music_flags));
-		else if (music_flags && music_flags <= 1050)
-			strncpy(music_compat_name, compat_special_music_slots[music_flags - 1036], 7);
-		else
-			music_compat_name[0] = 0; // becomes empty string
-		music_compat_name[6] = 0;
-		music_name = (const char *)&music_compat_name;
-	}
-	else
-	{
-		music_num = 0;
-		music_name = luaL_checkstring(L, 1);
-	}
-#else
-	const char *music_name = luaL_checkstring(L, 1);
-#endif
-	NOHUD
-	lua_pushboolean(L, S_MusicExists(music_name, checkMIDI, checkDigi));
-	return 1;
-}
-
 static int lib_sStopMusic(lua_State *L)
 {
 	player_t *player = NULL;
@@ -2405,7 +2369,6 @@ static luaL_Reg lib[] = {
 	{"S_StopSound",lib_sStopSound},
 	{"S_ChangeMusic",lib_sChangeMusic},
 	{"S_SpeedMusic",lib_sSpeedMusic},
-	{"S_MusicExists",lib_sMusicExists},
 	{"S_StopMusic",lib_sStopMusic},
 	{"S_SetInternalMusicVolume", lib_sSetInternalMusicVolume},
 	{"S_StopFadingMusic",lib_sStopFadingMusic},

From c5e9d6c97f8eb8260f34980a1a9aa98d45ceac6b Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 2 Jan 2019 06:48:06 -0500
Subject: [PATCH 05/33] DD Compile fixes

---
 src/win32/win_snd.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 4507c27ff..f3e3bbed4 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -815,11 +815,11 @@ void I_SetMusicVolume(UINT8 volume)
 	FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
 }
 
-UINT32 I_GetSongLength()
+UINT32 I_GetSongLength(void)
 {
+	UINT32 length;
 	if (I_SongType() == MU_MID)
 		return 0;
-	UINT32 length;
 	FMR_MUSIC(FMOD_Sound_GetLength(music_stream, &length, FMOD_TIMEUNIT_MS));
 	return length;
 }
@@ -837,11 +837,11 @@ UINT32 I_GetSongLoopPoint(void)
 
 boolean I_SetSongPosition(UINT32 position)
 {
+	FMOD_RESULT e;
 	if(I_SongType() == MU_MID)
 		// Dummy out; this works for some MIDI, but not others.
 		// SDL does not support this for any MIDI.
 		return false;
-	FMOD_RESULT e;
 	e = FMOD_Channel_SetPosition(music_channel, position, FMOD_TIMEUNIT_MS);
 	if (e == FMOD_OK)
 		return true;
@@ -857,11 +857,11 @@ boolean I_SetSongPosition(UINT32 position)
 
 UINT32 I_GetSongPosition(void)
 {
+	FMOD_RESULT e;
+	unsigned int fmposition = 0;
 	if(I_SongType() == MU_MID)
 		// Dummy out because unsupported, even though FMOD does this correctly.
 		return 0;
-	FMOD_RESULT e;
-	unsigned int fmposition = 0;
 	e = FMOD_Channel_GetPosition(music_channel, &fmposition, FMOD_TIMEUNIT_MS);
 	if (e == FMOD_OK)
 		return (UINT32)fmposition;

From e45c54dc600c544173e52f8467dffeb903f99613 Mon Sep 17 00:00:00 2001
From: Digiku <mar.marcoz@gmail.com>
Date: Mon, 7 Jan 2019 03:41:25 -0500
Subject: [PATCH 06/33] Update f_finale.c - Remove Torgo's real name by request

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

diff --git a/src/f_finale.c b/src/f_finale.c
index 64e371211..b177212c1 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1055,12 +1055,12 @@ static const char *credits[] = {
 	"Dan \"Blitzzo\" Hagerstrand",
 	"Kepa \"Nev3r\" Iceta",
 	"Thomas \"Shadow Hog\" Igoe",
-	"Erik \"Torgo\" Nielsen",
 	"\"Kaito Sinclaire\"",
 	"Wessel \"sphere\" Smit",
 	"\"Spazzo\"",
 	"\"SSNTails\"",
 	"Rob Tisdell",
+	"\"Torgo\"",
 	"Jarrett \"JEV3\" Voight",
 	"Johnny \"Sonikku\" Wallbank",
 	"Marco \"mazmazz\" Zafra",

From 8e862b3c98e9053d6cc6734a112ca23b5fd22bbe Mon Sep 17 00:00:00 2001
From: Digiku <mar.marcoz@gmail.com>
Date: Mon, 7 Jan 2019 16:50:59 -0500
Subject: [PATCH 07/33] Update f_finale.c - Small credits update

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

diff --git a/src/f_finale.c b/src/f_finale.c
index b177212c1..7708642e8 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -996,6 +996,7 @@ static const char *credits[] = {
 	"Andrew \"orospakr\" Clunis",
 	"Gregor \"Oogaland\" Dick",
 	"Louis-Antoine \"LJSonic\" de Moulins", // for fixing 2.1's netcode (de Rochefort doesn't quite fit on the screen sorry lol)
+	"Victor \"Steel Titanium\" Fuentes",
 	"Julio \"Chaos Zero 64\" Guir",
 	"\"Jimita\"",
 	"\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog
@@ -1006,7 +1007,6 @@ static const char *credits[] = {
 	"Colin \"Sonict\" Pfaff",
 	"Sean \"Sryder13\" Ryder",
 	"Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible
-	"\"Steel Titanium\"",
 	"Ben \"Cue\" Woodford",
 	// Git contributors with 5+ approved merges of substantive quality,
 	// or contributors with at least one groundbreaking merge, may be named.

From 123b97c5ed2ce25bcb93cbca60e9e784b6e827d9 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Tue, 15 Jan 2019 14:29:43 -0500
Subject: [PATCH 08/33] Fix skins overflow

---
 src/r_things.c | 4 ++--
 src/r_things.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/r_things.c b/src/r_things.c
index 67a45a76e..0382596f1 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2306,7 +2306,7 @@ void R_DrawMasked(void)
 // ==========================================================================
 
 INT32 numskins = 0;
-skin_t skins[MAXSKINS+1];
+skin_t skins[MAXSKINS];
 // FIXTHIS: don't work because it must be inistilised before the config load
 //#define SKINVALUES
 #ifdef SKINVALUES
@@ -2559,7 +2559,7 @@ void R_AddSkins(UINT16 wadnum)
 		// advance by default
 		lastlump = lump + 1;
 
-		if (numskins > MAXSKINS)
+		if (numskins >= MAXSKINS)
 		{
 			CONS_Debug(DBG_RENDER, "ignored skin (%d skins maximum)\n", MAXSKINS);
 			continue; // so we know how many skins couldn't be added
diff --git a/src/r_things.h b/src/r_things.h
index 6614e0aa4..2823c3894 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -180,7 +180,7 @@ typedef struct drawnode_s
 } drawnode_t;
 
 extern INT32 numskins;
-extern skin_t skins[MAXSKINS + 1];
+extern skin_t skins[MAXSKINS];
 
 void SetPlayerSkin(INT32 playernum,const char *skinname);
 void SetPlayerSkinByNum(INT32 playernum,INT32 skinnum); // Tails 03-16-2002

From bcdfe2eb14ee4d862a5d5088e4eb5f3744578d6b Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Tue, 15 Jan 2019 20:09:55 -0500
Subject: [PATCH 09/33] Update the SP menu stuff to use MAXSKINS

Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
---
 src/dehacked.c |   5 ++-
 src/m_menu.c   | 119 ++++++++++++++++++++-----------------------------
 src/m_menu.h   |   4 +-
 3 files changed, 54 insertions(+), 74 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index a726ecbc1..5161bf242 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -435,11 +435,12 @@ static void readAnimTex(MYFILE *f, INT32 num)
 static boolean findFreeSlot(INT32 *num)
 {
 	// Send the character select entry to a free slot.
-	while (*num < 32 && PlayerMenu[*num].status != IT_DISABLED)
+	while (*num < MAXSKINS && PlayerMenu[*num].status != IT_DISABLED)
 		*num = *num+1;
+		CONS_Printf("%d\n", *num);
 
 	// No more free slots. :(
-	if (*num >= 32)
+	if (*num >= MAXSKINS)
 		return false;
 
 	// Found one! ^_^
diff --git a/src/m_menu.c b/src/m_menu.c
index 266bc2516..c27689506 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -112,41 +112,8 @@ typedef enum
 const char *quitmsg[NUM_QUITMESSAGES];
 
 // Stuff for customizing the player select screen Tails 09-22-2003
-description_t description[32] =
-{
-	{"\x82Sonic\x80 is the fastest of the three, but also the hardest to control. Beginners beware, but experts will find Sonic very powerful.\n\n\x82""Ability:\x80 Speed Thok\nDouble jump to zoom forward with a huge burst of speed.\n\n\x82Tip:\x80 Simply letting go of forward does not slow down in SRB2. To slow down, hold the opposite direction.", "", "sonic"},
-	{"\x82Tails\x80 is the most mobile of the three, but has the slowest speed. Because of his mobility, he's well-\nsuited to beginners.\n\n\x82""Ability:\x80 Fly\nDouble jump to start flying for a limited time. Repetitively hit the jump button to ascend.\n\n\x82Tip:\x80 To quickly descend while flying, hit the spin button.", "", "tails"},
-	{"\x82Knuckles\x80 is well-\nrounded and can destroy breakable walls simply by touching them, but he can't jump as high as the other two.\n\n\x82""Ability:\x80 Glide & Climb\nDouble jump to glide in the air as long as jump is held. Glide into a wall to climb it.\n\n\x82Tip:\x80 Press spin while climbing to jump off the wall; press jump instead to jump off\nand face away from\nthe wall.", "", "knuckles"},
-	{"\x82Sonic & Tails\x80 team up to take on Dr. Eggman!\nControl Sonic while Tails desperately struggles to keep up.\n\nPlayer 2 can control Tails directly by setting the controls in the options menu.\nTails's directional controls are relative to Player 1's camera.\n\nTails can pick up Sonic while flying and carry him around.", "CHRS&T", "sonic&tails"},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""},
-	{"???", "", ""}
-};
+description_t description[MAXSKINS];
+
 static char *char_notes = NULL;
 static fixed_t char_scroll = 0;
 
@@ -842,41 +809,7 @@ static menuitem_t SP_LevelStatsMenu[] =
 // A rare case.
 // External files modify this menu, so we can't call it static.
 // And I'm too lazy to go through and rename it everywhere. ARRGH!
-menuitem_t PlayerMenu[32] =
-{
-	{IT_CALL, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_CALL, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_CALL, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_CALL, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0},
-	{IT_DISABLED, NULL, NULL, M_ChoosePlayer, 0}
-};
+menuitem_t PlayerMenu[MAXSKINS];
 
 // -----------------------------------
 // Multiplayer and all of its submenus
@@ -2809,6 +2742,8 @@ void M_Ticker(void)
 //
 void M_Init(void)
 {
+	UINT8 i;
+
 	CV_RegisterVar(&cv_nextmap);
 	CV_RegisterVar(&cv_newgametype);
 	CV_RegisterVar(&cv_chooseskin);
@@ -2850,6 +2785,50 @@ void M_Init(void)
 	quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n......right?\n\n(Press 'Y' to quit)");
 	quitmsg[QUIT3MSG6] = M_GetText("Aww, is Egg Rock Zone too\ndifficult for you?\n\n(Press 'Y' to quit)");
 
+	// Setup PlayerMenu table
+	for (i = 0; i < MAXSKINS; i++)
+	{
+		PlayerMenu[i].status = (i < 4 ? IT_CALL : IT_DISABLED);
+		PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
+		PlayerMenu[i].itemaction = M_ChoosePlayer;
+		PlayerMenu[i].alphaKey = 0;
+	}
+
+	// Setup description table
+	for (i = 0; i < MAXSKINS; i++)
+	{
+		if (i == 0)
+		{
+			strcpy(description[i].notes, "\x82Sonic\x80 is the fastest of the three, but also the hardest to control. Beginners beware, but experts will find Sonic very powerful.\n\n\x82""Ability:\x80 Speed Thok\nDouble jump to zoom forward with a huge burst of speed.\n\n\x82Tip:\x80 Simply letting go of forward does not slow down in SRB2. To slow down, hold the opposite direction.");
+			strcpy(description[i].picname, "");
+			strcpy(description[i].skinname, "sonic");
+		}
+		else if (i == 1)
+		{
+			strcpy(description[i].notes, "\x82Tails\x80 is the most mobile of the three, but has the slowest speed. Because of his mobility, he's well-\nsuited to beginners.\n\n\x82""Ability:\x80 Fly\nDouble jump to start flying for a limited time. Repetitively hit the jump button to ascend.\n\n\x82Tip:\x80 To quickly descend while flying, hit the spin button.");
+			strcpy(description[i].picname, "");
+			strcpy(description[i].skinname, "tails");
+		}
+		else if (i == 2)
+		{
+			strcpy(description[i].notes, "\x82Knuckles\x80 is well-\nrounded and can destroy breakable walls simply by touching them, but he can't jump as high as the other two.\n\n\x82""Ability:\x80 Glide & Climb\nDouble jump to glide in the air as long as jump is held. Glide into a wall to climb it.\n\n\x82Tip:\x80 Press spin while climbing to jump off the wall; press jump instead to jump off\nand face away from\nthe wall.");
+			strcpy(description[i].picname, "");
+			strcpy(description[i].skinname, "knuckles");
+		}
+		else if (i == 3)
+		{
+			strcpy(description[i].notes, "\x82Sonic & Tails\x80 team up to take on Dr. Eggman!\nControl Sonic while Tails desperately struggles to keep up.\n\nPlayer 2 can control Tails directly by setting the controls in the options menu.\nTails's directional controls are relative to Player 1's camera.\n\nTails can pick up Sonic while flying and carry him around.");
+			strcpy(description[i].picname, "CHRS&T");
+			strcpy(description[i].skinname, "sonic&tails");
+		}
+		else
+		{
+			strcpy(description[i].notes, "???");
+			strcpy(description[i].picname, "");
+			strcpy(description[i].skinname, "");
+		}
+	}
+
 #ifdef HWRENDER
 	// Permanently hide some options based on render mode
 	if (rendermode == render_soft)
diff --git a/src/m_menu.h b/src/m_menu.h
index eb770c194..7e2cce20d 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -151,7 +151,7 @@ typedef struct menuitem_s
 	UINT8 alphaKey;
 } menuitem_t;
 
-extern menuitem_t PlayerMenu[32];
+extern menuitem_t PlayerMenu[MAXSKINS];
 
 typedef struct menu_s
 {
@@ -206,7 +206,7 @@ typedef struct
 	UINT8 netgame;
 } saveinfo_t;
 
-extern description_t description[32];
+extern description_t description[MAXSKINS];
 
 extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort;
 extern CV_PossibleValue_t gametype_cons_t[];

From 34920c29512a0d87e0defaeda18c6b596ce790b0 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sat, 26 Jan 2019 23:16:49 -0500
Subject: [PATCH 10/33] Setup the tables even eariler.

I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
---
 src/d_main.c |  4 ++++
 src/m_menu.c | 33 ++++++++++++++++++---------------
 src/m_menu.h |  3 +++
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index dd2cfe0e5..1782e94f5 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1130,6 +1130,10 @@ void D_SRB2Main(void)
 	// Setup default unlockable conditions
 	M_SetupDefaultConditionSets();
 
+	// Setup character tables
+	// Have to be done here before files are loaded
+	M_InitCharacterTables();
+
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
 	if (!W_InitMultipleFiles(startupwadfiles))
diff --git a/src/m_menu.c b/src/m_menu.c
index c27689506..333cdaa70 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2742,8 +2742,6 @@ void M_Ticker(void)
 //
 void M_Init(void)
 {
-	UINT8 i;
-
 	CV_RegisterVar(&cv_nextmap);
 	CV_RegisterVar(&cv_newgametype);
 	CV_RegisterVar(&cv_chooseskin);
@@ -2785,6 +2783,24 @@ void M_Init(void)
 	quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n......right?\n\n(Press 'Y' to quit)");
 	quitmsg[QUIT3MSG6] = M_GetText("Aww, is Egg Rock Zone too\ndifficult for you?\n\n(Press 'Y' to quit)");
 
+#ifdef HWRENDER
+	// Permanently hide some options based on render mode
+	if (rendermode == render_soft)
+		OP_VideoOptionsMenu[1].status = IT_DISABLED;
+#endif
+
+#ifndef NONET
+	CV_RegisterVar(&cv_serversort);
+#endif
+
+	//todo put this somewhere better...
+	CV_RegisterVar(&cv_allcaps);
+}
+
+void M_InitCharacterTables(void)
+{
+	UINT8 i;
+
 	// Setup PlayerMenu table
 	for (i = 0; i < MAXSKINS; i++)
 	{
@@ -2828,19 +2844,6 @@ void M_Init(void)
 			strcpy(description[i].skinname, "");
 		}
 	}
-
-#ifdef HWRENDER
-	// Permanently hide some options based on render mode
-	if (rendermode == render_soft)
-		OP_VideoOptionsMenu[1].status = IT_DISABLED;
-#endif
-
-#ifndef NONET
-	CV_RegisterVar(&cv_serversort);
-#endif
-
-	//todo put this somewhere better...
-	CV_RegisterVar(&cv_allcaps);
 }
 
 // ==========================================================================
diff --git a/src/m_menu.h b/src/m_menu.h
index 7e2cce20d..fcde5b7db 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -38,6 +38,9 @@ void M_Drawer(void);
 // Called by D_SRB2Main, loads the config file.
 void M_Init(void);
 
+// Called by D_SRB2Main also, sets up the playermenu and description tables.
+void M_InitCharacterTables(void);
+
 // Called by intro code to force menu up upon a keypress,
 // does nothing if menu is already up.
 void M_StartControlPanel(void);

From 221ec15af09040d58238ede4091387ce46d51ca8 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sat, 26 Jan 2019 23:22:30 -0500
Subject: [PATCH 11/33] How did I forget about this

---
 src/dehacked.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 5161bf242..82d630a55 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -437,7 +437,6 @@ static boolean findFreeSlot(INT32 *num)
 	// Send the character select entry to a free slot.
 	while (*num < MAXSKINS && PlayerMenu[*num].status != IT_DISABLED)
 		*num = *num+1;
-		CONS_Printf("%d\n", *num);
 
 	// No more free slots. :(
 	if (*num >= MAXSKINS)

From 93bed5f40d1c3f341f04739c8b5fc2d50b06d57a Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 11 Feb 2019 16:39:58 -0500
Subject: [PATCH 12/33] Show line number on error, also hide under devmode

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

diff --git a/src/p_slopes.c b/src/p_slopes.c
index 68767b50c..4e12b104f 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -264,7 +264,7 @@ void P_SpawnSlope_Line(int linenum)
 
 	if(!line->frontsector || !line->backsector)
 	{
-		CONS_Printf("P_SpawnSlope_Line used on a line without two sides.\n");
+		CONS_Debug(DBG_SETUP, "P_SpawnSlope_Line used on a line without two sides. (line number %i)\n", linenum);
 		return;
 	}
 

From 4f5d698d80887046800207e693c8108f73828892 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 21 Feb 2019 19:44:18 -0500
Subject: [PATCH 13/33] Add command to ban an IP address.

---
 src/d_clisrv.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 2529b05d0..8ba356b68 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2627,6 +2627,42 @@ static void Command_Ban(void)
 
 }
 
+static void Command_BanIP(void)
+{
+	if (COM_Argc() < 2)
+	{
+		CONS_Printf(M_GetText("banip <ip> <reason>: ban an ip address\n"));
+		return;
+	}
+
+	if (server) // Only the server can use this, otherwise does nothing.
+	{
+		const char *address = (COM_Argv(1));
+		const char *reason;
+
+		if (COM_Argc() == 2)
+			reason = NULL;
+		else
+			reason = COM_Argv(2);
+
+
+		if (I_SetBanAddress && I_SetBanAddress(address, NULL))
+		{
+			if (reason)
+				CONS_Printf("Banned IP address %s for: %s\n", address, reason);
+			else
+				CONS_Printf("Banned IP address %s\n", address);
+
+			Ban_Add(reason);
+			D_SaveBan();
+		}
+		else
+		{
+			return;
+		}
+	}
+}
+
 static void Command_Kick(void)
 {
 	if (COM_Argc() < 2)
@@ -2906,6 +2942,7 @@ void D_ClientServerInit(void)
 	COM_AddCommand("getplayernum", Command_GetPlayerNum);
 	COM_AddCommand("kick", Command_Kick);
 	COM_AddCommand("ban", Command_Ban);
+	COM_AddCommand("banip", Command_BanIP);
 	COM_AddCommand("clearbans", Command_ClearBans);
 	COM_AddCommand("showbanlist", Command_ShowBan);
 	COM_AddCommand("reloadbans", Command_ReloadBan);

From deb58b0e68505ae4c75c9eb0374d2a724313fd6b Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 18 Feb 2019 01:03:39 -0500
Subject: [PATCH 14/33] Save ban list right after banning.

---
 src/d_clisrv.c          | 3 +++
 src/djgppdos/i_system.c | 3 ---
 src/sdl12/i_system.c    | 3 ---
 src/win32/win_sys.c     | 3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 8ba356b68..f3b1451a4 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2596,7 +2596,10 @@ static void Command_Ban(void)
 		else
 		{
 			if (server) // only the server is allowed to do this right now
+			{
 				Ban_Add(COM_Argv(2));
+				D_SaveBan(); // save the ban list
+			}
 
 			if (COM_Argc() == 2)
 			{
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index dae9ed16e..5413bfdb4 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -615,9 +615,6 @@ void I_Quit (void)
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
 	M_SaveConfig (NULL);   //save game config, cvars..
-#ifndef NONET
-	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	if (demorecording)
 		G_CheckDemoStatus();
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index 10fbc50ee..e9b292449 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -2282,9 +2282,6 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
-#ifndef NONET
-	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index 77a21f7f3..8b7adf7c6 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -639,9 +639,6 @@ void I_Error(const char *error, ...)
 	if (!errorcount)
 	{
 		M_SaveConfig(NULL); // save game config, cvars..
-#ifndef NONET
-		D_SaveBan(); // save the ban list
-#endif
 		G_SaveGameData();
 	}
 

From 512b001aa048fec29ad5c5910a18fbd799cc2612 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 18 Feb 2019 02:04:58 -0500
Subject: [PATCH 15/33] Save when quitting the game.

Also use default reason if not custom reason is given.
---
 src/djgppdos/i_system.c | 3 +++
 src/sdl12/i_system.c    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index 5413bfdb4..dae9ed16e 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -615,6 +615,9 @@ void I_Quit (void)
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
 	M_SaveConfig (NULL);   //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	if (demorecording)
 		G_CheckDemoStatus();
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index e9b292449..10fbc50ee 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -2282,6 +2282,9 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.

From a2820e0f51cfef0a26e006767da3d0cbc2c94242 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Tue, 19 Feb 2019 21:22:35 -0500
Subject: [PATCH 16/33] Some small changes.


From e7952e4de709aa23d4377480c3cea6a2efbb51b1 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 26 Feb 2019 21:14:22 +0000
Subject: [PATCH 17/33] Make sure that B_CheckRespawn can be called even if
 Tails is dead

---
 src/p_user.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/p_user.c b/src/p_user.c
index e4cb01f63..285d36ca9 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8688,8 +8688,11 @@ void P_PlayerThink(player_t *player)
 
 	if (player->bot)
 	{
-		if (player->playerstate == PST_LIVE && B_CheckRespawn(player))
-			player->playerstate = PST_REBORN;
+		if (player->playerstate == PST_LIVE || player->playerstate == PST_DEAD)
+		{
+			if (B_CheckRespawn(player))
+				player->playerstate = PST_REBORN;
+		}
 		if (player->playerstate == PST_REBORN)
 			return;
 	}

From 7fc180604b73a258cebd14be4dd3de48f475d2dc Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Wed, 27 Feb 2019 15:55:39 -0500
Subject: [PATCH 18/33] Upped MAXNETNODES

---
 src/d_net.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/d_net.h b/src/d_net.h
index 61c669dbb..8e8afcffa 100644
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -20,6 +20,7 @@
 
 // Max computers in a game
 #define MAXNETNODES 32
+#define MAXNETNODES (MAXPLAYERS+4)
 #define BROADCASTADDR MAXNETNODES
 #define MAXSPLITSCREENPLAYERS 2 // Max number of players on a single computer
 //#define NETSPLITSCREEN // Kart's splitscreen netgame feature

From c748882d0430293a2af645f25602bd09ad837edb Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Wed, 27 Feb 2019 16:05:43 -0500
Subject: [PATCH 19/33] Remove double define

---
 src/d_net.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/d_net.h b/src/d_net.h
index 8e8afcffa..3d1058702 100644
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -19,7 +19,6 @@
 #define __D_NET__
 
 // Max computers in a game
-#define MAXNETNODES 32
 #define MAXNETNODES (MAXPLAYERS+4)
 #define BROADCASTADDR MAXNETNODES
 #define MAXSPLITSCREENPLAYERS 2 // Max number of players on a single computer

From 832a6433c23b05b3ec077067c2e20435834e42a3 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 13 Mar 2019 19:42:29 -0400
Subject: [PATCH 20/33] Remove MP3 warning

---
 src/sdl/mixer_sound.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 04e82ea34..dde62fc7a 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -1037,12 +1037,6 @@ boolean I_LoadSong(char *data, size_t len)
 		return false;
 	}
 
-	if (I_SongType() == MU_MP3)
-	{
-		CONS_Debug(DBG_BASIC, "MP3 songs are unsupported and may crash! Use OGG instead.\n");
-		CONS_Debug(DBG_DETAILED, "MP3 songs are unsupported and may crash! Use OGG instead.\n");
-	}
-
 	// Find the OGG loop point.
 	loop_point = 0.0f;
 	song_length = 0.0f;

From 06f4f355ffd441d5db627e35f82e83f009669f7c Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 13 Mar 2019 19:44:24 -0400
Subject: [PATCH 21/33] Fix custom fade source bug for Change Music linedef

---
 src/p_spec.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/p_spec.c b/src/p_spec.c
index e8dc80a75..f3be86ee1 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2414,8 +2414,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				UINT32 prefadems = (UINT32)max(sides[line->sidenum[0]].textureoffset >> FRACBITS, 0);
 				UINT32 postfadems = (UINT32)max(sides[line->sidenum[0]].rowoffset >> FRACBITS, 0);
 				UINT8 fadetarget = (UINT8)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0);
-				INT16 fadesource = (INT16)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : 0, -1);
+				INT16 fadesource = (INT16)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1);
 
+				// Seek offset from current song position
 				if (line->flags & ML_EFFECT1)
 				{
 					// adjust for loop point if subtracting
@@ -2427,8 +2428,14 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 						position = max(S_GetMusicPosition() + position, 0);
 				}
 
+				// Fade current music to target volume (if music won't be changed)
 				if ((line->flags & ML_EFFECT2) && fadetarget && musicsame)
 				{
+					// 0 fadesource means fade from current volume.
+					// meaning that we can't specify volume 0 as the source volume -- this starts at 1.
+					if (!fadesource)
+						fadesource = -1;
+
 					if (!postfadems)
 						S_SetInternalMusicVolume(fadetarget);
 					else
@@ -2437,6 +2444,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 					if (position)
 						S_SetMusicPosition(position);
 				}
+				// Change the music and apply position/fade operations
 				else
 				{
 					strncpy(mapmusname, sides[line->sidenum[0]].text, 7);

From aa22941d2cec637279705c539351a5cae41782b5 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 13 Mar 2019 21:18:23 -0400
Subject: [PATCH 22/33] Restore MUSIC_RELOADRESET if block in g_game

---
 src/g_game.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/g_game.c b/src/g_game.c
index 0992d55a7..c0cb469a1 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2263,6 +2263,22 @@ void G_PlayerReborn(INT32 player)
 	if ((netgame || multiplayer) && !p->spectator)
 		p->powers[pw_flashing] = flashingtics-1; // Babysitting deterrent
 
+	if (p-players == consoleplayer)
+	{
+		if (mapmusflags & MUSIC_RELOADRESET)
+		{
+			strncpy(mapmusname, mapheaderinfo[gamemap-1]->musname, 7);
+			mapmusname[6] = 0;
+			mapmusflags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK);
+			mapmusposition = mapheaderinfo[gamemap-1]->muspos;
+		}
+
+		// This is in S_Start, but this was not here previously.
+		// if (cv_resetmusic.value)
+		// 	S_StopMusic();
+		S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+	}
+
 	if (gametype == GT_COOP)
 		P_FindEmerald(); // scan for emeralds to hunt for
 

From 2c823703f9a11071a736aad60456fbb5a4f64fa0 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 13 Mar 2019 23:17:35 -0400
Subject: [PATCH 23/33] When changing to same music, reset the internal volume

---
 src/s_sound.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/s_sound.c b/src/s_sound.c
index 89eb697cc..f3e330847 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1523,6 +1523,11 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 		I_SetSongPosition(position);
 		I_FadeSong(100, fadeinms, NULL);
  	}
+	else // reset volume to 100 with same music
+	{
+		I_StopFadingSong();
+		I_SetInternalMusicVolume(100);
+	}
 }
 
 void S_StopMusic(void)

From bdb9e8cfda9a13d3955ce13d77271adb93c82ec6 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 13 Mar 2019 23:55:30 -0400
Subject: [PATCH 24/33] When resetting volume on same music, make it fade
 instead of a hard change

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

diff --git a/src/s_sound.c b/src/s_sound.c
index f3e330847..acb7dcbbe 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1526,7 +1526,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 	else // reset volume to 100 with same music
 	{
 		I_StopFadingSong();
-		I_SetInternalMusicVolume(100);
+		I_FadeSong(100, 500, NULL);
 	}
 }
 

From 1381343a2e4fbcf5fcd2bebe2dd9e265638f4620 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 15 Mar 2019 01:00:50 -0400
Subject: [PATCH 25/33] Implement MUSICINTERFADEOUT level header

---
 src/dehacked.c   | 2 ++
 src/doomstat.h   | 1 +
 src/lua_maplib.c | 2 ++
 src/p_setup.c    | 2 ++
 src/y_inter.c    | 8 ++++++--
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 6978dd16a..bda0c38f7 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1198,6 +1198,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
 				mapheaderinfo[num-1]->mustrack = ((UINT16)i - 1);
 			else if (fastcmp(word, "MUSICPOS"))
 				mapheaderinfo[num-1]->muspos = (UINT32)get_number(word2);
+			else if (fastcmp(word, "MUSICINTERFADEOUT"))
+				mapheaderinfo[num-1]->musinterfadeout = (UINT32)get_number(word2);
 			else if (fastcmp(word, "MUSICINTER"))
 				deh_strlcpy(mapheaderinfo[num-1]->musintername, word2,
 					sizeof(mapheaderinfo[num-1]->musintername), va("Level header %d: intermission music", num));
diff --git a/src/doomstat.h b/src/doomstat.h
index 716c4d654..d9132798f 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -248,6 +248,7 @@ typedef struct
 	nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
 
 	// Music stuff.
+	UINT32 musinterfadeout;  ///< Fade out level music on intermission screen in milliseconds
 	char musintername[7];    ///< Intermission screen music.
 
 	// Lua stuff.
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index d77e636b3..35542fdce 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -1470,6 +1470,8 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushinteger(L, header->mustrack);
 	else if (fastcmp(field,"muspos"))
 		lua_pushinteger(L, header->muspos);
+	else if (fastcmp(field,"musinterfadeout"))
+		lua_pushinteger(L, header->musinterfadeout);
 	else if (fastcmp(field,"musintername"))
 		lua_pushstring(L, header->musintername);
 	else if (fastcmp(field,"forcecharacter"))
diff --git a/src/p_setup.c b/src/p_setup.c
index 4409ec356..033e99f10 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -189,6 +189,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
 	mapheaderinfo[num]->mustrack = 0;
 	DEH_WriteUndoline("MUSICPOS", va("%d", mapheaderinfo[num]->muspos), UNDO_NONE);
 	mapheaderinfo[num]->muspos = 0;
+	DEH_WriteUndoline("MUSICINTERFADEOUT", va("%d", mapheaderinfo[num]->musinterfadeout), UNDO_NONE);
+	mapheaderinfo[num]->musinterfadeout = 0;
 	DEH_WriteUndoline("MUSICINTER", mapheaderinfo[num]->musintername, UNDO_NONE);
 	mapheaderinfo[num]->musintername[0] = '\0';
 	DEH_WriteUndoline("FORCECHARACTER", va("%d", mapheaderinfo[num]->forcecharacter), UNDO_NONE);
diff --git a/src/y_inter.c b/src/y_inter.c
index e6e5a1d22..1b7796efa 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -697,7 +697,9 @@ void Y_Ticker(void)
 
 		if (!intertic) // first time only
 		{
-			if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
+			if (mapheaderinfo[gamemap-1]->musinterfadeout)
+				S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
+			else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
 				S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
 			else
 				S_ChangeMusicInternal("lclear", false); // don't loop it
@@ -762,7 +764,9 @@ void Y_Ticker(void)
 
 		if (!intertic) // first time only
 		{
-			if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
+			if (mapheaderinfo[gamemap-1]->musinterfadeout)
+				S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
+			else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
 				S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
 			else
 				S_ChangeMusicInternal("lclear", false); // don't loop it

From a40c6f01250df03786a3e7812ee258e80396514e Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 15 Mar 2019 01:26:13 -0400
Subject: [PATCH 26/33] Intermission: Don't fade out level music when using
 win32 midi volume hack

---
 src/y_inter.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/y_inter.c b/src/y_inter.c
index 1b7796efa..ed4972d2e 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -697,7 +697,12 @@ void Y_Ticker(void)
 
 		if (!intertic) // first time only
 		{
-			if (mapheaderinfo[gamemap-1]->musinterfadeout)
+			if (mapheaderinfo[gamemap-1]->musinterfadeout
+#ifdef _WIN32
+				// can't fade midi due to win32 volume hack
+				&& S_MusicType() != MU_MID
+#endif
+			)
 				S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
 			else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
 				S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it
@@ -764,7 +769,12 @@ void Y_Ticker(void)
 
 		if (!intertic) // first time only
 		{
-			if (mapheaderinfo[gamemap-1]->musinterfadeout)
+			if (mapheaderinfo[gamemap-1]->musinterfadeout
+#ifdef _WIN32
+				// can't fade midi due to win32 volume hack
+				&& S_MusicType() != MU_MID
+#endif
+			)
 				S_FadeOutStopMusic(mapheaderinfo[gamemap-1]->musinterfadeout);
 			else if (mapheaderinfo[gamemap-1]->musintername[0] && S_MusicExists(mapheaderinfo[gamemap-1]->musintername, !midi_disabled, !digital_disabled))
 				S_ChangeMusicInternal(mapheaderinfo[gamemap-1]->musintername, false); // don't loop it

From 5d059da843915a7de0675cddf22464061bd2772a Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 18 Mar 2019 22:00:23 +0000
Subject: [PATCH 27/33] Added the Gametype_Names array and G_GetGametypeByName
 for ease in converting gametype nums to strings and vice versa

gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
---
 src/d_clisrv.c | 12 ++------
 src/d_main.c   | 10 ++-----
 src/d_netcmd.c | 76 +++++++++++++++++++++-----------------------------
 src/doomstat.h |  5 +++-
 src/g_game.c   | 32 +++++++++++++++++++++
 src/g_game.h   |  1 +
 src/hu_stuff.c | 22 +++++++--------
 src/m_menu.c   | 27 ++++--------------
 8 files changed, 90 insertions(+), 95 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index a0f9f40ab..31fec14fa 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2056,17 +2056,11 @@ static void CL_ConnectToServer(boolean viams)
 
 	if (i != -1)
 	{
-		INT32 j;
+		UINT8 num = serverlist[i].info.gametype;
 		const char *gametypestr = NULL;
 		CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
-		for (j = 0; gametype_cons_t[j].strvalue; j++)
-		{
-			if (gametype_cons_t[j].value == serverlist[i].info.gametype)
-			{
-				gametypestr = gametype_cons_t[j].strvalue;
-				break;
-			}
-		}
+		if (num < NUMGAMETYPES)
+			gametypestr = Gametype_Names[num];
 		if (gametypestr)
 			CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
 		CONS_Printf(M_GetText("Version: %d.%d.%u\n"), serverlist[i].info.version/100,
diff --git a/src/d_main.c b/src/d_main.c
index 1782e94f5..527031fa8 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1362,13 +1362,9 @@ void D_SRB2Main(void)
 			INT16 newgametype = -1;
 			const char *sgametype = M_GetNextParm();
 
-			for (j = 0; gametype_cons_t[j].strvalue; j++)
-				if (!strcasecmp(gametype_cons_t[j].strvalue, sgametype))
-				{
-					newgametype = (INT16)gametype_cons_t[j].value;
-					break;
-				}
-			if (!gametype_cons_t[j].strvalue) // reached end of the list with no match
+			newgametype = G_GetGametypeByName(sgametype);
+
+			if (newgametype == -1) // reached end of the list with no match
 			{
 				j = atoi(sgametype); // assume they gave us a gametype number, which is okay too
 				if (j >= 0 && j < NUMGAMETYPES)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 11b9413a8..71ec55de2 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -409,6 +409,16 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
   */
 void D_RegisterServerCommands(void)
 {
+	INT32 i;
+
+	for (i = 0; i < NUMGAMETYPES; i++)
+	{
+		gametype_cons_t[i].value = i;
+		gametype_cons_t[i].strvalue = Gametype_Names[i];
+	}
+	gametype_cons_t[NUMGAMETYPES].value = 0;
+	gametype_cons_t[NUMGAMETYPES].strvalue = NULL;
+
 	RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
 	RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
 	RegisterNetXCmd(XD_MAP, Got_Mapcmd);
@@ -1639,7 +1649,7 @@ static void Command_Map_f(void)
 {
 	const char *mapname;
 	size_t i;
-	INT32 j, newmapnum;
+	INT32 newmapnum;
 	boolean newresetplayers;
 	INT32 newgametype = gametype;
 
@@ -1707,27 +1717,13 @@ static void Command_Map_f(void)
 			return;
 		}
 
-		for (j = 0; gametype_cons_t[j].strvalue; j++)
-			if (!strcasecmp(gametype_cons_t[j].strvalue, COM_Argv(i+1)))
-			{
-				// Don't do any variable setting here. Wait until you get your
-				// map packet first to avoid sending the same info twice!
-				newgametype = gametype_cons_t[j].value;
+		newgametype = G_GetGametypeByName(COM_Argv(i+1));
 
-				break;
-			}
-
-		if (!gametype_cons_t[j].strvalue) // reached end of the list with no match
+		if (newgametype == -1) // reached end of the list with no match
 		{
-			// assume they gave us a gametype number, which is okay too
-			for (j = 0; gametype_cons_t[j].strvalue != NULL; j++)
-			{
-				if (atoi(COM_Argv(i+1)) == gametype_cons_t[j].value)
-				{
-					newgametype = gametype_cons_t[j].value;
-					break;
-				}
-			}
+			INT32 j = atoi(COM_Argv(i+1)); // assume they gave us a gametype number, which is okay too
+			if (j >= 0 && j < NUMGAMETYPES)
+				newgametype = (INT16)j;
 		}
 	}
 
@@ -1742,12 +1738,11 @@ static void Command_Map_f(void)
 		char gametypestring[32] = "Single Player";
 
 		if (multiplayer)
-			for (i = 0; gametype_cons_t[i].strvalue != NULL; i++)
-				if (gametype_cons_t[i].value == newgametype)
-				{
-					strcpy(gametypestring, gametype_cons_t[i].strvalue);
-					break;
-				}
+		{
+			if (newgametype >= 0 && newgametype < NUMGAMETYPES
+			&& Gametype_Names[newgametype])
+				strcpy(gametypestring, Gametype_Names[newgametype]);
+		}
 
 		CONS_Alert(CONS_WARNING, M_GetText("%s doesn't support %s mode!\n(Use -force to override)\n"), mapname, gametypestring);
 		return;
@@ -3486,7 +3481,6 @@ static void Command_ModDetails_f(void)
 //
 static void Command_ShowGametype_f(void)
 {
-	INT32 j;
 	const char *gametypestr = NULL;
 
 	if (!(netgame || multiplayer)) // print "Single player" instead of "Co-op"
@@ -3494,15 +3488,11 @@ static void Command_ShowGametype_f(void)
 		CONS_Printf(M_GetText("Current gametype is %s\n"), M_GetText("Single player"));
 		return;
 	}
-	// find name string for current gametype
-	for (j = 0; gametype_cons_t[j].strvalue; j++)
-	{
-		if (gametype_cons_t[j].value == gametype)
-		{
-			gametypestr = gametype_cons_t[j].strvalue;
-			break;
-		}
-	}
+
+	// get name string for current gametype
+	if (gametype >= 0 && gametype < NUMGAMETYPES)
+		gametypestr = Gametype_Names[gametype];
+
 	if (gametypestr)
 		CONS_Printf(M_GetText("Current gametype is %s\n"), gametypestr);
 	else // string for current gametype was not found above (should never happen)
@@ -3644,15 +3634,13 @@ void D_GameTypeChanged(INT32 lastgametype)
 {
 	if (netgame)
 	{
-		INT32 j;
 		const char *oldgt = NULL, *newgt = NULL;
-		for (j = 0; gametype_cons_t[j].strvalue; j++)
-		{
-			if (gametype_cons_t[j].value == lastgametype)
-				oldgt = gametype_cons_t[j].strvalue;
-			if (gametype_cons_t[j].value == gametype)
-				newgt = gametype_cons_t[j].strvalue;
-		}
+
+		if (lastgametype >= 0 && lastgametype < NUMGAMETYPES)
+			oldgt = Gametype_Names[lastgametype];
+		if (gametype >= 0 && lastgametype < NUMGAMETYPES)
+			newgt = Gametype_Names[gametype];
+
 		if (oldgt && newgt)
 			CONS_Printf(M_GetText("Gametype was changed from %s to %s\n"), oldgt, newgt);
 	}
diff --git a/src/doomstat.h b/src/doomstat.h
index d9132798f..8050a1beb 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -318,7 +318,10 @@ enum GameType
 
 	NUMGAMETYPES
 };
-// If you alter this list, update gametype_cons_t in m_menu.c
+// If you alter this list, update dehacked.c, and Gametype_Names in g_game.c
+
+// String names for gametypes
+extern const char *Gametype_Names[NUMGAMETYPES];
 
 extern tic_t totalplaytime;
 
diff --git a/src/g_game.c b/src/g_game.c
index c0cb469a1..f9477f91e 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2698,6 +2698,38 @@ void G_ExitLevel(void)
 	}
 }
 
+// See also the enum GameType in doomstat.h
+const char *Gametype_Names[NUMGAMETYPES] =
+{
+	"Co-op", // GT_COOP
+	"Competition", // GT_COMPETITION
+	"Race", // GT_RACE
+
+	"Match", // GT_MATCH
+	"Team Match", // GT_TEAMMATCH
+
+	"Tag", // GT_TAG
+	"Hide and Seek", // GT_HIDEANDSEEK
+
+	"CTF" // GT_CTF
+};
+
+//
+// G_GetGametypeByName
+//
+// Returns the number for the given gametype name string, or -1 if not valid.
+//
+INT32 G_GetGametypeByName(const char *gametypestr)
+{
+	INT32 i;
+
+	for (i = 0; i < NUMGAMETYPES; i++)
+		if (!stricmp(gametypestr, Gametype_Names[i]))
+			return i;
+
+	return -1; // unknown gametype
+}
+
 //
 // G_IsSpecialStage
 //
diff --git a/src/g_game.h b/src/g_game.h
index 5259eacbb..87ddb3103 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -163,6 +163,7 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
 void G_StopDemo(void);
 boolean G_CheckDemoStatus(void);
 
+INT32 G_GetGametypeByName(const char *gametypestr);
 boolean G_IsSpecialStage(INT32 mapnum);
 boolean G_GametypeUsesLives(void);
 boolean G_GametypeHasTeams(void);
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index e34e5c35c..f624e39de 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1952,19 +1952,17 @@ static void HU_DrawCEcho(void)
 
 static void HU_drawGametype(void)
 {
-	INT32 i = 0;
+	const char *strvalue = NULL;
 
-	for (i = 0; gametype_cons_t[i].strvalue; i++)
-	{
-		if (gametype_cons_t[i].value == gametype)
-		{
-			if (splitscreen)
-				V_DrawString(4, 184, 0, gametype_cons_t[i].strvalue);
-			else
-				V_DrawString(4, 192, 0, gametype_cons_t[i].strvalue);
-			return;
-		}
-	}
+	if (gametype < 0 || gametype >= NUMGAMETYPES)
+		return; // not a valid gametype???
+
+	strvalue = Gametype_Names[gametype];
+
+	if (splitscreen)
+		V_DrawString(4, 184, 0, strvalue);
+	else
+		V_DrawString(4, 192, 0, strvalue);
 }
 
 //
diff --git a/src/m_menu.c b/src/m_menu.c
index 65647d2a6..a833ace21 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -347,23 +347,9 @@ static CV_PossibleValue_t skins_cons_t[MAXSKINS+1] = {{1, DEFAULTSKIN}};
 consvar_t cv_chooseskin = {"chooseskin", DEFAULTSKIN, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 // This gametype list is integral for many different reasons.
-// When you add gametypes here, don't forget to update them in CV_AddValue!
-CV_PossibleValue_t gametype_cons_t[] =
-{
-	{GT_COOP, "Co-op"},
+// When you add gametypes here, don't forget to update them in dehacked.c and doomstat.h!
+CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
 
-	{GT_COMPETITION, "Competition"},
-	{GT_RACE, "Race"},
-
-	{GT_MATCH, "Match"},
-	{GT_TEAMMATCH, "Team Match"},
-
-	{GT_TAG, "Tag"},
-	{GT_HIDEANDSEEK, "Hide and Seek"},
-
-	{GT_CTF, "CTF"},
-	{0, NULL}
-};
 consvar_t cv_newgametype = {"newgametype", "Co-op", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t serversort_cons_t[] = {
@@ -6545,7 +6531,7 @@ static void M_DrawRoomMenu(void)
 
 static void M_DrawConnectMenu(void)
 {
-	UINT16 i, j;
+	UINT16 i;
 	const char *gt = "Unknown";
 	INT32 numPages = (serverlistcount+(SERVERS_PER_PAGE-1))/SERVERS_PER_PAGE;
 
@@ -6591,11 +6577,8 @@ static void M_DrawConnectMenu(void)
 		                     va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
 
 		gt = "Unknown";
-		for (j = 0; gametype_cons_t[j].strvalue; j++)
-		{
-			if (gametype_cons_t[j].value == serverlist[slindex].info.gametype)
-				gt = gametype_cons_t[j].strvalue;
-		}
+		if (serverlist[slindex].info.gametype < NUMGAMETYPES)
+			gt = Gametype_Names[serverlist[slindex].info.gametype];
 
 		V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
 		                         va("Players: %02d/%02d", serverlist[slindex].info.numberofplayer, serverlist[slindex].info.maxplayer));

From 7301140b10ebe4c7d02381b395201dff0e498d22 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Thu, 2 May 2019 18:31:51 -0400
Subject: [PATCH 28/33] Remove MP3 widechar tag searching

1. It's slow, 2. It's incorrect
---
 src/sdl/mixer_sound.c | 56 -------------------------------------------
 1 file changed, 56 deletions(-)

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index dde62fc7a..7b5a95a45 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -908,15 +908,6 @@ boolean I_LoadSong(char *data, size_t len)
 	const size_t key3len = strlen(key3);
 	const size_t key4len = strlen(key4);
 
-	// for mp3 wide chars
-	const char *key1w = "L\0O\0O\0P\0";
-	const char *key2w = "P\0O\0I\0N\0T\0\0\0\xFF\xFE";
-	const char *key3w = "M\0S\0\0\0\xFF\xFE";
-	const char *key4w = "L\0E\0N\0G\0T\0H\0M\0S\0\0\0\xFF\xFE";
-	const char *wterm = "\0\0";
-	char wval[10];
-
-	size_t wstart, wp;
 	char *p = data;
 	SDL_RWops *rw;
 
@@ -1067,53 +1058,6 @@ boolean I_LoadSong(char *data, size_t len)
 			p += key4len; // skip LENGTHMS
 			song_length = (float)(atoi(p) / 1000.0L);
 		}
-		// below: search MP3 or other tags that use wide char encoding
-		else if (fpclassify(loop_point) == FP_ZERO && !memcmp(p, key1w, key1len*2)) // LOOP wide char
-		{
-			p += key1len*2;
-			if (!memcmp(p, key2w, (key2len+1)*2)) // POINT= wide char
-			{
-				p += (key2len+1)*2;
-				wstart = (size_t)p;
-				wp = 0;
-				while (wp < 9 && memcmp(p, wterm, 2))
-				{
-					wval[wp] = *p;
-					p += 2;
-					wp = ((size_t)(p-wstart))/2;
-				}
-				wval[min(wp, 9)] = 0;
-				loop_point = (float)((44.1L+atoi(wval) / 44100.0L));
-			}
-			else if (!memcmp(p, key3w, (key3len+1)*2)) // MS= wide char
-			{
-				p += (key3len+1)*2;
-				wstart = (size_t)p;
-				wp = 0;
-				while (wp < 9 && memcmp(p, wterm, 2))
-				{
-					wval[wp] = *p;
-					p += 2;
-					wp = ((size_t)(p-wstart))/2;
-				}
-				wval[min(wp, 9)] = 0;
-				loop_point = (float)(atoi(wval) / 1000.0L);
-			}
-		}
-		else if (fpclassify(song_length) == FP_ZERO && !memcmp(p, key4w, (key4len+1)*2)) // LENGTHMS= wide char
-		{
-			p += (key4len+1)*2;
-			wstart = (size_t)p;
-			wp = 0;
-			while (wp < 9 && memcmp(p, wterm, 2))
-			{
-				wval[wp] = *p;
-				p += 2;
-				wp = ((size_t)(p-wstart))/2;
-			}
-			wval[min(wp, 9)] = 0;
-			song_length = (float)(atoi(wval) / 1000.0L);
-		}
 
 		if (fpclassify(loop_point) != FP_ZERO && fpclassify(song_length) != FP_ZERO && song_length > loop_point) // Got what we needed
 			// the last case is a sanity check, in case the wide char searches were false matches.

From d2236a32c38dd834c96866ee1972b42471055b3f Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Thu, 2 May 2019 19:14:23 -0400
Subject: [PATCH 29/33] Remove song_length tag search

Because songs without this tag will skiplag when loading.
---
 src/sdl/mixer_sound.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 7b5a95a45..045e82b15 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -902,11 +902,9 @@ boolean I_LoadSong(char *data, size_t len)
 	const char *key1 = "LOOP";
 	const char *key2 = "POINT=";
 	const char *key3 = "MS=";
-	const char *key4 = "LENGTHMS=";
 	const size_t key1len = strlen(key1);
 	const size_t key2len = strlen(key2);
 	const size_t key3len = strlen(key3);
-	const size_t key4len = strlen(key4);
 
 	char *p = data;
 	SDL_RWops *rw;
@@ -1053,14 +1051,8 @@ boolean I_LoadSong(char *data, size_t len)
 				// Everything that uses LOOPMS will work perfectly with SDL_Mixer.
 			}
 		}
-		else if (fpclassify(song_length) == FP_ZERO && !strncmp(p, key4, key4len)) // is it LENGTHMS=?
-		{
-			p += key4len; // skip LENGTHMS
-			song_length = (float)(atoi(p) / 1000.0L);
-		}
 
-		if (fpclassify(loop_point) != FP_ZERO && fpclassify(song_length) != FP_ZERO && song_length > loop_point) // Got what we needed
-			// the last case is a sanity check, in case the wide char searches were false matches.
+		if (fpclassify(loop_point) != FP_ZERO) // Got what we needed
 			break;
 		else // continue searching
 			p++;

From 93c706bfb85e20a2407d46b9f8dc1285d2cb1934 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Wed, 8 May 2019 09:36:37 -0500
Subject: [PATCH 30/33] Don't skip frames when connecting or paused

---
 src/sdl/i_video.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index dbaa7037a..f7afcf7de 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -984,6 +984,7 @@ void I_UpdateNoBlit(void)
 // from PrBoom's src/SDL/i_video.c
 static inline boolean I_SkipFrame(void)
 {
+#if 0
 	static boolean skip = false;
 
 	if (rendermode != render_soft)
@@ -1003,6 +1004,8 @@ static inline boolean I_SkipFrame(void)
 		default:
 			return false;
 	}
+#endif
+	return false;
 }
 
 //

From 3f4121085be4aa694bc0ab87feb20e8aff938e11 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 4 Mar 2019 22:13:22 -0800
Subject: [PATCH 31/33] Check that lumps are okay

---
 src/p_saveg.c | 149 +++++++++++++++++++++++++-------------------------
 1 file changed, 76 insertions(+), 73 deletions(-)

diff --git a/src/p_saveg.c b/src/p_saveg.c
index 12ee1345b..13117f07c 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -649,84 +649,87 @@ static void P_NetArchiveWorld(void)
 
 	mld = W_CacheLumpNum(lastloadedmaplumpnum+ML_LINEDEFS, PU_CACHE);
 	msd = W_CacheLumpNum(lastloadedmaplumpnum+ML_SIDEDEFS, PU_CACHE);
-	// do lines
-	for (i = 0; i < numlines; i++, mld++, li++)
+	if (mld && msd)
 	{
-		diff = diff2 = 0;
-
-		if (li->special != SHORT(mld->special))
-			diff |= LD_SPECIAL;
-
-		if (SHORT(mld->special) == 321 || SHORT(mld->special) == 322) // only reason li->callcount would be non-zero is if either of these are involved
-			diff |= LD_CLLCOUNT;
-
-		if (li->sidenum[0] != 0xffff)
+		// do lines
+		for (i = 0; i < numlines; i++, mld++, li++)
 		{
-			si = &sides[li->sidenum[0]];
-			if (si->textureoffset != SHORT(msd[li->sidenum[0]].textureoffset)<<FRACBITS)
-				diff |= LD_S1TEXOFF;
-			//SoM: 4/1/2000: Some textures are colormaps. Don't worry about invalid textures.
-			if (R_CheckTextureNumForName(msd[li->sidenum[0]].toptexture) != -1
-				&& si->toptexture != R_TextureNumForName(msd[li->sidenum[0]].toptexture))
-				diff |= LD_S1TOPTEX;
-			if (R_CheckTextureNumForName(msd[li->sidenum[0]].bottomtexture) != -1
-				&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[0]].bottomtexture))
-				diff |= LD_S1BOTTEX;
-			if (R_CheckTextureNumForName(msd[li->sidenum[0]].midtexture) != -1
-				&& si->midtexture != R_TextureNumForName(msd[li->sidenum[0]].midtexture))
-				diff |= LD_S1MIDTEX;
-		}
-		if (li->sidenum[1] != 0xffff)
-		{
-			si = &sides[li->sidenum[1]];
-			if (si->textureoffset != SHORT(msd[li->sidenum[1]].textureoffset)<<FRACBITS)
-				diff2 |= LD_S2TEXOFF;
-			if (R_CheckTextureNumForName(msd[li->sidenum[1]].toptexture) != -1
-				&& si->toptexture != R_TextureNumForName(msd[li->sidenum[1]].toptexture))
-				diff2 |= LD_S2TOPTEX;
-			if (R_CheckTextureNumForName(msd[li->sidenum[1]].bottomtexture) != -1
-				&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[1]].bottomtexture))
-				diff2 |= LD_S2BOTTEX;
-			if (R_CheckTextureNumForName(msd[li->sidenum[1]].midtexture) != -1
-				&& si->midtexture != R_TextureNumForName(msd[li->sidenum[1]].midtexture))
-				diff2 |= LD_S2MIDTEX;
-			if (diff2)
-				diff |= LD_DIFF2;
-		}
+			diff = diff2 = 0;
 
-		if (diff)
-		{
-			statline++;
-			WRITEINT16(put, i);
-			WRITEUINT8(put, diff);
-			if (diff & LD_DIFF2)
-				WRITEUINT8(put, diff2);
-			if (diff & LD_FLAG)
-				WRITEINT16(put, li->flags);
-			if (diff & LD_SPECIAL)
-				WRITEINT16(put, li->special);
-			if (diff & LD_CLLCOUNT)
-				WRITEINT16(put, li->callcount);
+			if (li->special != SHORT(mld->special))
+				diff |= LD_SPECIAL;
 
-			si = &sides[li->sidenum[0]];
-			if (diff & LD_S1TEXOFF)
-				WRITEFIXED(put, si->textureoffset);
-			if (diff & LD_S1TOPTEX)
-				WRITEINT32(put, si->toptexture);
-			if (diff & LD_S1BOTTEX)
-				WRITEINT32(put, si->bottomtexture);
-			if (diff & LD_S1MIDTEX)
-				WRITEINT32(put, si->midtexture);
+			if (SHORT(mld->special) == 321 || SHORT(mld->special) == 322) // only reason li->callcount would be non-zero is if either of these are involved
+				diff |= LD_CLLCOUNT;
 
-			si = &sides[li->sidenum[1]];
-			if (diff2 & LD_S2TEXOFF)
-				WRITEFIXED(put, si->textureoffset);
-			if (diff2 & LD_S2TOPTEX)
-				WRITEINT32(put, si->toptexture);
-			if (diff2 & LD_S2BOTTEX)
-				WRITEINT32(put, si->bottomtexture);
-			if (diff2 & LD_S2MIDTEX)
-				WRITEINT32(put, si->midtexture);
+			if (li->sidenum[0] != 0xffff)
+			{
+				si = &sides[li->sidenum[0]];
+				if (si->textureoffset != SHORT(msd[li->sidenum[0]].textureoffset)<<FRACBITS)
+					diff |= LD_S1TEXOFF;
+				//SoM: 4/1/2000: Some textures are colormaps. Don't worry about invalid textures.
+				if (R_CheckTextureNumForName(msd[li->sidenum[0]].toptexture) != -1
+						&& si->toptexture != R_TextureNumForName(msd[li->sidenum[0]].toptexture))
+					diff |= LD_S1TOPTEX;
+				if (R_CheckTextureNumForName(msd[li->sidenum[0]].bottomtexture) != -1
+						&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[0]].bottomtexture))
+					diff |= LD_S1BOTTEX;
+				if (R_CheckTextureNumForName(msd[li->sidenum[0]].midtexture) != -1
+						&& si->midtexture != R_TextureNumForName(msd[li->sidenum[0]].midtexture))
+					diff |= LD_S1MIDTEX;
+			}
+			if (li->sidenum[1] != 0xffff)
+			{
+				si = &sides[li->sidenum[1]];
+				if (si->textureoffset != SHORT(msd[li->sidenum[1]].textureoffset)<<FRACBITS)
+					diff2 |= LD_S2TEXOFF;
+				if (R_CheckTextureNumForName(msd[li->sidenum[1]].toptexture) != -1
+						&& si->toptexture != R_TextureNumForName(msd[li->sidenum[1]].toptexture))
+					diff2 |= LD_S2TOPTEX;
+				if (R_CheckTextureNumForName(msd[li->sidenum[1]].bottomtexture) != -1
+						&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[1]].bottomtexture))
+					diff2 |= LD_S2BOTTEX;
+				if (R_CheckTextureNumForName(msd[li->sidenum[1]].midtexture) != -1
+						&& si->midtexture != R_TextureNumForName(msd[li->sidenum[1]].midtexture))
+					diff2 |= LD_S2MIDTEX;
+				if (diff2)
+					diff |= LD_DIFF2;
+			}
+
+			if (diff)
+			{
+				statline++;
+				WRITEINT16(put, i);
+				WRITEUINT8(put, diff);
+				if (diff & LD_DIFF2)
+					WRITEUINT8(put, diff2);
+				if (diff & LD_FLAG)
+					WRITEINT16(put, li->flags);
+				if (diff & LD_SPECIAL)
+					WRITEINT16(put, li->special);
+				if (diff & LD_CLLCOUNT)
+					WRITEINT16(put, li->callcount);
+
+				si = &sides[li->sidenum[0]];
+				if (diff & LD_S1TEXOFF)
+					WRITEFIXED(put, si->textureoffset);
+				if (diff & LD_S1TOPTEX)
+					WRITEINT32(put, si->toptexture);
+				if (diff & LD_S1BOTTEX)
+					WRITEINT32(put, si->bottomtexture);
+				if (diff & LD_S1MIDTEX)
+					WRITEINT32(put, si->midtexture);
+
+				si = &sides[li->sidenum[1]];
+				if (diff2 & LD_S2TEXOFF)
+					WRITEFIXED(put, si->textureoffset);
+				if (diff2 & LD_S2TOPTEX)
+					WRITEINT32(put, si->toptexture);
+				if (diff2 & LD_S2BOTTEX)
+					WRITEINT32(put, si->bottomtexture);
+				if (diff2 & LD_S2MIDTEX)
+					WRITEINT32(put, si->midtexture);
+			}
 		}
 	}
 	WRITEUINT16(put, 0xffff);

From 9ec6d5e653e38b49798144b7a394aaf7b4f4548a Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 13 May 2019 00:20:39 -0400
Subject: [PATCH 32/33] Revert "Check that lumps are okay"

This reverts commit 3f4121085be4aa694bc0ab87feb20e8aff938e11.
---
 src/p_saveg.c | 149 +++++++++++++++++++++++++-------------------------
 1 file changed, 73 insertions(+), 76 deletions(-)

diff --git a/src/p_saveg.c b/src/p_saveg.c
index 13117f07c..12ee1345b 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -649,87 +649,84 @@ static void P_NetArchiveWorld(void)
 
 	mld = W_CacheLumpNum(lastloadedmaplumpnum+ML_LINEDEFS, PU_CACHE);
 	msd = W_CacheLumpNum(lastloadedmaplumpnum+ML_SIDEDEFS, PU_CACHE);
-	if (mld && msd)
+	// do lines
+	for (i = 0; i < numlines; i++, mld++, li++)
 	{
-		// do lines
-		for (i = 0; i < numlines; i++, mld++, li++)
+		diff = diff2 = 0;
+
+		if (li->special != SHORT(mld->special))
+			diff |= LD_SPECIAL;
+
+		if (SHORT(mld->special) == 321 || SHORT(mld->special) == 322) // only reason li->callcount would be non-zero is if either of these are involved
+			diff |= LD_CLLCOUNT;
+
+		if (li->sidenum[0] != 0xffff)
 		{
-			diff = diff2 = 0;
+			si = &sides[li->sidenum[0]];
+			if (si->textureoffset != SHORT(msd[li->sidenum[0]].textureoffset)<<FRACBITS)
+				diff |= LD_S1TEXOFF;
+			//SoM: 4/1/2000: Some textures are colormaps. Don't worry about invalid textures.
+			if (R_CheckTextureNumForName(msd[li->sidenum[0]].toptexture) != -1
+				&& si->toptexture != R_TextureNumForName(msd[li->sidenum[0]].toptexture))
+				diff |= LD_S1TOPTEX;
+			if (R_CheckTextureNumForName(msd[li->sidenum[0]].bottomtexture) != -1
+				&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[0]].bottomtexture))
+				diff |= LD_S1BOTTEX;
+			if (R_CheckTextureNumForName(msd[li->sidenum[0]].midtexture) != -1
+				&& si->midtexture != R_TextureNumForName(msd[li->sidenum[0]].midtexture))
+				diff |= LD_S1MIDTEX;
+		}
+		if (li->sidenum[1] != 0xffff)
+		{
+			si = &sides[li->sidenum[1]];
+			if (si->textureoffset != SHORT(msd[li->sidenum[1]].textureoffset)<<FRACBITS)
+				diff2 |= LD_S2TEXOFF;
+			if (R_CheckTextureNumForName(msd[li->sidenum[1]].toptexture) != -1
+				&& si->toptexture != R_TextureNumForName(msd[li->sidenum[1]].toptexture))
+				diff2 |= LD_S2TOPTEX;
+			if (R_CheckTextureNumForName(msd[li->sidenum[1]].bottomtexture) != -1
+				&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[1]].bottomtexture))
+				diff2 |= LD_S2BOTTEX;
+			if (R_CheckTextureNumForName(msd[li->sidenum[1]].midtexture) != -1
+				&& si->midtexture != R_TextureNumForName(msd[li->sidenum[1]].midtexture))
+				diff2 |= LD_S2MIDTEX;
+			if (diff2)
+				diff |= LD_DIFF2;
+		}
 
-			if (li->special != SHORT(mld->special))
-				diff |= LD_SPECIAL;
+		if (diff)
+		{
+			statline++;
+			WRITEINT16(put, i);
+			WRITEUINT8(put, diff);
+			if (diff & LD_DIFF2)
+				WRITEUINT8(put, diff2);
+			if (diff & LD_FLAG)
+				WRITEINT16(put, li->flags);
+			if (diff & LD_SPECIAL)
+				WRITEINT16(put, li->special);
+			if (diff & LD_CLLCOUNT)
+				WRITEINT16(put, li->callcount);
 
-			if (SHORT(mld->special) == 321 || SHORT(mld->special) == 322) // only reason li->callcount would be non-zero is if either of these are involved
-				diff |= LD_CLLCOUNT;
+			si = &sides[li->sidenum[0]];
+			if (diff & LD_S1TEXOFF)
+				WRITEFIXED(put, si->textureoffset);
+			if (diff & LD_S1TOPTEX)
+				WRITEINT32(put, si->toptexture);
+			if (diff & LD_S1BOTTEX)
+				WRITEINT32(put, si->bottomtexture);
+			if (diff & LD_S1MIDTEX)
+				WRITEINT32(put, si->midtexture);
 
-			if (li->sidenum[0] != 0xffff)
-			{
-				si = &sides[li->sidenum[0]];
-				if (si->textureoffset != SHORT(msd[li->sidenum[0]].textureoffset)<<FRACBITS)
-					diff |= LD_S1TEXOFF;
-				//SoM: 4/1/2000: Some textures are colormaps. Don't worry about invalid textures.
-				if (R_CheckTextureNumForName(msd[li->sidenum[0]].toptexture) != -1
-						&& si->toptexture != R_TextureNumForName(msd[li->sidenum[0]].toptexture))
-					diff |= LD_S1TOPTEX;
-				if (R_CheckTextureNumForName(msd[li->sidenum[0]].bottomtexture) != -1
-						&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[0]].bottomtexture))
-					diff |= LD_S1BOTTEX;
-				if (R_CheckTextureNumForName(msd[li->sidenum[0]].midtexture) != -1
-						&& si->midtexture != R_TextureNumForName(msd[li->sidenum[0]].midtexture))
-					diff |= LD_S1MIDTEX;
-			}
-			if (li->sidenum[1] != 0xffff)
-			{
-				si = &sides[li->sidenum[1]];
-				if (si->textureoffset != SHORT(msd[li->sidenum[1]].textureoffset)<<FRACBITS)
-					diff2 |= LD_S2TEXOFF;
-				if (R_CheckTextureNumForName(msd[li->sidenum[1]].toptexture) != -1
-						&& si->toptexture != R_TextureNumForName(msd[li->sidenum[1]].toptexture))
-					diff2 |= LD_S2TOPTEX;
-				if (R_CheckTextureNumForName(msd[li->sidenum[1]].bottomtexture) != -1
-						&& si->bottomtexture != R_TextureNumForName(msd[li->sidenum[1]].bottomtexture))
-					diff2 |= LD_S2BOTTEX;
-				if (R_CheckTextureNumForName(msd[li->sidenum[1]].midtexture) != -1
-						&& si->midtexture != R_TextureNumForName(msd[li->sidenum[1]].midtexture))
-					diff2 |= LD_S2MIDTEX;
-				if (diff2)
-					diff |= LD_DIFF2;
-			}
-
-			if (diff)
-			{
-				statline++;
-				WRITEINT16(put, i);
-				WRITEUINT8(put, diff);
-				if (diff & LD_DIFF2)
-					WRITEUINT8(put, diff2);
-				if (diff & LD_FLAG)
-					WRITEINT16(put, li->flags);
-				if (diff & LD_SPECIAL)
-					WRITEINT16(put, li->special);
-				if (diff & LD_CLLCOUNT)
-					WRITEINT16(put, li->callcount);
-
-				si = &sides[li->sidenum[0]];
-				if (diff & LD_S1TEXOFF)
-					WRITEFIXED(put, si->textureoffset);
-				if (diff & LD_S1TOPTEX)
-					WRITEINT32(put, si->toptexture);
-				if (diff & LD_S1BOTTEX)
-					WRITEINT32(put, si->bottomtexture);
-				if (diff & LD_S1MIDTEX)
-					WRITEINT32(put, si->midtexture);
-
-				si = &sides[li->sidenum[1]];
-				if (diff2 & LD_S2TEXOFF)
-					WRITEFIXED(put, si->textureoffset);
-				if (diff2 & LD_S2TOPTEX)
-					WRITEINT32(put, si->toptexture);
-				if (diff2 & LD_S2BOTTEX)
-					WRITEINT32(put, si->bottomtexture);
-				if (diff2 & LD_S2MIDTEX)
-					WRITEINT32(put, si->midtexture);
-			}
+			si = &sides[li->sidenum[1]];
+			if (diff2 & LD_S2TEXOFF)
+				WRITEFIXED(put, si->textureoffset);
+			if (diff2 & LD_S2TOPTEX)
+				WRITEINT32(put, si->toptexture);
+			if (diff2 & LD_S2BOTTEX)
+				WRITEINT32(put, si->bottomtexture);
+			if (diff2 & LD_S2MIDTEX)
+				WRITEINT32(put, si->midtexture);
 		}
 	}
 	WRITEUINT16(put, 0xffff);

From 0f616a71412ddb03f9b8ea36b91546fde9861c85 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 13 May 2019 00:23:43 -0400
Subject: [PATCH 33/33] Properly fix crash due to duplicated lines.

---
 src/p_saveg.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/p_saveg.c b/src/p_saveg.c
index 12ee1345b..fce72b927 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -647,8 +647,6 @@ static void P_NetArchiveWorld(void)
 
 	WRITEUINT16(put, 0xffff);
 
-	mld = W_CacheLumpNum(lastloadedmaplumpnum+ML_LINEDEFS, PU_CACHE);
-	msd = W_CacheLumpNum(lastloadedmaplumpnum+ML_SIDEDEFS, PU_CACHE);
 	// do lines
 	for (i = 0; i < numlines; i++, mld++, li++)
 	{