commit 7f03c58cbf63a63bb5a105e06f9f675bf60adfc7
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Oct 27 16:31:44 2018 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Oct 27 16:31:44 2018 -0400
music: Add argument to disable substitute music.
This mirrors the -nomusic command line argument by just disabling the
substitute music.
---
src/i_sound.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/i_sound.c b/src/i_sound.c
index 06e4388b..468b2da7 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -195,7 +195,7 @@ static void InitMusicModule(void)
void I_InitSound(boolean use_sfx_prefix)
{
- boolean nosound, nosfx, nomusic;
+ boolean nosound, nosfx, nomusic, nomusicpacks;
//!
// @vanilla
@@ -221,6 +221,13 @@ void I_InitSound(boolean use_sfx_prefix)
nomusic = M_CheckParm("-nomusic") > 0;
+ //!
+ //
+ // Disable substitution music packs.
+ //
+
+ nomusicpacks = M_ParmExists("-nomusicpacks");
+
// Auto configure the music pack directory.
M_SetMusicPackDir();
@@ -251,7 +258,7 @@ void I_InitSound(boolean use_sfx_prefix)
}
// We may also have substitute MIDIs we can load.
- if (music_module != NULL)
+ if (!nomusicpacks && music_module != NULL)
{
music_packs_active = music_pack_module.Init();
}