thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a "-noaudio" parm to cover "-nomusic" and "-nosound"

Browse source
This commit is contained in:
James R 2019-04-18 23:50:29 -07:00
parent 84aea5ef5b
commit 35810f9535
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/d_main.c
View file

@ -1248,16 +1248,28 @@ void D_SRB2Main(void)
{ {
CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n"); CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
} }
if (M_CheckParm("-nosound")) if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
{
sound_disabled = true; sound_disabled = true;
if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic digital_disabled = true;
midi_disabled = digital_disabled = true; midi_disabled = true;
}
else else
{ {
if (M_CheckParm("-nomidimusic")) if (M_CheckParm("-nosound"))
midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound sound_disabled = true;
if (M_CheckParm("-nodigmusic")) if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound {
digital_disabled = true;
midi_disabled = true;
}
else
{
if (M_CheckParm("-nomidimusic"))
midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
if (M_CheckParm("-nodigmusic"))
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
}
} }
I_StartupSound(); I_StartupSound();
I_InitMusic(); I_InitMusic();

6
src/s_sound.c
View file

@ -2202,7 +2202,7 @@ static void Command_RestartAudio_f(void)
void GameSounds_OnChange(void) void GameSounds_OnChange(void)
{ {
if (M_CheckParm("-nosound")) if (M_CheckParm("-nosound") || M_CheckParm("-noaudio"))
return; return;
if (sound_disabled) if (sound_disabled)
@ -2220,7 +2220,7 @@ void GameSounds_OnChange(void)
void GameDigiMusic_OnChange(void) void GameDigiMusic_OnChange(void)
{ {
if (M_CheckParm("-nomusic")) if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
return; return;
else if (M_CheckParm("-nodigmusic")) else if (M_CheckParm("-nodigmusic"))
return; return;
@ -2262,7 +2262,7 @@ void GameDigiMusic_OnChange(void)
void GameMIDIMusic_OnChange(void) void GameMIDIMusic_OnChange(void)
{ {
if (M_CheckParm("-nomusic")) if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio"))
return; return;
else if (M_CheckParm("-nomidimusic")) else if (M_CheckParm("-nomidimusic"))
return; return;