From a69239bfa873a4191072b53c9601c641e1899619 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 4 Jan 2019 00:17:32 -0500 Subject: [PATCH 1/2] Don't increment mainwads for sounds or music.kart --- src/d_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index f61aa47b..3d5c7bfa 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1250,12 +1250,12 @@ void D_SRB2Main(void) mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_KART); // textures.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_KART); // chars.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART); // maps.kart - mainwads++; //W_VerifyFileMD5(5, ASSET_HASH_SOUNDS_KART); -- sounds.kart - doesn't trigger modifiedgame, doesn't need an MD5...? + //mainwads++; //W_VerifyFileMD5(5, ASSET_HASH_SOUNDS_KART); -- sounds.kart - doesn't trigger modifiedgame, doesn't need an MD5...? #ifdef USE_PATCH_KART mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_KART); // patch.kart #endif //mainwads++; // music.dta - mainwads++; // music.kart + //mainwads++; // music.kart // don't check music.dta or kart because people like to modify it, and it doesn't matter if they do // ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for. #else @@ -1266,12 +1266,12 @@ void D_SRB2Main(void) mainwads++; // textures.kart mainwads++; // chars.kart mainwads++; // maps.kart - mainwads++; // sounds.kart + //mainwads++; // sounds.kart #ifdef USE_PATCH_KART mainwads++; // patch.kart #endif //mainwads++; // music.dta - mainwads++; // music.kart + //mainwads++; // music.kart #endif //ifndef DEVELOP mainwadstally = packetsizetally; From 888b5056d7830f953bd1835ede4aad4cd7fcede1 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 4 Jan 2019 19:55:05 -0500 Subject: [PATCH 2/2] Clean up the comments a bit --- src/d_main.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 3d5c7bfa..3bb49a59 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1242,6 +1242,7 @@ void D_SRB2Main(void) #ifndef DEVELOP // md5s last updated 12/14/14 // Check MD5s of autoloaded files + // Note:Do not add any files that ignore MD5! W_VerifyFileMD5(mainwads, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad #ifdef USE_PATCH_DTA mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_DTA); // patch.dta @@ -1250,14 +1251,9 @@ void D_SRB2Main(void) mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_KART); // textures.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_KART); // chars.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART); // maps.kart - //mainwads++; //W_VerifyFileMD5(5, ASSET_HASH_SOUNDS_KART); -- sounds.kart - doesn't trigger modifiedgame, doesn't need an MD5...? #ifdef USE_PATCH_KART mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_KART); // patch.kart #endif - //mainwads++; // music.dta - //mainwads++; // music.kart - // don't check music.dta or kart because people like to modify it, and it doesn't matter if they do - // ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for. #else #ifdef USE_PATCH_DTA mainwads++; // patch.dta @@ -1266,12 +1262,9 @@ void D_SRB2Main(void) mainwads++; // textures.kart mainwads++; // chars.kart mainwads++; // maps.kart - //mainwads++; // sounds.kart #ifdef USE_PATCH_KART mainwads++; // patch.kart #endif - //mainwads++; // music.dta - //mainwads++; // music.kart #endif //ifndef DEVELOP mainwadstally = packetsizetally;