From 67102cc8291f85476919e5ec310d18b80d397689 Mon Sep 17 00:00:00 2001
From: PrisimaTheFox <prisimathefox@gmail.com>
Date: Sun, 9 Sep 2018 23:16:28 -0500
Subject: [PATCH 01/34] Update m_anigif.c

More accurate GIF delay.
---
 src/m_anigif.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index 2540665ad..5c7cfbd68 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -492,7 +492,9 @@ static void GIF_framewrite(void)
 
 	// screen regions are handled in GIF_lzw
 	{
-		UINT16 delay = 3; // todo
+		int d1 = (int)((100.0/NEWTICRATE)*gif_frames);
+		int d2 = (int)((100.0/NEWTICRATE)*(gif_frames-1));
+		UINT16 delay = d1-d2;
 		INT32 startline;
 
 		WRITEMEM(p, gifframe_gchead, 4);

From a6e3b3eb1682e32cceaa21a10ae654ffcbaefe76 Mon Sep 17 00:00:00 2001
From: PrisimaTheFox <prisimathefox@gmail.com>
Date: Sun, 9 Sep 2018 23:33:51 -0500
Subject: [PATCH 02/34] Update m_anigif.c

Remember gif_frames starts at 0
---
 src/m_anigif.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/m_anigif.c b/src/m_anigif.c
index 5c7cfbd68..d46d889bb 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -492,8 +492,8 @@ static void GIF_framewrite(void)
 
 	// screen regions are handled in GIF_lzw
 	{
-		int d1 = (int)((100.0/NEWTICRATE)*gif_frames);
-		int d2 = (int)((100.0/NEWTICRATE)*(gif_frames-1));
+		int d1 = (int)((100.0/NEWTICRATE)*gif_frames+1);
+		int d2 = (int)((100.0/NEWTICRATE)*(gif_frames));
 		UINT16 delay = d1-d2;
 		INT32 startline;
 

From 9481e7d3585949bbd000d559f75af261d86d11e9 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sun, 16 Sep 2018 20:25:07 +0100
Subject: [PATCH 03/34] Fix order of operations messups by adding brackets

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

diff --git a/src/m_anigif.c b/src/m_anigif.c
index d46d889bb..e2af70095 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -492,7 +492,7 @@ static void GIF_framewrite(void)
 
 	// screen regions are handled in GIF_lzw
 	{
-		int d1 = (int)((100.0/NEWTICRATE)*gif_frames+1);
+		int d1 = (int)((100.0/NEWTICRATE)*(gif_frames+1));
 		int d2 = (int)((100.0/NEWTICRATE)*(gif_frames));
 		UINT16 delay = d1-d2;
 		INT32 startline;

From 13a3f197bd305cba08a679f5abfedd0c5aa22c03 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 20 Sep 2018 18:26:59 -0400
Subject: [PATCH 04/34] Use MemAvailable instead

---
 src/sdl/i_system.c | 49 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index e86a39cab..984f6dd22 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -124,6 +124,10 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #include "macosx/mac_resources.h"
 #endif
 
+#ifndef errno
+#include <errno.h>
+#endif
+
 // Locations for searching the srb2.srb
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
 #define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
@@ -2712,9 +2716,31 @@ const char *I_LocateWad(void)
 #ifdef __linux__
 #define MEMINFO_FILE "/proc/meminfo"
 #define MEMTOTAL "MemTotal:"
+#define MEMAVAILABLE "MemAvailable:"
 #define MEMFREE "MemFree:"
+#define CACHED "Cached:"
+#define BUFFERS "Buffers:"
+#define SHMEM "Shmem:"
 #endif
 
+/* Parse the contents of /proc/meminfo (in buf), return value of "name"
+ * (example: MemTotal) */
+static long get_entry(const char* name, const char* buf)
+{
+    char* hit = strstr(buf, name);
+    if (hit == NULL) {
+        return -1;
+    }
+
+    errno = 0;
+    long val = strtol(hit + strlen(name), NULL, 10);
+    if (errno != 0) {
+        CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
+        return -1;
+    }
+    return val;
+}
+
 // quick fix for compil
 UINT32 I_GetFreeMem(UINT32 *total)
 {
@@ -2809,7 +2835,17 @@ UINT32 I_GetFreeMem(UINT32 *total)
 	memTag += sizeof (MEMTOTAL);
 	totalKBytes = atoi(memTag);
 
-	if ((memTag = strstr(buf, MEMFREE)) == NULL)
+	if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
+	{
+		Cached = get_entry(CACHED, buf);
+		MemFree = get_entry(MEMFREE, buf);
+		Buffers = get_entry(BUFFERS, buf);
+		Shmem = get_entry(SHMEM, buf);
+		MemAvailable = Cached + MemFree + Buffers - Shmem;
+		guessed = true;
+	}
+
+	if (MemAvailable == -1 && guessed)
 	{
 		// Error
 		if (total)
@@ -2817,8 +2853,15 @@ UINT32 I_GetFreeMem(UINT32 *total)
 		return 0;
 	}
 
-	memTag += sizeof (MEMFREE);
-	freeKBytes = atoi(memTag);
+	if (guessed)
+	{
+		freeKBytes = MemAvailable;
+	}
+	else
+	{
+		memTag += sizeof (MEMAVAILABLE);
+		freeKBytes = atoi(memTag);
+	}
 
 	if (total)
 		*total = totalKBytes << 10;

From 43cbb0d11ecb6c865c4e21f68d268a49eb1c0aa3 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 20 Sep 2018 18:33:50 -0400
Subject: [PATCH 05/34] Add some stuff

---
 src/sdl/i_system.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 984f6dd22..3610a534d 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2810,6 +2810,12 @@ UINT32 I_GetFreeMem(UINT32 *total)
 	UINT32 totalKBytes;
 	INT32 n;
 	INT32 meminfo_fd = -1;
+	long Cached;
+	long MemFree;
+	long Buffers;
+	long Shmem;
+	long MemAvailable = -1;
+	boolean guessed = false; // Stupid way to verify if the amount was guessed or not.
 
 	meminfo_fd = open(MEMINFO_FILE, O_RDONLY);
 	n = read(meminfo_fd, buf, 1023);

From ac8658fac83b030df7776d526d0fca3824dd3f95 Mon Sep 17 00:00:00 2001
From: Steel <steeltitanium1@gmail.com>
Date: Fri, 21 Sep 2018 07:16:54 -0400
Subject: [PATCH 06/34] Fix up errors with buildbots

---
 src/sdl/i_system.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 3610a534d..e9e1ae92d 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1,6 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
-//
+- //
 // Copyright (C) 1993-1996 by id Software, Inc.
 // Portions Copyright (C) 1998-2000 by DooM Legacy Team.
 //
@@ -2095,7 +2095,6 @@ INT32 I_StartupSystem(void)
 	return 0;
 }
 
-
 //
 // I_Quit
 //
@@ -2721,25 +2720,26 @@ const char *I_LocateWad(void)
 #define CACHED "Cached:"
 #define BUFFERS "Buffers:"
 #define SHMEM "Shmem:"
-#endif
 
 /* Parse the contents of /proc/meminfo (in buf), return value of "name"
  * (example: MemTotal) */
 static long get_entry(const char* name, const char* buf)
 {
+    long val;
     char* hit = strstr(buf, name);
     if (hit == NULL) {
         return -1;
     }
 
     errno = 0;
-    long val = strtol(hit + strlen(name), NULL, 10);
+    val = strtol(hit + strlen(name), NULL, 10);
     if (errno != 0) {
         CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
         return -1;
     }
     return val;
 }
+#endif
 
 // quick fix for compil
 UINT32 I_GetFreeMem(UINT32 *total)

From 502414d60930ce3ecabe704fbfcf01e3fbc200f4 Mon Sep 17 00:00:00 2001
From: Steel <steeltitanium1@gmail.com>
Date: Fri, 21 Sep 2018 07:21:49 -0400
Subject: [PATCH 07/34] Remove this that somehow slipped in.

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

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index e9e1ae92d..b7326b066 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1,6 +1,6 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
-- //
+//
 // Copyright (C) 1993-1996 by id Software, Inc.
 // Portions Copyright (C) 1998-2000 by DooM Legacy Team.
 //

From 7f7c5b60ae19c494419953ac702db8641fcccf5c Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Fri, 21 Sep 2018 11:26:08 -0400
Subject: [PATCH 08/34] Rearrange the code. Thanks again MonsterIestyn!

---
 src/sdl/i_system.c | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index b7326b066..05d9e092f 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2815,7 +2815,6 @@ UINT32 I_GetFreeMem(UINT32 *total)
 	long Buffers;
 	long Shmem;
 	long MemAvailable = -1;
-	boolean guessed = false; // Stupid way to verify if the amount was guessed or not.
 
 	meminfo_fd = open(MEMINFO_FILE, O_RDONLY);
 	n = read(meminfo_fd, buf, 1023);
@@ -2848,26 +2847,21 @@ UINT32 I_GetFreeMem(UINT32 *total)
 		Buffers = get_entry(BUFFERS, buf);
 		Shmem = get_entry(SHMEM, buf);
 		MemAvailable = Cached + MemFree + Buffers - Shmem;
-		guessed = true;
-	}
 
-	if (MemAvailable == -1 && guessed)
-	{
-		// Error
-		if (total)
-			*total = 0L;
-		return 0;
-	}
-
-	if (guessed)
-	{
+		if (MemAvailable == -1)
+		{
+            // Error
+			if (total)
+				*total = 0L;
+			return 0;
+		}
 		freeKBytes = MemAvailable;
-	}
-	else
-	{
+    }
+    else
+    {
 		memTag += sizeof (MEMAVAILABLE);
 		freeKBytes = atoi(memTag);
-	}
+    }
 
 	if (total)
 		*total = totalKBytes << 10;

From 5efb94a35bd169bcce2bf571bfe538ec589d7cbb Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Fri, 21 Sep 2018 12:05:52 -0400
Subject: [PATCH 09/34] Fix the weird indentation

---
 src/sdl/i_system.c | 76 +++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 05d9e092f..f92cd4b6e 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1683,7 +1683,7 @@ static void I_ShutdownMouse2(void)
 	EscapeCommFunction(mouse2filehandle, CLRRTS);
 
 	PurgeComm(mouse2filehandle, PURGE_TXABORT | PURGE_RXABORT |
-	          PURGE_TXCLEAR | PURGE_RXCLEAR);
+			  PURGE_TXCLEAR | PURGE_RXCLEAR);
 
 	CloseHandle(mouse2filehandle);
 
@@ -1876,11 +1876,11 @@ void I_StartupMouse2(void)
 	{
 		// COM file handle
 		mouse2filehandle = CreateFileA(cv_mouse2port.string, GENERIC_READ | GENERIC_WRITE,
-		                               0,                     // exclusive access
-		                               NULL,                  // no security attrs
-		                               OPEN_EXISTING,
-		                               FILE_ATTRIBUTE_NORMAL,
-		                               NULL);
+									   0,                     // exclusive access
+									   NULL,                  // no security attrs
+									   OPEN_EXISTING,
+									   FILE_ATTRIBUTE_NORMAL,
+									   NULL);
 		if (mouse2filehandle == INVALID_HANDLE_VALUE)
 		{
 			INT32 e = GetLastError();
@@ -1900,7 +1900,7 @@ void I_StartupMouse2(void)
 
 	// purge buffers
 	PurgeComm(mouse2filehandle, PURGE_TXABORT | PURGE_RXABORT
-	          | PURGE_TXCLEAR | PURGE_RXCLEAR);
+			  | PURGE_TXCLEAR | PURGE_RXCLEAR);
 
 	// setup port to 1200 7N1
 	dcb.DCBlength = sizeof (DCB);
@@ -2029,7 +2029,7 @@ static void I_ShutdownTimer(void)
 tic_t I_GetTime (void)
 {
 	static Uint32 basetime = 0;
-	       Uint32 ticks = SDL_GetTicks();
+		   Uint32 ticks = SDL_GetTicks();
 
 	if (!basetime)
 		basetime = ticks;
@@ -2373,7 +2373,7 @@ void I_GetDiskFreeSpace(INT64 *freespace)
 	{
 		DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters;
 		GetDiskFreeSpace(NULL, &SectorsPerCluster, &BytesPerSector,
-		                 &NumberOfFreeClusters, &TotalNumberOfClusters);
+						 &NumberOfFreeClusters, &TotalNumberOfClusters);
 		*freespace = BytesPerSector*SectorsPerCluster*NumberOfFreeClusters;
 	}
 #else // Dummy for platform independent; 1GB should be enough
@@ -2595,22 +2595,22 @@ static const char *locateWad(void)
 
 #ifdef CMAKECONFIG
 #ifndef NDEBUG
-    I_OutputMsg(","CMAKE_ASSETS_DIR);
-    strcpy(returnWadPath, CMAKE_ASSETS_DIR);
-    if (isWadPathOk(returnWadPath))
-    {
-        return returnWadPath;
-    }
+	I_OutputMsg(","CMAKE_ASSETS_DIR);
+	strcpy(returnWadPath, CMAKE_ASSETS_DIR);
+	if (isWadPathOk(returnWadPath))
+	{
+		return returnWadPath;
+	}
 #endif
 #endif
 
 #ifdef __APPLE__
-    OSX_GetResourcesPath(returnWadPath);
-    I_OutputMsg(",%s", returnWadPath);
-    if (isWadPathOk(returnWadPath))
-    {
-        return returnWadPath;
-    }
+	OSX_GetResourcesPath(returnWadPath);
+	I_OutputMsg(",%s", returnWadPath);
+	if (isWadPathOk(returnWadPath))
+	{
+		return returnWadPath;
+	}
 #endif
 
 	// examine default dirs
@@ -2725,19 +2725,19 @@ const char *I_LocateWad(void)
  * (example: MemTotal) */
 static long get_entry(const char* name, const char* buf)
 {
-    long val;
-    char* hit = strstr(buf, name);
-    if (hit == NULL) {
-        return -1;
-    }
+	long val;
+	char* hit = strstr(buf, name);
+	if (hit == NULL) {
+		return -1;
+	}
 
-    errno = 0;
-    val = strtol(hit + strlen(name), NULL, 10);
-    if (errno != 0) {
-        CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
-        return -1;
-    }
-    return val;
+	errno = 0;
+	val = strtol(hit + strlen(name), NULL, 10);
+	if (errno != 0) {
+		CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
+		return -1;
+	}
+	return val;
 }
 #endif
 
@@ -2850,18 +2850,18 @@ UINT32 I_GetFreeMem(UINT32 *total)
 
 		if (MemAvailable == -1)
 		{
-            // Error
+			// Error
 			if (total)
 				*total = 0L;
 			return 0;
 		}
 		freeKBytes = MemAvailable;
-    }
-    else
-    {
+	}
+	else
+	{
 		memTag += sizeof (MEMAVAILABLE);
 		freeKBytes = atoi(memTag);
-    }
+	}
 
 	if (total)
 		*total = totalKBytes << 10;

From 2eb9bebcd91e702b56d022de2b09ec0aad4d2a58 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 4 Oct 2018 19:47:19 -0400
Subject: [PATCH 10/34] Split zlib and libpng

---
 src/Makefile          | 22 +++++++++++++++-------
 src/sdl/mixer_sound.c | 17 ++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index dd250b0bc..7a67c3f02 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -66,6 +66,7 @@
 #     Compile without 3D sound support, add 'NOHS=1'
 #     Compile with GDBstubs, add 'RDB=1'
 #     Compile without PNG, add 'NOPNG=1'
+#     Compile without zlib, add 'NOZLIB=1'
 #
 # Addon for SDL:
 #     To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config'
@@ -119,6 +120,7 @@ include Makefile.cfg
 
 ifdef DUMMY
 NOPNG=1
+NOZLIB=1
 NONET=1
 NOHW=1
 NOHS=1
@@ -199,6 +201,7 @@ endif
 
 ifdef NDS
 NOPNG=1
+NOZLIB=1
 NONET=1
 #NOHW=1
 NOHS=1
@@ -325,13 +328,6 @@ LIBS+=$(PNG_LDFLAGS)
 CFLAGS+=$(PNG_CFLAGS)
 endif
 
-ZLIB_PKGCONFIG?=zlib
-ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
-ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
-
-LIBS+=$(ZLIB_LDFLAGS)
-CFLAGS+=$(ZLIB_CFLAGS)
-
 ifdef HAVE_LIBGME
 OPTS+=-DHAVE_LIBGME
 
@@ -343,6 +339,18 @@ LIBS+=$(LIBGME_LDFLAGS)
 CFLAGS+=$(LIBGME_CFLAGS)
 endif
 
+ifndef NOZLIB
+OPTS+=-DHAVE_ZLIB
+ZLIB_PKGCONFIG?=zlib
+ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
+ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
+
+LIBS+=$(ZLIB_LDFLAGS)
+CFLAGS+=$(ZLIB_CFLAGS)
+else
+NOPNG=1
+endif
+
 ifdef STATIC
 LIBS:=-static $(LIBS)
 endif
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 5211efe0a..362d7f264 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -38,9 +38,6 @@
 #include "gme/gme.h"
 #define GME_TREBLE 5.0
 #define GME_BASS 1.0
-#ifdef HAVE_PNG /// TODO: compile with zlib support without libpng
-
-#define HAVE_ZLIB
 
 #ifndef _MSC_VER
 #ifndef _LARGEFILE64_SOURCE
@@ -56,10 +53,13 @@
 #define _FILE_OFFSET_BITS 0
 #endif
 
-#include "zlib.h"
 #endif
 #endif
 
+#ifdef HAVE_ZLIB
+#include "zlib.h"
+#endif
+
 UINT8 sound_started = false;
 
 static boolean midimode;
@@ -361,7 +361,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
 		}
 		Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
 #else
-		//CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
+		return NULL; // No zlib support
 #endif
 	}
 	// Try to read it as a GME sound
@@ -621,7 +621,8 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
 		}
 		Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
 #else
-		//CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
+		CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
+		return true;
 #endif
 	}
 	else if (!gme_open_data(data, len, &gme, 44100))
@@ -840,6 +841,4 @@ void I_UnRegisterSong(INT32 handle)
 	(void)handle;
 	Mix_FreeMusic(music);
 	music = NULL;
-}
-
-#endif
+}
\ No newline at end of file

From 1656b77bc0c99489acaf2de6146eb09bd8eb861c Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 4 Oct 2018 22:38:59 -0400
Subject: [PATCH 11/34] Restore deleted endif

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

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 362d7f264..d1083518a 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -51,8 +51,6 @@
 
 #ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 0
-#endif
-
 #endif
 #endif
 
@@ -841,4 +839,6 @@ void I_UnRegisterSong(INT32 handle)
 	(void)handle;
 	Mix_FreeMusic(music);
 	music = NULL;
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file

From 8368647b29d1e974a5998809e0b9f6fcbd3472ce Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 4 Oct 2018 22:44:26 -0400
Subject: [PATCH 12/34] Fix DD compiling

---
 src/win32/win_snd.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index f168f1fe3..c030eec5c 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -17,9 +17,6 @@
 #include "gme/gme.h"
 #define GME_TREBLE 5.0
 #define GME_BASS 1.0
-#ifdef HAVE_PNG /// TODO: compile with zlib support without libpng
-
-#define HAVE_ZLIB
 
 #ifndef _MSC_VER
 #ifndef _WII

From 413d5e46c64bf3a1157900fb3abea17d25f5bf64 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 4 Oct 2018 22:56:11 -0400
Subject: [PATCH 13/34] Really fix DD compiling this time.

---
 src/win32/win_snd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index c030eec5c..bc04bd6df 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -34,6 +34,7 @@
 #define _FILE_OFFSET_BITS 0
 #endif
 
+#ifdef HAVE_ZLIB
 #include "zlib.h"
 #endif
 #endif

From 951b4d158230aa1784e1fdcc7c745482b77fd161 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Fri, 5 Oct 2018 22:42:36 +0100
Subject: [PATCH 14/34] Draw a star for continues if invalid skin numbers are
 somehow supplied

---
 src/v_video.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/v_video.c b/src/v_video.c
index aa2852c01..802a4d388 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -653,14 +653,10 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 //
 void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor)
 {
-	if (skins[skinnum].flags & SF_HIRES
-#ifdef HWRENDER
-//	|| (rendermode != render_soft && rendermode != render_none)
-#endif
-	)
-		V_DrawScaledPatch(x - 10, y - 14, flags, W_CachePatchName("CONTINS", PU_CACHE));
+	if (skinnum < 0 || skinnum >= numskins || (skins[skinnum].flags & SF_HIRES))
+		V_DrawScaledPatch(x - 10, y - 14, flags, W_CachePatchName("CONTINS", PU_CACHE)); // Draw a star
 	else
-	{
+	{ // Find front angle of the first waiting frame of the character's actual sprites
 		spriteframe_t *sprframe = &skins[skinnum].spritedef.spriteframes[2 & FF_FRAMEMASK];
 		patch_t *patch = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
 		const UINT8 *colormap = R_GetTranslationColormap(skinnum, skincolor, GTC_CACHE);

From 052df3265e930e8bee608efe41e5c52aec776028 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sat, 6 Oct 2018 21:44:40 +0100
Subject: [PATCH 15/34] Call SDL_RWclose after an SDL_RWFromMem call to close
 the RWops.

---
 src/sdl/mixer_sound.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 5211efe0a..e835a55ce 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -387,7 +387,15 @@ void *I_GetSfx(sfxinfo_t *sfx)
 #endif
 
 	// Try to load it as a WAVE or OGG using Mixer.
-	return Mix_LoadWAV_RW(SDL_RWFromMem(lump, sfx->length), 1);
+	SDL_RWops *rw = SDL_RWFromMem(lump, sfx->length);
+	if (rw != NULL)
+	{
+		Mix_Chunk *chunk = Mix_LoadWAV_RW(rw, 1);
+		SDL_RWclose(rw);
+		return chunk;
+	}
+
+	return NULL; // haven't been able to get anything
 }
 
 void I_FreeSfx(sfxinfo_t *sfx)
@@ -635,7 +643,12 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
 	}
 #endif
 
-	music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE);
+	SDL_RWops *rw = SDL_RWFromMem(data, len);
+	if (rw != NULL)
+	{
+		music = Mix_LoadMUS_RW(rw, SDL_FALSE);
+		SDL_RWclose(rw);
+	}
 	if (!music)
 	{
 		CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
@@ -798,7 +811,12 @@ void I_SetMIDIMusicVolume(UINT8 volume)
 
 INT32 I_RegisterSong(void *data, size_t len)
 {
-	music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE);
+	SDL_RWops *rw = SDL_RWFromMem(data, len);
+	if (rw != NULL)
+	{
+		music = Mix_LoadMUS_RW(rw, SDL_FALSE);
+		SDL_RWclose(rw);
+	}
 	if (!music)
 	{
 		CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());

From 224b228089b6304539c4f26c29fed583035cff60 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sat, 6 Oct 2018 23:59:39 +0100
Subject: [PATCH 16/34] Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that
 Mix_FreeChunk doesn't actually Free the sound. Checks for the flag when
 freeing, and if it's 0, we free the data manually after Mix_FreeChunk. I went
 back to Z_Malloc and Z_Free for this because they still work after this.

---
 src/sdl/mixer_sound.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index e835a55ce..15f1595ce 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -178,7 +178,7 @@ static Mix_Chunk *ds2chunk(void *stream)
 			return NULL; // would and/or did wrap, can't store.
 		break;
 	}
-	sound = malloc(newsamples<<2); // samples * frequency shift * bytes per sample * channels
+	sound = Z_Malloc(newsamples<<2, PU_SOUND, 0); // samples * frequency shift * bytes per sample * channels
 
 	s = (SINT8 *)stream;
 	d = (INT16 *)sound;
@@ -401,7 +401,22 @@ void *I_GetSfx(sfxinfo_t *sfx)
 void I_FreeSfx(sfxinfo_t *sfx)
 {
 	if (sfx->data)
+	{
+		Mix_Chunk *chunk = (Mix_Chunk*)sfx->data;
+		UINT8 *abufdata = NULL;
+		if (chunk->allocated == 0)
+		{
+			// We allocated the data in this chunk, so get the abuf from mixer, then let it free the chunk, THEN we free the data
+			// I believe this should ensure the sound is not playing when we free it
+			abufdata = chunk->abuf;
+		}
 		Mix_FreeChunk(sfx->data);
+		if (abufdata)
+		{
+			// I'm going to assume we used Z_Malloc to allocate this data.
+			Z_Free(abufdata);
+		}
+	}
 	sfx->data = NULL;
 	sfx->lumpnum = LUMPERROR;
 }

From d7f373a42d60852f309bcaaed149051521440b44 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sun, 7 Oct 2018 00:22:23 +0100
Subject: [PATCH 17/34] I think that should be NULL, not 0 actually.

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

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 15f1595ce..9fef16460 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -178,7 +178,7 @@ static Mix_Chunk *ds2chunk(void *stream)
 			return NULL; // would and/or did wrap, can't store.
 		break;
 	}
-	sound = Z_Malloc(newsamples<<2, PU_SOUND, 0); // samples * frequency shift * bytes per sample * channels
+	sound = Z_Malloc(newsamples<<2, PU_SOUND, NULL); // samples * frequency shift * bytes per sample * channels
 
 	s = (SINT8 *)stream;
 	d = (INT16 *)sound;

From 00c36a9d9eb8430ff90ab380bdff8e8e4af1052d Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sun, 7 Oct 2018 09:26:18 +0100
Subject: [PATCH 18/34] Fix compiler warnings.

---
 src/sdl/mixer_sound.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 9fef16460..ed15fcdaa 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -246,6 +246,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
 {
 	void *lump;
 	Mix_Chunk *chunk;
+	SDL_RWops *rw;
 #ifdef HAVE_LIBGME
 	Music_Emu *emu;
 	gme_info_t *info;
@@ -387,10 +388,10 @@ void *I_GetSfx(sfxinfo_t *sfx)
 #endif
 
 	// Try to load it as a WAVE or OGG using Mixer.
-	SDL_RWops *rw = SDL_RWFromMem(lump, sfx->length);
+	rw = SDL_RWFromMem(lump, sfx->length);
 	if (rw != NULL)
 	{
-		Mix_Chunk *chunk = Mix_LoadWAV_RW(rw, 1);
+		chunk = Mix_LoadWAV_RW(rw, 1);
 		SDL_RWclose(rw);
 		return chunk;
 	}
@@ -547,6 +548,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
 	char *data;
 	size_t len;
 	lumpnum_t lumpnum = W_CheckNumForName(va("O_%s",musicname));
+	SDL_RWops *rw;
 
 	I_Assert(!music);
 #ifdef HAVE_LIBGME
@@ -658,7 +660,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
 	}
 #endif
 
-	SDL_RWops *rw = SDL_RWFromMem(data, len);
+	rw = SDL_RWFromMem(data, len);
 	if (rw != NULL)
 	{
 		music = Mix_LoadMUS_RW(rw, SDL_FALSE);

From d9d98ec1a941ad597bd8c400a67e8aabb6103b0c Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sun, 7 Oct 2018 10:37:45 +0100
Subject: [PATCH 19/34] Fix the crashing bug hopefully A value of 1 in freesrc
 for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
 For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because
 it makes a copy of the data in memory) For Mix_LoadMUS_RW the RWops is freed
 when Mix_FreeMusic is called (because the data is not a copy) So setting 1 on
 freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW
 *unless* it failed to load any music.

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

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index ed15fcdaa..53a767dfb 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -392,7 +392,6 @@ void *I_GetSfx(sfxinfo_t *sfx)
 	if (rw != NULL)
 	{
 		chunk = Mix_LoadWAV_RW(rw, 1);
-		SDL_RWclose(rw);
 		return chunk;
 	}
 
@@ -663,8 +662,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
 	rw = SDL_RWFromMem(data, len);
 	if (rw != NULL)
 	{
-		music = Mix_LoadMUS_RW(rw, SDL_FALSE);
-		SDL_RWclose(rw);
+		music = Mix_LoadMUS_RW(rw, 1);
 	}
 	if (!music)
 	{
@@ -831,8 +829,7 @@ INT32 I_RegisterSong(void *data, size_t len)
 	SDL_RWops *rw = SDL_RWFromMem(data, len);
 	if (rw != NULL)
 	{
-		music = Mix_LoadMUS_RW(rw, SDL_FALSE);
-		SDL_RWclose(rw);
+		music = Mix_LoadMUS_RW(rw, 1);
 	}
 	if (!music)
 	{

From 2ad2cbcc0a6ddc6bd1110080de51fe8b7d978ca3 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 7 Oct 2018 15:00:58 +0100
Subject: [PATCH 20/34] Weather is already run client-side. What if we ran it
 render-side, for major performance gains? This commit will answer all your
 questions - and more!

---
 src/hardware/hw_main.c | 22 ++++++++++++++++++----
 src/p_mobj.c           | 37 ++++++++++++++++++++-----------------
 src/p_mobj.h           |  4 ++++
 src/p_saveg.c          |  6 ++----
 src/p_spec.c           | 34 ++++++++++------------------------
 src/p_tick.c           | 24 ++++++++++++------------
 src/r_things.c         | 23 +++++++++++++++++++----
 7 files changed, 85 insertions(+), 65 deletions(-)

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index d7c73415a..871a6a493 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5140,8 +5140,10 @@ static void HWR_AddSprites(sector_t *sec)
 
 			approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y);
 
-			if (approx_dist <= limit_dist)
-				HWR_ProjectSprite(thing);
+			if (approx_dist > limit_dist)
+				continue;
+
+			HWR_ProjectSprite(thing);
 		}
 	}
 	else
@@ -5163,8 +5165,10 @@ static void HWR_AddSprites(sector_t *sec)
 
 			approx_dist = P_AproxDistance(viewx-precipthing->x, viewy-precipthing->y);
 
-			if (approx_dist <= limit_dist)
-				HWR_ProjectPrecipitationSprite(precipthing);
+			if (approx_dist > limit_dist)
+				continue;
+
+			HWR_ProjectPrecipitationSprite(precipthing);
 		}
 	}
 	else
@@ -5449,6 +5453,16 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
 	x1 = tr_x + x1 * rightcos;
 	x2 = tr_x - x2 * rightcos;
 
+	// okay, we can't return now... this is a hack, but weather isn't networked, so it should be ok
+	if (!(thing->precipflags & PCF_THUNK))
+	{
+		if (thing->precipflags & PCF_RAIN)
+			P_RainThinker(thing);
+		else
+			P_SnowThinker(thing);
+		thing->precipflags |= PCF_THUNK;
+	}
+
 	//
 	// store information in a vissprite
 	//
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5f85474c6..bb9483d18 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3840,7 +3840,8 @@ void P_RecalcPrecipInSector(sector_t *sector)
 //
 void P_NullPrecipThinker(precipmobj_t *mobj)
 {
-	(void)mobj;
+	//(void)mobj;
+	mobj->precipflags &= ~PCF_THUNK;
 }
 
 void P_SnowThinker(precipmobj_t *mobj)
@@ -3860,25 +3861,26 @@ void P_RainThinker(precipmobj_t *mobj)
 	{
 		// cycle through states,
 		// calling action functions at transitions
-		if (mobj->tics > 0 && --mobj->tics == 0)
-		{
-			// you can cycle through multiple states in a tic
-			if (!P_SetPrecipMobjState(mobj, mobj->state->nextstate))
-				return; // freed itself
-		}
+		if (mobj->tics <= 0)
+			return;
+
+		if (--mobj->tics)
+			return;
+
+		if (!P_SetPrecipMobjState(mobj, mobj->state->nextstate))
+			return;
+
+		if (mobj->state != &states[S_RAINRETURN])
+			return;
+
+		mobj->z = mobj->ceilingz;
+		P_SetPrecipMobjState(mobj, S_RAIN1);
 
-		if (mobj->state == &states[S_RAINRETURN])
-		{
-			mobj->z = mobj->ceilingz;
-			P_SetPrecipMobjState(mobj, S_RAIN1);
-		}
 		return;
 	}
 
 	// adjust height
-	mobj->z += mobj->momz;
-
-	if (mobj->z <= mobj->floorz)
+	if ((mobj->z += mobj->momz) <= mobj->floorz)
 	{
 		// no splashes on sky or bottomless pits
 		if (mobj->precipflags & PCF_PIT)
@@ -7926,14 +7928,15 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype
 static inline precipmobj_t *P_SpawnRainMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 {
 	precipmobj_t *mo = P_SpawnPrecipMobj(x,y,z,type);
-	mo->thinker.function.acp1 = (actionf_p1)P_RainThinker;
+	mo->precipflags |= PCF_RAIN;
+	//mo->thinker.function.acp1 = (actionf_p1)P_RainThinker;
 	return mo;
 }
 
 static inline precipmobj_t *P_SpawnSnowMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 {
 	precipmobj_t *mo = P_SpawnPrecipMobj(x,y,z,type);
-	mo->thinker.function.acp1 = (actionf_p1)P_SnowThinker;
+	//mo->thinker.function.acp1 = (actionf_p1)P_SnowThinker;
 	return mo;
 }
 
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 79cffae89..620028d81 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -252,6 +252,10 @@ typedef enum {
 	PCF_FOF = 4,
 	// Above MOVING FOF (this means we need to keep floorz up to date...)
 	PCF_MOVINGFOF = 8,
+	// Is rain.
+	PCF_RAIN = 16,
+	// Ran the thinker this tic.
+	PCF_THUNK = 32,
 } precipflag_t;
 // Map Object definition.
 typedef struct mobj_s
diff --git a/src/p_saveg.c b/src/p_saveg.c
index d1ec8e5ab..17d28302e 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1661,8 +1661,7 @@ static void P_NetArchiveThinkers(void)
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
 		if (!(th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed
-		 || th->function.acp1 == (actionf_p1)P_RainThinker
-		 || th->function.acp1 == (actionf_p1)P_SnowThinker))
+		 || th->function.acp1 == (actionf_p1)P_NullPrecipThinker))
 			numsaved++;
 
 		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
@@ -1671,8 +1670,7 @@ static void P_NetArchiveThinkers(void)
 			continue;
 		}
 #ifdef PARANOIA
-		else if (th->function.acp1 == (actionf_p1)P_RainThinker
-			|| th->function.acp1 == (actionf_p1)P_SnowThinker);
+		else if (th->function.acp1 == (actionf_p1)P_NullPrecipThinker);
 #endif
 		else if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
 		{
diff --git a/src/p_spec.c b/src/p_spec.c
index c62c3b209..ff6691a99 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2039,8 +2039,7 @@ void P_SwitchWeather(INT32 weathernum)
 
 		for (think = thinkercap.next; think != &thinkercap; think = think->next)
 		{
-			if ((think->function.acp1 != (actionf_p1)P_SnowThinker)
-				&& (think->function.acp1 != (actionf_p1)P_RainThinker))
+			if (think->function.acp1 != (actionf_p1)P_NullPrecipThinker)
 				continue; // not a precipmobj thinker
 
 			precipmobj = (precipmobj_t *)think;
@@ -2056,14 +2055,12 @@ void P_SwitchWeather(INT32 weathernum)
 
 		for (think = thinkercap.next; think != &thinkercap; think = think->next)
 		{
+			if (think->function.acp1 != (actionf_p1)P_NullPrecipThinker)
+				continue; // not a precipmobj thinker
+			precipmobj = (precipmobj_t *)think;
+
 			if (swap == PRECIP_RAIN) // Snow To Rain
 			{
-				if (!(think->function.acp1 == (actionf_p1)P_SnowThinker
-					|| think->function.acp1 == (actionf_p1)P_NullPrecipThinker))
-					continue; // not a precipmobj thinker
-
-				precipmobj = (precipmobj_t *)think;
-
 				precipmobj->flags = mobjinfo[MT_RAIN].flags;
 				st = &states[mobjinfo[MT_RAIN].spawnstate];
 				precipmobj->state = st;
@@ -2074,18 +2071,13 @@ void P_SwitchWeather(INT32 weathernum)
 
 				precipmobj->precipflags &= ~PCF_INVISIBLE;
 
-				think->function.acp1 = (actionf_p1)P_RainThinker;
+				precipmobj->precipflags |= PCF_RAIN;
+				//think->function.acp1 = (actionf_p1)P_RainThinker;
 			}
 			else if (swap == PRECIP_SNOW) // Rain To Snow
 			{
 				INT32 z;
 
-				if (!(think->function.acp1 == (actionf_p1)P_RainThinker
-					|| think->function.acp1 == (actionf_p1)P_NullPrecipThinker))
-					continue; // not a precipmobj thinker
-
-				precipmobj = (precipmobj_t *)think;
-
 				precipmobj->flags = mobjinfo[MT_SNOWFLAKE].flags;
 				z = M_RandomByte();
 
@@ -2103,19 +2095,13 @@ void P_SwitchWeather(INT32 weathernum)
 				precipmobj->frame = st->frame;
 				precipmobj->momz = mobjinfo[MT_SNOWFLAKE].speed;
 
-				precipmobj->precipflags &= ~PCF_INVISIBLE;
+				precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_RAIN);
 
-				think->function.acp1 = (actionf_p1)P_SnowThinker;
+				//think->function.acp1 = (actionf_p1)P_SnowThinker;
 			}
 			else if (swap == PRECIP_BLANK || swap == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse.
 			{
-				if (!(think->function.acp1 == (actionf_p1)P_RainThinker
-					|| think->function.acp1 == (actionf_p1)P_SnowThinker))
-					continue;
-
-				precipmobj = (precipmobj_t *)think;
-
-				think->function.acp1 = (actionf_p1)P_NullPrecipThinker;
+				//think->function.acp1 = (actionf_p1)P_NullPrecipThinker;
 
 				precipmobj->precipflags |= PCF_INVISIBLE;
 			}
diff --git a/src/p_tick.c b/src/p_tick.c
index f4bc59323..5ba747078 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -56,12 +56,12 @@ void Command_Numthinkers_f(void)
 		CONS_Printf(M_GetText("numthinkers <#>: Count number of thinkers\n"));
 		CONS_Printf(
 			"\t1: P_MobjThinker\n"
-			"\t2: P_RainThinker\n"
-			"\t3: P_SnowThinker\n"
-			"\t4: P_NullPrecipThinker\n"
-			"\t5: T_Friction\n"
-			"\t6: T_Pusher\n"
-			"\t7: P_RemoveThinkerDelayed\n");
+			/*"\t2: P_RainThinker\n"
+			"\t3: P_SnowThinker\n"*/
+			"\t2: P_NullPrecipThinker\n"
+			"\t3: T_Friction\n"
+			"\t4: T_Pusher\n"
+			"\t5: P_RemoveThinkerDelayed\n");
 		return;
 	}
 
@@ -73,27 +73,27 @@ void Command_Numthinkers_f(void)
 			action = (actionf_p1)P_MobjThinker;
 			CONS_Printf(M_GetText("Number of %s: "), "P_MobjThinker");
 			break;
-		case 2:
+		/*case 2:
 			action = (actionf_p1)P_RainThinker;
 			CONS_Printf(M_GetText("Number of %s: "), "P_RainThinker");
 			break;
 		case 3:
 			action = (actionf_p1)P_SnowThinker;
 			CONS_Printf(M_GetText("Number of %s: "), "P_SnowThinker");
-			break;
-		case 4:
+			break;*/
+		case 2:
 			action = (actionf_p1)P_NullPrecipThinker;
 			CONS_Printf(M_GetText("Number of %s: "), "P_NullPrecipThinker");
 			break;
-		case 5:
+		case 3:
 			action = (actionf_p1)T_Friction;
 			CONS_Printf(M_GetText("Number of %s: "), "T_Friction");
 			break;
-		case 6:
+		case 4:
 			action = (actionf_p1)T_Pusher;
 			CONS_Printf(M_GetText("Number of %s: "), "T_Pusher");
 			break;
-		case 7:
+		case 5:
 			action = (actionf_p1)P_RemoveThinkerDelayed;
 			CONS_Printf(M_GetText("Number of %s: "), "P_RemoveThinkerDelayed");
 			break;
diff --git a/src/r_things.c b/src/r_things.c
index 0b1764167..910a52b30 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1451,6 +1451,17 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 			return;
 	}
 
+	// okay, we can't return now except for vertical clipping... this is a hack, but weather isn't networked, so it should be ok
+	if (!(thing->precipflags & PCF_THUNK))
+	{
+		if (thing->precipflags & PCF_RAIN)
+			P_RainThinker(thing);
+		else
+			P_SnowThinker(thing);
+		thing->precipflags |= PCF_THUNK;
+	}
+
+
 	//SoM: 3/17/2000: Disregard sprites that are out of view..
 	gzt = thing->z + spritecachedinfo[lump].topoffset;
 	gz = gzt - spritecachedinfo[lump].height;
@@ -1569,8 +1580,10 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 
 			approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y);
 
-			if (approx_dist <= limit_dist)
-				R_ProjectSprite(thing);
+			if (approx_dist > limit_dist)
+				continue;
+
+			R_ProjectSprite(thing);
 		}
 	}
 	else
@@ -1591,8 +1604,10 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 
 			approx_dist = P_AproxDistance(viewx-precipthing->x, viewy-precipthing->y);
 
-			if (approx_dist <= limit_dist)
-				R_ProjectPrecipitationSprite(precipthing);
+			if (approx_dist > limit_dist)
+				continue;
+
+			R_ProjectPrecipitationSprite(precipthing);
 		}
 	}
 	else

From fa1377d540c2e9ff03b593da18c40afc874a95dd Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 7 Oct 2018 14:45:03 -0400
Subject: [PATCH 21/34] Move the ifdef

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

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index d1083518a..1b0974b17 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -52,11 +52,11 @@
 #ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 0
 #endif
-#endif
 
 #ifdef HAVE_ZLIB
 #include "zlib.h"
 #endif
+#endif
 
 UINT8 sound_started = false;
 

From 4d883e740d58e02d18ca934cc81bb3cf4209f840 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 7 Oct 2018 14:52:25 -0400
Subject: [PATCH 22/34] Change order of the ifdef

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

diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 1b0974b17..c4d2a8b08 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -39,6 +39,7 @@
 #define GME_TREBLE 5.0
 #define GME_BASS 1.0
 
+#ifdef HAVE_ZLIB
 #ifndef _MSC_VER
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
@@ -53,10 +54,9 @@
 #define _FILE_OFFSET_BITS 0
 #endif
 
-#ifdef HAVE_ZLIB
 #include "zlib.h"
-#endif
-#endif
+#endif // HAVE_ZLIB
+#endif // HAVE_LIBGME
 
 UINT8 sound_started = false;
 

From 0c9e8cff075023c8406d881de9cd6ec6481076bf Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 7 Oct 2018 15:00:48 -0400
Subject: [PATCH 23/34] Change win_snd.c also

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

diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index bc04bd6df..58644457a 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -18,13 +18,12 @@
 #define GME_TREBLE 5.0
 #define GME_BASS 1.0
 
+#ifdef HAVE_ZLIB
 #ifndef _MSC_VER
-#ifndef _WII
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
 #endif
 #endif
-#endif
 
 #ifndef _LFS64_LARGEFILE
 #define _LFS64_LARGEFILE
@@ -34,10 +33,9 @@
 #define _FILE_OFFSET_BITS 0
 #endif
 
-#ifdef HAVE_ZLIB
 #include "zlib.h"
-#endif
-#endif
+#endif // HAVE_ZLIB
+#endif // HAVE_LIBGME
 
 static FMOD_SYSTEM *fsys;
 static FMOD_SOUND *music_stream;

From d62566e3eac2a9a8273ef003b17d10fc39ac9cf2 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 8 Oct 2018 18:50:17 +0100
Subject: [PATCH 24/34] * Fix a memory leak regarding implementation of SOC_
 (improperly copypasted code from LUA_LoadLump!!) * Optimise the repeated
 strlen usage into a single call, which is stored for later.

---
 src/lua_script.c | 12 +++++++-----
 src/w_wad.c      | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/lua_script.c b/src/lua_script.c
index ce96878bf..1c1b01f6c 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -182,19 +182,21 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
 {
 	MYFILE f;
 	char *name;
+	size_t len;
 	f.wad = wad;
 	f.size = W_LumpLengthPwad(wad, lump);
 	f.data = Z_Malloc(f.size, PU_LUA, NULL);
 	W_ReadLumpPwad(wad, lump, f.data);
 	f.curpos = f.data;
 
-	name = malloc(strlen(wadfiles[wad]->filename)+10);
+	len = strlen(wadfiles[wad]->filename);
+	name = malloc(len+10);
 	strcpy(name, wadfiles[wad]->filename);
-	if (!fasticmp(&name[strlen(name) - 4], ".lua")) {
+	if (!fasticmp(&name[len - 4], ".lua")) {
 		// If it's not a .lua file, copy the lump name in too.
-		name[strlen(wadfiles[wad]->filename)] = '|';
-		M_Memcpy(name+strlen(wadfiles[wad]->filename)+1, wadfiles[wad]->lumpinfo[lump].name, 8);
-		name[strlen(wadfiles[wad]->filename)+9] = '\0';
+		name[len] = '|';
+		M_Memcpy(name+len+1, wadfiles[wad]->lumpinfo[lump].name, 8);
+		name[len+9] = '\0';
 	}
 
 	LUA_LoadFile(&f, name);
diff --git a/src/w_wad.c b/src/w_wad.c
index 3a8285593..3f0082a16 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -194,16 +194,21 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum)
 		for (lump = 0; lump < wadfiles[wadnum]->numlumps; lump++, lump_p++)
 			if (memcmp(lump_p->name,"SOC_",4)==0) // Check for generic SOC lump
 			{	// shameless copy+paste of code from LUA_LoadLump
-				char *name = malloc(strlen(wadfiles[wadnum]->filename)+10);
+				size_t len = strlen(wadfiles[wadnum]->filename);
+				char *name = malloc(len+10);
+
 				strcpy(name, wadfiles[wadnum]->filename);
-				if (!fasticmp(&name[strlen(name) - 4], ".soc")) {
+				if (!fasticmp(&name[len - 4], ".soc")) {
 					// If it's not a .soc file, copy the lump name in too.
-					name[strlen(wadfiles[wadnum]->filename)] = '|';
-					M_Memcpy(name+strlen(wadfiles[wadnum]->filename)+1, lump_p->name, 8);
-					name[strlen(wadfiles[wadnum]->filename)+9] = '\0';
+					name[len] = '|';
+					M_Memcpy(name+len+1, lump_p->name, 8);
+					name[len+9] = '\0';
 				}
+
 				CONS_Printf(M_GetText("Loading SOC from %s\n"), name);
 				DEH_LoadDehackedLumpPwad(wadnum, lump);
+
+				free(name);
 			}
 			else if (memcmp(lump_p->name,"MAINCFG",8)==0) // Check for MAINCFG
 			{

From a7ba0b958a21d2370b5457fd00ed19b0036e6654 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Tue, 9 Oct 2018 19:43:18 +0100
Subject: [PATCH 25/34] Tiny fix so that joystick2 being closed can let the
 JoystickSubSystem close before game close. No memory leak here, just a very
 tiny thing I noticed.

---
 src/sdl/i_system.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index f92cd4b6e..7b14f1f18 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1154,6 +1154,7 @@ static void I_ShutdownJoystick2(void)
 		D_PostEvent(&event);
 	}
 
+	joystick2_started = 0;
 	JoyReset(&JoyInfo2);
 	if (!joystick_started && !joystick2_started && SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
 	{

From 41fbdce21e7baad6cc54ce4436c191140a72584d Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Wed, 25 Jan 2017 19:36:32 +0000
Subject: [PATCH 26/34] debugfile is only used by DEBUGFILE code, no need to
 declare/define it for anything else

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

diff --git a/src/d_net.c b/src/d_net.c
index 643c41ac9..8de5cf088 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -49,7 +49,9 @@ doomcom_t *doomcom = NULL;
 /// \brief network packet data, points inside doomcom
 doomdata_t *netbuffer = NULL;
 
+#ifdef DEBUGFILE
 FILE *debugfile = NULL; // put some net info in a file during the game
+#endif
 
 #define MAXREBOUND 8
 static doomdata_t reboundstore[MAXREBOUND];
diff --git a/src/doomstat.h b/src/doomstat.h
index 8072a1552..341cc70a9 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -445,19 +445,17 @@ extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
 
 #if defined (macintosh)
 #define DEBFILE(msg) I_OutputMsg(msg)
-extern FILE *debugfile;
 #else
 #define DEBUGFILE
 #ifdef DEBUGFILE
 #define DEBFILE(msg) { if (debugfile) { fputs(msg, debugfile); fflush(debugfile); } }
-extern FILE *debugfile;
 #else
 #define DEBFILE(msg) {}
-extern FILE *debugfile;
 #endif
 #endif
 
 #ifdef DEBUGFILE
+extern FILE *debugfile;
 extern INT32 debugload;
 #endif
 

From 6fb3dcb52f05a21952eb5fd2453f837e016ce31b Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sat, 11 Feb 2017 22:41:15 +0000
Subject: [PATCH 27/34] Remove unused sscount variable

(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
---
 src/hardware/hw_bsp.c  | 2 --
 src/hardware/hw_main.c | 1 -
 src/r_main.c           | 5 -----
 src/r_state.h          | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 17eb8761c..a32609fc8 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -564,8 +564,6 @@ static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
 	subsector_t *sub;
 	seg_t *lseg;
 
-	sscount++;
-
 	sub = &subsectors[num];
 	count = sub->numlines;
 	lseg = &segs[sub->firstline];
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 871a6a493..ecb70a0f9 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -3264,7 +3264,6 @@ static void HWR_Subsector(size_t num)
 
 	if (num < numsubsectors)
 	{
-		sscount++;
 		// subsector
 		sub = &subsectors[num];
 		// sector
diff --git a/src/r_main.c b/src/r_main.c
index f2a0c8894..6c92983f4 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -60,7 +60,6 @@ fixed_t projectiony; // aspect ratio
 // just for profiling purposes
 size_t framecount;
 
-size_t sscount;
 size_t loopcount;
 
 fixed_t viewx, viewy, viewz;
@@ -964,8 +963,6 @@ void R_SkyboxFrame(player_t *player)
 	viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
 	viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
 
-	sscount = 0;
-
 	// recalc necessary stuff for mouseaiming
 	// slopes are already calculated for the full possible view (which is 4*viewheight).
 
@@ -1089,8 +1086,6 @@ void R_SetupFrame(player_t *player, boolean skybox)
 	viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
 	viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
 
-	sscount = 0;
-
 	// recalc necessary stuff for mouseaiming
 	// slopes are already calculated for the full possible view (which is 4*viewheight).
 
diff --git a/src/r_state.h b/src/r_state.h
index 49d0457b2..ac3e1fa42 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -108,7 +108,4 @@ extern angle_t rw_normalangle;
 // angle to line origin
 extern angle_t rw_angle1;
 
-// Segs count?
-extern size_t sscount;
-
 #endif

From bae8dd2e99bae92b2531a0aba03f4407184aec9f Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sat, 11 Feb 2017 22:56:08 +0000
Subject: [PATCH 28/34] Removed unused function prototypes in d_main.h

Also corrected what appears to be a typo in some comments above?
---
 src/d_main.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/d_main.h b/src/d_main.h
index 6dc273b15..d73b19d1f 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -34,7 +34,7 @@ void D_SRB2Loop(void) FUNCNORETURN;
 // D_SRB2Main()
 // Not a globally visible function, just included for source reference,
 // calls all startup code, parses command line options.
-// If not overrided by user input, calls N_AdvanceDemo.
+// If not overrided by user input, calls D_AdvanceDemo.
 //
 void D_SRB2Main(void);
 
@@ -51,9 +51,6 @@ const char *D_Home(void);
 //
 // BASE LEVEL
 //
-void D_PageTicker(void);
-// pagename is lumpname of a 320x200 patch to fill the screen
-void D_PageDrawer(const char *pagename);
 void D_AdvanceDemo(void);
 void D_StartTitle(void);
 

From adc9d3b1ecb87b153d142269a148acd9b5584f81 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sat, 11 Feb 2017 23:24:12 +0000
Subject: [PATCH 29/34] "t" is not needed to take out fencepost cases from
 viewangletox

---
 src/r_main.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/r_main.c b/src/r_main.c
index 6c92983f4..d1cd71b3f 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -491,9 +491,6 @@ static void R_InitTextureMapping(void)
 	// Take out the fencepost cases from viewangletox.
 	for (i = 0; i < FINEANGLES/2; i++)
 	{
-		t = FixedMul(FINETANGENT(i), focallength);
-		t = centerx - t;
-
 		if (viewangletox[i] == -1)
 			viewangletox[i] = 0;
 		else if (viewangletox[i] == viewwidth+1)

From 5ab6eb8bd78ca75e30a2df306eca027bcca5e897 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Sat, 11 Feb 2017 23:28:42 +0000
Subject: [PATCH 30/34] Remove unused "runcount" variable from p_local.h

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

diff --git a/src/p_local.h b/src/p_local.h
index 1fd7ada04..b82bcf0ec 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -68,7 +68,6 @@
 
 // both the head and tail of the thinker list
 extern thinker_t thinkercap;
-extern INT32 runcount;
 
 void P_InitThinkers(void);
 void P_AddThinker(thinker_t *thinker);

From a8e9805c06e9e3388928be2d971fd14bc96d86fb Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Wed, 15 Feb 2017 21:16:56 +0000
Subject: [PATCH 31/34] Remove unused ObjectPlace_OnChange prototype (from when
 Objectplace was a consvar, which it is not anymore)

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

diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index d8fae72f7..023bbd094 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -212,7 +212,6 @@ void Command_ExitGame_f(void);
 void Command_Retry_f(void);
 void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
 void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect);
-void ObjectPlace_OnChange(void);
 void ItemFinder_OnChange(void);
 void D_SetPassword(const char *pw);
 

From 34728b30314839595936216f39e132ec4b0732b7 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Wed, 22 Feb 2017 21:07:29 +0000
Subject: [PATCH 32/34] Remove "playerdeadview" variable; it's not been used
 for its stated purpose for who knows how long now

Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
---
 src/d_clisrv.c | 2 --
 src/d_main.c   | 1 -
 src/f_finale.c | 6 ------
 src/g_game.c   | 1 -
 src/hu_stuff.h | 3 ---
 src/p_user.c   | 9 ---------
 6 files changed, 22 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 6e22dde23..950038237 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1568,8 +1568,6 @@ static void CL_LoadReceivedSavegame(void)
 	automapactive = false;
 
 	// load a base level
-	playerdeadview = false;
-
 	if (P_LoadNetGame())
 	{
 		const INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
diff --git a/src/d_main.c b/src/d_main.c
index df3398752..f807e3070 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -720,7 +720,6 @@ void D_StartTitle(void)
 	maptol = 0;
 
 	gameaction = ga_nothing;
-	playerdeadview = false;
 	displayplayer = consoleplayer = 0;
 	//demosequence = -1;
 	gametype = GT_COOP;
diff --git a/src/f_finale.c b/src/f_finale.c
index a8b27bb80..fb1387c11 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -442,7 +442,6 @@ void F_StartIntro(void)
 
 	G_SetGamestate(GS_INTRO);
 	gameaction = ga_nothing;
-	playerdeadview = false;
 	paused = false;
 	CON_ToggleOff();
 	CON_ClearHUD();
@@ -1130,7 +1129,6 @@ void F_StartCredits(void)
 	}
 
 	gameaction = ga_nothing;
-	playerdeadview = false;
 	paused = false;
 	CON_ToggleOff();
 	CON_ClearHUD();
@@ -1277,7 +1275,6 @@ void F_StartGameEvaluation(void)
 		G_SaveGame((UINT32)cursaveslot);
 
 	gameaction = ga_nothing;
-	playerdeadview = false;
 	paused = false;
 	CON_ToggleOff();
 	CON_ClearHUD();
@@ -1388,7 +1385,6 @@ void F_StartGameEnd(void)
 	G_SetGamestate(GS_GAMEEND);
 
 	gameaction = ga_nothing;
-	playerdeadview = false;
 	paused = false;
 	CON_ToggleOff();
 	CON_ClearHUD();
@@ -1591,7 +1587,6 @@ void F_StartContinue(void)
 	gameaction = ga_nothing;
 
 	keypressed = false;
-	playerdeadview = false;
 	paused = false;
 	CON_ToggleOff();
 	CON_ClearHUD();
@@ -1760,7 +1755,6 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset
 	G_SetGamestate(GS_CUTSCENE);
 
 	gameaction = ga_nothing;
-	playerdeadview = false;
 	paused = false;
 	CON_ToggleOff();
 
diff --git a/src/g_game.c b/src/g_game.c
index 4f1c49b42..0e8c14f6a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3616,7 +3616,6 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
 	mapmusflags |= MUSIC_RELOADRESET;
 
 	ultimatemode = pultmode;
-	playerdeadview = false;
 	automapactive = false;
 	imcontinuing = false;
 
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 7b22f33f1..5356ba8ac 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -78,9 +78,6 @@ extern boolean chat_on;
 // set true whenever the tab rankings are being shown for any reason
 extern boolean hu_showscores;
 
-// P_DeathThink sets this true to show scores while dead, in multiplayer
-extern boolean playerdeadview;
-
 // init heads up data at game startup.
 void HU_Init(void);
 
diff --git a/src/p_user.c b/src/p_user.c
index 7abf85347..7e206930d 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8648,8 +8648,6 @@ void P_DoPityCheck(player_t *player)
 // P_PlayerThink
 //
 
-boolean playerdeadview; // show match/chaos/tag/capture the flag rankings while in death view
-
 void P_PlayerThink(player_t *player)
 {
 	ticcmd_t *cmd;
@@ -8838,10 +8836,6 @@ void P_PlayerThink(player_t *player)
 	if (player->playerstate == PST_DEAD)
 	{
 		player->mo->flags2 &= ~MF2_SHADOW;
-		// show the multiplayer rankings while dead
-		if (player == &players[displayplayer])
-			playerdeadview = true;
-
 		P_DeathThink(player);
 
 		return;
@@ -8862,9 +8856,6 @@ void P_PlayerThink(player_t *player)
 		player->lives = cv_startinglives.value;
 	}
 
-	if (player == &players[displayplayer])
-		playerdeadview = false;
-
 	if ((gametype == GT_RACE || gametype == GT_COMPETITION) && leveltime < 4*TICRATE)
 	{
 		cmd->buttons &= BT_USE; // Remove all buttons except BT_USE

From 4132b39b9a42f09a8260043c17e3f952bdf1a7ed Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sat, 13 Oct 2018 23:01:11 +0100
Subject: [PATCH 33/34] Add an int to I_PlaySound to tell an interface which
 channel number SRB2 is using. I've voided this out on other sound interfaces
 than SDL Mixer ones because I'm both not sure whether they need it, and not
 sure how to make them work with it if they do.

---
 src/djgppdos/i_sound.c  | 4 +++-
 src/dummy/i_sound.c     | 3 ++-
 src/i_sound.h           | 2 +-
 src/nds/i_sound.c       | 3 ++-
 src/s_sound.c           | 4 ++--
 src/sdl/mixer_sound.c   | 4 ++--
 src/sdl/sdl_sound.c     | 3 ++-
 src/sdl12/mixer_sound.c | 4 ++--
 src/sdl12/sdl_sound.c   | 3 ++-
 src/win32/win_snd.c     | 3 ++-
 src/win32ce/win_snd.c   | 4 +++-
 11 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index 88fc807f4..f1e2ad2bf 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -165,9 +165,11 @@ INT32 I_StartSound ( sfxenum_t     id,
                    INT32         vol,
                    INT32         sep,
                    INT32         pitch,
-                   INT32         priority )
+                   INT32         priority
+				   INT32         channel)
 {
 	int voice;
+	(void)channel;
 
 	if (nosound)
 	return 0;
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index 51dbb610d..143da186c 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -23,13 +23,14 @@ void I_UpdateSound(void){};
 //  SFX I/O
 //
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	(void)id;
 	(void)vol;
 	(void)sep;
 	(void)pitch;
 	(void)priority;
+	(void)channel;
 	return -1;
 }
 
diff --git a/src/i_sound.h b/src/i_sound.h
index 084479ee1..098c9be17 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -64,7 +64,7 @@ void I_ShutdownSound(void);
 
 	\return	sfx handle
 */
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority);
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel);
 
 /**	\brief	Stops a sound channel.
 
diff --git a/src/nds/i_sound.c b/src/nds/i_sound.c
index 8dea4ad7d..a17c7f66a 100644
--- a/src/nds/i_sound.c
+++ b/src/nds/i_sound.c
@@ -21,13 +21,14 @@ void I_ShutdownSound(void){}
 //  SFX I/O
 //
 
-INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority)
+INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority, INT32 channel)
 {
 	(void)id;
 	(void)vol;
 	(void)sep;
 	(void)pitch;
 	(void)priority;
+	(void)channel;
 	return -1;
 }
 
diff --git a/src/s_sound.c b/src/s_sound.c
index 76ee4c649..3b35b36f6 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -529,7 +529,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 
 		// Assigns the handle to one of the channels in the
 		// mix/output buffer.
-		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority);
+		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
 	}
 
 dontplay:
@@ -579,7 +579,7 @@ dontplay:
 
 	// Assigns the handle to one of the channels in the
 	// mix/output buffer.
-	channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority);
+	channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
 }
 
 void S_StartSound(const void *origin, sfxenum_t sfx_id)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index cfdb32303..4b4ad3e62 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -419,10 +419,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	sfx->lumpnum = LUMPERROR;
 }
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
-	INT32 handle = Mix_PlayChannel(-1, S_sfx[id].data, 0);
+	INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
 	(void)pitch; // Mixer can't handle pitch
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 6c70c163b..a7c8383a3 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -604,10 +604,11 @@ void I_FreeSfx(sfxinfo_t * sfx)
 // Pitching (that is, increased speed of playback)
 //  is set, but currently not used by mixing.
 //
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	(void)priority;
 	(void)pitch;
+	(void)channel;
 
 	if (nosound)
 		return 0;
diff --git a/src/sdl12/mixer_sound.c b/src/sdl12/mixer_sound.c
index 542a67169..daf09ab91 100644
--- a/src/sdl12/mixer_sound.c
+++ b/src/sdl12/mixer_sound.c
@@ -376,10 +376,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	sfx->data = NULL;
 }
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
-	INT32 handle = Mix_PlayChannel(-1, S_sfx[id].data, 0);
+	INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
 	(void)pitch; // Mixer can't handle pitch
diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c
index 6ba83104e..01a27153e 100644
--- a/src/sdl12/sdl_sound.c
+++ b/src/sdl12/sdl_sound.c
@@ -621,10 +621,11 @@ void I_FreeSfx(sfxinfo_t * sfx)
 // Pitching (that is, increased speed of playback)
 //  is set, but currently not used by mixing.
 //
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	(void)priority;
 	(void)pitch;
+	(void)channel;
 
 	if (nosound)
 		return 0;
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 58644457a..e50a4737e 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -353,12 +353,13 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	sfx->data = NULL;
 }
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	FMOD_SOUND *sound;
 	FMOD_CHANNEL *chan;
 	INT32 i;
 	float frequency;
+	(void)channel;
 
 	sound = (FMOD_SOUND *)S_sfx[id].data;
 	I_Assert(sound != NULL);
diff --git a/src/win32ce/win_snd.c b/src/win32ce/win_snd.c
index f9c652178..a58bbc3ce 100644
--- a/src/win32ce/win_snd.c
+++ b/src/win32ce/win_snd.c
@@ -538,7 +538,8 @@ INT32 I_StartSound (sfxenum_t      id,
                   INT32          vol,
                   INT32          sep,
                   INT32          pitch,
-                  INT32          priority)
+                  INT32          priority
+				  INT32          channel)
 {
 	HRESULT     hr;
 	LPDIRECTSOUNDBUFFER     dsbuffer;
@@ -549,6 +550,7 @@ INT32 I_StartSound (sfxenum_t      id,
 #ifdef SURROUND
 	LPDIRECTSOUNDBUFFER     dssurround;
 #endif
+	(void)channel;
 
 	if (nosound)
 		return -1;

From 394075fbe902acbdf5ad01cf2ac42f15020ca489 Mon Sep 17 00:00:00 2001
From: Sryder <sryder13@gmail.com>
Date: Sun, 14 Oct 2018 10:14:07 +0100
Subject: [PATCH 34/34] Fix missing commas and missed interface

---
 src/android/i_sound.c  | 3 ++-
 src/djgppdos/i_sound.c | 2 +-
 src/win32ce/win_snd.c  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index ecf96f2f0..77f8e6a55 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -21,13 +21,14 @@ void I_ShutdownSound(void){}
 //  SFX I/O
 //
 
-INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority)
+INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority, INT32 channel)
 {
         (void)id;
         (void)vol;
         (void)sep;
         (void)pitch;
         (void)priority;
+        (void)channel;
         return -1;
 }
 
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index f1e2ad2bf..ec6f4412f 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -165,7 +165,7 @@ INT32 I_StartSound ( sfxenum_t     id,
                    INT32         vol,
                    INT32         sep,
                    INT32         pitch,
-                   INT32         priority
+                   INT32         priority,
 				   INT32         channel)
 {
 	int voice;
diff --git a/src/win32ce/win_snd.c b/src/win32ce/win_snd.c
index a58bbc3ce..14ce4add4 100644
--- a/src/win32ce/win_snd.c
+++ b/src/win32ce/win_snd.c
@@ -538,7 +538,7 @@ INT32 I_StartSound (sfxenum_t      id,
                   INT32          vol,
                   INT32          sep,
                   INT32          pitch,
-                  INT32          priority
+                  INT32          priority,
 				  INT32          channel)
 {
 	HRESULT     hr;