From 9d5e0b314b83c1ae1698ce3266b003e09c6ea2d4 Mon Sep 17 00:00:00 2001 From: Inuyasha Date: Sun, 23 Oct 2016 03:44:51 -0700 Subject: [PATCH] Autoload music_new.dta if it exists 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) --- src/d_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/d_main.c b/src/d_main.c index c5f0d0b39..0dfaceab8 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -859,6 +859,18 @@ static void IdentifyVersion(void) I_Error("File %s has been modified with non-music lumps",musicfile); } #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 } /* ======================================================================== */