From cf01e820c45a9b680f61771cbbca991787fd6a9c Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 25 Nov 2018 22:39:11 -0500
Subject: [PATCH] Take the command line params into account Really I'm just
making it return early if either of the parms are used.
---
src/d_main.c | 2 +-
src/s_sound.c | 13 +++++++++++++
src/sdl/i_system.c | 7 +++++--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 9b34ed941..23835136a 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1235,7 +1235,7 @@ void D_SRB2Main(void)
else
{
if (M_CheckParm("-nomidimusic"))
- midi_disabled = true; ; // WARNING: DOS version initmusic in I_StartupSound
+ midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
if (M_CheckParm("-nodigmusic"))
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
}
diff --git a/src/s_sound.c b/src/s_sound.c
index 6c1e3f2cb..2ecd47254 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1613,6 +1613,9 @@ static void Command_RestartAudio_f(void)
void GameSounds_OnChange(void)
{
+ if (M_CheckParm("-nosound"))
+ return;
+
if (sound_disabled)
{
sound_disabled = false;
@@ -1628,6 +1631,11 @@ void GameSounds_OnChange(void)
void GameDigiMusic_OnChange(void)
{
+ if (M_CheckParm("-nomusic"))
+ return;
+ else if (M_CheckParm("-nodigmusic"))
+ return;
+
if (digital_disabled)
{
digital_disabled = false;
@@ -1665,6 +1673,11 @@ void GameDigiMusic_OnChange(void)
void GameMIDIMusic_OnChange(void)
{
+ if (M_CheckParm("-nomusic"))
+ return;
+ else if (M_CheckParm("-nomidimusic"))
+ return;
+
if (midi_disabled)
{
midi_disabled = false;
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 2b35ce8b8..e7cb28f2d 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2076,8 +2076,11 @@ void I_StartupTimer(void)
void I_Sleep(void)
{
- if (cv_sleep.value != -1)
- SDL_Delay(cv_sleep.value);
+ if (dedicated)
+ SDL_Delay(15);
+ else
+ if (cv_sleep.value != -1)
+ SDL_Delay(cv_sleep.value);
}
INT32 I_StartupSystem(void)
--
GitLab