stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mainwads-fix' into 'next'

Browse source 
Don't increment mainwads for sounds or music.kart

See merge request KartKrew/Kart-Public!12
This commit is contained in:
Sal 2019-01-04 20:01:57 -05:00
commit 9e09d8cb8c
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/d_main.c
View file

@ -1242,6 +1242,7 @@ void D_SRB2Main(void)
#ifndef DEVELOP // md5s last updated 12/14/14 #ifndef DEVELOP // md5s last updated 12/14/14
// Check MD5s of autoloaded files // 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 W_VerifyFileMD5(mainwads, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad
#ifdef USE_PATCH_DTA #ifdef USE_PATCH_DTA
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_DTA); // 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_TEXTURES_KART); // textures.kart
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_KART); // chars.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_KART); // chars.kart
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART); // maps.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 #ifdef USE_PATCH_KART
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_KART); // patch.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_KART); // patch.kart
#endif #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 #else
#ifdef USE_PATCH_DTA #ifdef USE_PATCH_DTA
mainwads++; // patch.dta mainwads++; // patch.dta
@ -1266,12 +1262,9 @@ void D_SRB2Main(void)
mainwads++; // textures.kart mainwads++; // textures.kart
mainwads++; // chars.kart mainwads++; // chars.kart
mainwads++; // maps.kart mainwads++; // maps.kart
mainwads++; // sounds.kart
#ifdef USE_PATCH_KART #ifdef USE_PATCH_KART
mainwads++; // patch.kart mainwads++; // patch.kart
#endif #endif
//mainwads++; // music.dta
mainwads++; // music.kart
#endif //ifndef DEVELOP #endif //ifndef DEVELOP
mainwadstally = packetsizetally; mainwadstally = packetsizetally;