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

Merge branch 'fix-music-sound-config' into 'master'

Browse source 
musicvolume, soundvolume: do not unmute during config loading

Closes #897

See merge request KartKrew/Kart!1817
This commit is contained in:
James R. 2024-01-11 22:38:46 +00:00
commit 458158d16a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/s_sound.c
View file

@ -14,6 +14,7 @@
#include "doomdef.h" #include "doomdef.h"
#include "doomstat.h" #include "doomstat.h"
#include "command.h" #include "command.h"
#include "console.h" // con_startup
#include "g_game.h" #include "g_game.h"
#include "m_argv.h" #include "m_argv.h"
#include "r_main.h" // R_PointToAngle2() used to calc stereo sep. #include "r_main.h" // R_PointToAngle2() used to calc stereo sep.
@ -2553,7 +2554,7 @@ void MasterVolume_OnChange(void)
void DigMusicVolume_OnChange(void); void DigMusicVolume_OnChange(void);
void DigMusicVolume_OnChange(void) void DigMusicVolume_OnChange(void)
{ {
if (!cv_gamedigimusic.value) if (!cv_gamedigimusic.value && !con_startup)
{ {
CV_SetValue(&cv_gamedigimusic, 1); CV_SetValue(&cv_gamedigimusic, 1);
} }
@ -2563,7 +2564,7 @@ void DigMusicVolume_OnChange(void)
void SoundVolume_OnChange(void); void SoundVolume_OnChange(void);
void SoundVolume_OnChange(void) void SoundVolume_OnChange(void)
{ {
if (!cv_gamesounds.value) if (!cv_gamesounds.value && !con_startup)
{ {
CV_SetValue(&cv_gamesounds, 1); CV_SetValue(&cv_gamesounds, 1);
} }