lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Autoload music_new.dta if it exists

Browse source 
Same no non-music lump requirement as music.dta, and is ignored with no error if music_new.dta doesn't exist
(should hopefully make playing around with music easier)
This commit is contained in:
Inuyasha 2016-10-23 03:44:51 -07:00
parent 8c23168061
commit 9d5e0b314b
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_main.c
View file

@ -859,6 +859,18 @@ static void IdentifyVersion(void)
I_Error("File %s has been modified with non-music lumps",musicfile); I_Error("File %s has been modified with non-music lumps",musicfile);
} }
#endif #endif
#if 1 // This section can be deleted when music_new is merged with music.dta
{
const char *musicfile = "music_new.dta";
const char *musicpath = va(pandf,srb2waddir,musicfile);
int ms = W_VerifyNMUSlumps(musicpath); // Don't forget the music!
if (ms == 1)
D_AddFile(musicpath);
else if (ms == 0)
I_Error("File %s has been modified with non-music lumps",musicfile);
}
#endif
} }
/* ======================================================================== */ /* ======================================================================== */