From ba111d42ca01570c63fb9aa32c9ab06dcda89589 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 26 Nov 2018 00:24:11 -0500
Subject: [PATCH] Last minute changes.
---
src/s_sound.c | 6 +++---
src/sdl/i_system.c | 7 ++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/s_sound.c b/src/s_sound.c
index 2ecd47254..0961a4427 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -100,9 +100,9 @@ static consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL
consvar_t cv_resetmusic = {"resetmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
// Sound system toggles, saved into the config
-consvar_t cv_gamedigimusic = {"gamedigimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gamemidimusic = {"gamemidimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gamesounds = {"gamesounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gamedigimusic = {"digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
#define S_MAX_VOLUME 127
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index e7cb28f2d..2b35ce8b8 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2076,11 +2076,8 @@ void I_StartupTimer(void)
void I_Sleep(void)
{
- if (dedicated)
- SDL_Delay(15);
- else
- if (cv_sleep.value != -1)
- SDL_Delay(cv_sleep.value);
+ if (cv_sleep.value != -1)
+ SDL_Delay(cv_sleep.value);
}
INT32 I_StartupSystem(void)
--
GitLab