Autoload sonicitems.wad for convenience

This commit is contained in:
SeventhSentinel 2018-06-26 12:05:54 -04:00
parent 578489fb5e
commit 833843cbc1

View file

@ -930,17 +930,19 @@ static void IdentifyVersion(void)
// Add the weapons // Add the weapons
//D_AddFile(va(pandf,srb2waddir,"rings.dta")); //D_AddFile(va(pandf,srb2waddir,"rings.dta"));
#ifdef USE_PATCH_DTA
// Add our crappy patches to fix our bugs
D_AddFile(va(pandf,srb2waddir,"patch.dta"));
#endif
// SRB2kart - Add graphics (temp) // The command for md5 checks is "W_VerifyFileMD5" - looks for ASSET_HASH_SRB2_SRB in config.h.in // SRB2kart - Add graphics (temp) // The command for md5 checks is "W_VerifyFileMD5" - looks for ASSET_HASH_SRB2_SRB in config.h.in
D_AddFile(va(pandf,srb2waddir,"gfx.kart")); D_AddFile(va(pandf,srb2waddir,"gfx.kart"));
D_AddFile(va(pandf,srb2waddir,"chars.kart")); D_AddFile(va(pandf,srb2waddir,"chars.kart"));
D_AddFile(va(pandf,srb2waddir,"maps.kart")); D_AddFile(va(pandf,srb2waddir,"maps.kart"));
D_AddFile(va(pandf,srb2waddir,"sounds.kart")); D_AddFile(va(pandf,srb2waddir,"sounds.kart"));
#ifdef USE_PATCH_DTA
// Add our crappy patches to fix our bugs
D_AddFile(va(pandf,srb2waddir,"patch.dta"));
#endif
D_AddFile(va(pandf,srb2waddir,"sonicitems.wad")); // Temporary. Remove before merging into master.
#if !defined (HAVE_SDL) || defined (HAVE_MIXER) #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
{ {
#if defined (DC) && 0 #if defined (DC) && 0
@ -1253,7 +1255,7 @@ void D_SRB2Main(void)
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for. // ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
#endif //ifndef DEVELOP #endif //ifndef DEVELOP
mainwads = 4; // there are 4 wads not to unload mainwads = 5; // there are 4 wads not to unload (5 with temp sonicitems.wad)
#ifdef USE_PATCH_DTA #ifdef USE_PATCH_DTA
++mainwads; // patch.dta adds one more ++mainwads; // patch.dta adds one more
#endif #endif