Fixes to merge process

src/d_netfil.c

@@ -430,27 +430,8 @@ void CL_LoadServerFiles(void)
 			fileneeded[i].status = FS_OPEN;
 		}
 		else if (fileneeded[i].status == FS_MD5SUMBAD)
-		{
+			I_Error("Wrong version of file %s", fileneeded[i].filename);
-			// If the file is marked important, don't even bother proceeding.
+		else
-			if (fileneeded[i].important)
-				I_Error("Wrong version of important file %s", fileneeded[i].filename);
-
-			// If it isn't, no need to worry the user with a console message,
-			// although it can't hurt to put something in the debug file.
-
-			// ...but wait a second. What if the local version is "important"?
-			if (!W_VerifyNMUSlumps(fileneeded[i].filename))
-				I_Error("File %s should only contain music and sound effects!",
-					fileneeded[i].filename);
-
-			// Okay, NOW we know it's safe. Whew.
-			P_AddWadFile(fileneeded[i].filename);
-			if (fileneeded[i].important)
-				G_SetGameModified(true);
-			fileneeded[i].status = FS_OPEN;
-			DEBFILE(va("File %s found but with different md5sum\n", fileneeded[i].filename));
-		}
-		else if (fileneeded[i].important)
 		{
 			const char *s;
 			switch(fileneeded[i].status)

src/f_finale.c

@@ -648,7 +648,7 @@ void F_CreditDrawer(void)
 	}
 
 	// Dim the background
-	V_DrawFadeScreen();
+	//V_DrawFadeScreen();
 
 	// Draw credits text on top
 	for (i = 0; credits[i]; i++)

src/s_sound.c

@@ -51,7 +51,9 @@ static void Command_Tunes_f(void);
 static void Command_RestartAudio_f(void);
 
 // Sound system toggles
+#ifndef NO_MIDI
 static void GameMIDIMusic_OnChange(void);
+#endif
 static void GameSounds_OnChange(void);
 static void GameDigiMusic_OnChange(void);
 
@@ -103,7 +105,9 @@ consvar_t cv_resetmusic = {"resetmusic", "No", CV_SAVE|CV_NOSHOWHELP, CV_YesNo,
 
 // Sound system toggles, saved into the config
 consvar_t cv_gamedigimusic = {"digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+#ifndef NO_MIDI
 consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+#endif
 consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 #define S_MAX_VOLUME 127
@@ -262,7 +266,9 @@ void S_RegisterSoundStuff(void)
 	CV_RegisterVar(&cv_resetmusic);
 	CV_RegisterVar(&cv_gamesounds);
 	CV_RegisterVar(&cv_gamedigimusic);
+#ifndef NO_MIDI
 	CV_RegisterVar(&cv_gamemidimusic);
+#endif
 
 	COM_AddCommand("tunes", Command_Tunes_f);
 	COM_AddCommand("restartaudio", Command_RestartAudio_f);
@@ -1995,6 +2001,7 @@ void GameDigiMusic_OnChange(void)
 	}
 }
 
+#ifndef NO_MIDI
 void GameMIDIMusic_OnChange(void)
 {
 	if (M_CheckParm("-nomusic"))
@@ -2035,3 +2042,4 @@ void GameMIDIMusic_OnChange(void)
 		}
 	}
 }
+#endif

src/s_sound.h

@@ -29,7 +29,9 @@ extern consvar_t cv_numChannels;
 extern consvar_t surround;
 extern consvar_t cv_resetmusic;
 extern consvar_t cv_gamedigimusic;
+#ifndef NO_MIDI
 extern consvar_t cv_gamemidimusic;
+#endif
 extern consvar_t cv_gamesounds;
 
 #ifdef SNDSERV

src/w_wad.c

@@ -649,8 +649,7 @@ UINT16 W_InitFile(const char *filename)
 	restype_t type;
 	UINT16 numlumps = 0;
 	size_t i;
-	size_t packetsize = 0;
+	size_t packetsize;
-	serverinfo_pak *dummycheck = NULL;
 	UINT8 md5sum[16];
 	boolean important;