From a442b6a4f658726f1b1f1011caf1f4d29943ad99 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 10 Aug 2020 21:11:46 -0400
Subject: [PATCH] Fix up D_SRB2Main

---
 src/d_main.c   | 17 +++++++----------
 src/d_netcmd.c |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index e4e529f49..8f8542859 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1211,9 +1211,12 @@ D_ConvertVersionNumbers (void)
 //
 void D_SRB2Main(void)
 {
-	INT32 p;
-
+	INT32 i;
 	UINT16 wadnum;
+	lumpinfo_t *lumpinfo;
+	char *name;
+
+	INT32 p;
 
 	INT32 pstartmap = 1;
 	boolean autostart = false;
@@ -1465,7 +1468,7 @@ void D_SRB2Main(void)
 	CONS_Printf("W_InitMultipleFiles(): Adding external PWADs.\n");
 	if (!W_InitMultipleFiles(startuppwads, mainwads))
 		M_StartMessage(M_GetText("A PWAD file was not found or not valid.\nCheck log.txt to see which ones.\n\nPress ESC\n"), NULL, MM_NOTHING);
-	D_CleanFile();
+	D_CleanFile(startuppwads);
 
 	//
 	// search for maps... again.
@@ -1510,12 +1513,6 @@ void D_SRB2Main(void)
 	// Has to be done before the configuration file loads,
 	// but after the OpenGL library loads.
 	HWR_AddCommands();
-
-	if (rendermode == render_opengl)
-	{
-		for (i = 0; i < numwadfiles; i++)
-			HWR_LoadShaders(i, (wadfiles[i]->type == RET_PK3));
-	}
 #endif
 
 	//--------------------------------------------------------- CONSOLE
@@ -1583,7 +1580,7 @@ void D_SRB2Main(void)
 		else
 		{
 			if (!M_CheckParm("-server"))
-				G_SetGameModified(true);
+				G_SetGameModified(multiplayer, true);
 			autostart = true;
 		}
 	}
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index ed7ef8adc..7a74a6124 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3067,7 +3067,7 @@ static void Command_Map_f(void)
 
 	if (mustmodifygame && option_force)
 	{
-		G_SetGameModified(false);
+		G_SetGameModified(multiplayer, true);
 	}
 
 	// new gametype value