From 858f345802f1d19a18d2a24ab25a18ccadd0ea1f Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 00:56:53 -0400
Subject: [PATCH 1/7] Haha NONET...

---
 src/d_clisrv.c | 7 ++++++-
 src/d_netfil.c | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index c847f0a65..21b8e86c9 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2038,6 +2038,7 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room)
 
 #endif // ifndef NONET
 
+#ifndef NONET
 static void M_ConfirmConnect(event_t *ev)
 {
 	if (ev->type == ev_keydown)
@@ -2072,6 +2073,7 @@ static void M_ConfirmConnect(event_t *ev)
 		}
 	}
 }
+#endif
 
 static boolean CL_FinishedFileList(void)
 {
@@ -2157,10 +2159,12 @@ static boolean CL_FinishedFileList(void)
 		if (!curl_failedwebdownload)
 #endif
 		{
+#ifndef NONET
 			downloadcompletednum = 0;
 			downloadcompletedsize = 0;
 			totalfilesrequestednum = 0;
 			totalfilesrequestedsize = 0;
+#endif
 
 			for (i = 0; i < fileneedednum; i++)
 				if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
@@ -2276,7 +2280,6 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
 		*asksent = I_GetTime();
 	}
 #else
-	(void)viams;
 	(void)asksent;
 	// No netgames, so we skip this state.
 	cl_mode = CL_ASKJOIN;
@@ -2993,8 +2996,10 @@ void CL_Reset(void)
 	fileneedednum = 0;
 	memset(fileneeded, 0, sizeof(fileneeded));
 
+#ifndef NONET
 	totalfilesrequestednum = 0;
 	totalfilesrequestedsize = 0;
+#endif
 	firstconnectattempttime = 0;
 	serverisfull = false;
 	connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 621ce2953..c9bfb4ea7 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -874,8 +874,10 @@ void Got_Filetxpak(void)
 			file->status = FS_FOUND;
 			CONS_Printf(M_GetText("Downloading %s...(done)\n"),
 				filename);
+#ifndef NONET
 			downloadcompletednum++;
 			downloadcompletedsize += file->totalsize;
+#endif
 		}
 	}
 	else

From d1d1b3aadfdfafbab433d4d50543fc448e48485f Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 00:58:14 -0400
Subject: [PATCH 2/7] Screw you C90

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

diff --git a/src/mserv.c b/src/mserv.c
index 4c044fed2..e05067194 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -58,7 +58,7 @@ static void MasterServer_OnChange(void);
 static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
 	{2,  "MIN"},
 	{60, "MAX"},
-	{0}
+	{0, NULL}
 };
 
 consvar_t cv_masterserver = {"masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange, 0, NULL, NULL, 0, 0, NULL};

From 7005d8303c7ddbe4897abd76743006f6a7825553 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 01:00:28 -0400
Subject: [PATCH 3/7] Turns out compiling with the internal version of curl was
 broken on CMake the entire time :upside_down_face:

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9dd7f500a..18c3a34f7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -398,7 +398,7 @@ endif()
 if(${SRB2_CONFIG_HAVE_CURL})
 	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
 		set(CURL_FOUND ON)
-		set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl)
+		set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include)
 		if(${SRB2_SYSTEM_BITS} EQUAL 64)
 			set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
 		else() # 32-bit

From 0021128446993eadf59ef79ea09069c8ade10bfb Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 01:06:10 -0400
Subject: [PATCH 4/7] This is just stupid

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

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 21b8e86c9..581b6d2d8 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2164,7 +2164,6 @@ static boolean CL_FinishedFileList(void)
 			downloadcompletedsize = 0;
 			totalfilesrequestednum = 0;
 			totalfilesrequestedsize = 0;
-#endif
 
 			for (i = 0; i < fileneedednum; i++)
 				if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
@@ -2194,9 +2193,11 @@ static boolean CL_FinishedFileList(void)
 					"Press ACCEL to continue or BRAKE to cancel.\n\n"
 				), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
 
+
 			Z_Free(downloadsize);
 			cl_mode = CL_CONFIRMCONNECT;
 		}
+#endif		
 #ifdef HAVE_CURL
 		else
 		{

From 6c0c0d710f66174778cda4a399711d49ae439927 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 01:13:59 -0400
Subject: [PATCH 5/7] Remind me why NONET exists?

---
 src/d_clisrv.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 581b6d2d8..4364051d1 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2038,9 +2038,9 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room)
 
 #endif // ifndef NONET
 
-#ifndef NONET
 static void M_ConfirmConnect(event_t *ev)
 {
+#ifndef NONET	
 	if (ev->type == ev_keydown)
 	{
 		if (ev->data1 == ' ' || ev->data1 == 'y' || ev->data1 == KEY_ENTER || ev->data1 == gamecontrol[gc_accelerate][0] || ev->data1 == gamecontrol[gc_accelerate][1])
@@ -2072,8 +2072,8 @@ static void M_ConfirmConnect(event_t *ev)
 			M_ClearMenus(true);
 		}
 	}
-}
 #endif
+}
 
 static boolean CL_FinishedFileList(void)
 {
@@ -2164,12 +2164,15 @@ static boolean CL_FinishedFileList(void)
 			downloadcompletedsize = 0;
 			totalfilesrequestednum = 0;
 			totalfilesrequestedsize = 0;
+#endif
 
 			for (i = 0; i < fileneedednum; i++)
 				if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
 				{
+#ifndef NONET
 					totalfilesrequestednum++;
 					totalfilesrequestedsize += fileneeded[i].totalsize;
+#endif
 				}
 
 			if (totalfilesrequestedsize>>20 >= 100)
@@ -2193,11 +2196,9 @@ static boolean CL_FinishedFileList(void)
 					"Press ACCEL to continue or BRAKE to cancel.\n\n"
 				), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
 
-
 			Z_Free(downloadsize);
 			cl_mode = CL_CONFIRMCONNECT;
 		}
-#endif		
 #ifdef HAVE_CURL
 		else
 		{

From 94ca85b2297ddf35f756efc820c5baecbe58793d Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 01:18:38 -0400
Subject: [PATCH 6/7] Hopefully the last time...

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

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 4364051d1..0842a65c3 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2072,6 +2072,8 @@ static void M_ConfirmConnect(event_t *ev)
 			M_ClearMenus(true);
 		}
 	}
+#else
+	(void)ev;
 #endif
 }
 
@@ -2175,10 +2177,12 @@ static boolean CL_FinishedFileList(void)
 #endif
 				}
 
+#ifndef NONET
 			if (totalfilesrequestedsize>>20 >= 100)
 				downloadsize = Z_StrDup(va("%uM",totalfilesrequestedsize>>20));
 			else
 				downloadsize = Z_StrDup(va("%uK",totalfilesrequestedsize>>10));
+#endif
 
 			if (serverisfull)
 				M_StartMessage(va(M_GetText(

From 23b1f8fc5e73b7de4662db8e7bacfdabe0a8523e Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 24 Aug 2020 01:25:34 -0400
Subject: [PATCH 7/7] Initialize this variable

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

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 0842a65c3..fd6fbda32 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2080,7 +2080,7 @@ static void M_ConfirmConnect(event_t *ev)
 static boolean CL_FinishedFileList(void)
 {
 	INT32 i;
-	char *downloadsize;
+	char *downloadsize = NULL;
 	//CONS_Printf(M_GetText("Checking files...\n"));
 	i = CL_CheckFiles();
 	if (i == 4) // still checking ...