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)
This commit is contained in:
parent
8c23168061
commit
9d5e0b314b
12
src/d_main.c
12
src/d_main.c
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ======================================================================== */
|
/* ======================================================================== */
|
||||||
|
|
Loading…
Reference in a new issue