zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Exhumed's sound module did not check the 'sound disabled' CVAR.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-26 22:26:28 +02:00
parent b4df1fd662
commit 78a024a50c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/exhumed/src/sound.cpp
View file

@ -282,6 +282,7 @@ void BendAmbientSound(void)
void PlayLocalSound(short nSound, short nRate, bool unattached, EChanFlags cflags) void PlayLocalSound(short nSound, short nRate, bool unattached, EChanFlags cflags)
{ {
if (!SoundEnabled()) return;
if (nSound < 0 || nSound >= kMaxSounds || !soundEngine->isValidSoundId(nSound + 1)) if (nSound < 0 || nSound >= kMaxSounds || !soundEngine->isValidSoundId(nSound + 1))
{ {
Printf("PlayLocalSound: Invalid sound nSound == %i, nRate == %i\n", nSound, nRate); Printf("PlayLocalSound: Invalid sound nSound == %i, nRate == %i\n", nSound, nRate);
@ -342,6 +343,7 @@ int nSwirlyFrames;
void StartSwirly(int nActiveSound) void StartSwirly(int nActiveSound)
{ {
if (!SoundEnabled()) return;
auto &swirly = swirlysources[nActiveSound]; auto &swirly = swirlysources[nActiveSound];
short nPitch = nNextFreq - RandomSize(9); short nPitch = nNextFreq - RandomSize(9);
@ -398,6 +400,7 @@ void UpdateSwirlies()
void SoundBigEntrance(void) void SoundBigEntrance(void)
{ {
if (!SoundEnabled()) return;
StopAllSounds(); StopAllSounds();
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
@ -548,6 +551,7 @@ short soundsect;
void PlayFX2(unsigned short nSound, short nSprite, int sectf) void PlayFX2(unsigned short nSound, short nSprite, int sectf)
{ {
if (!SoundEnabled()) return;
if ((nSound&0x1ff) >= kMaxSounds || !soundEngine->isValidSoundId((nSound & 0x1ff)+1)) if ((nSound&0x1ff) >= kMaxSounds || !soundEngine->isValidSoundId((nSound & 0x1ff)+1))
{ {
Printf("PlayFX2: Invalid sound nSound == %i, nSprite == %i\n", nSound, nSprite); Printf("PlayFX2: Invalid sound nSound == %i, nSprite == %i\n", nSound, nSprite);
@ -664,6 +668,7 @@ void PlayFXAtXYZ(unsigned short ax, int x, int y, int z, int nSector)
void CheckAmbience(short nSector) void CheckAmbience(short nSector)
{ {
if (!SoundEnabled()) return;
if (SectSound[nSector] != -1) if (SectSound[nSector] != -1)
{ {
short nSector2 = SectSoundSect[nSector]; short nSector2 = SectSoundSect[nSector];
@ -710,7 +715,7 @@ void CheckAmbience(short nSector)
void UpdateCreepySounds() void UpdateCreepySounds()
{ {
if (currentLevel->levelNumber == 20 || nFreeze) if (currentLevel->levelNumber == 20 || nFreeze || !SoundEnabled())
return; return;
spritetype* pSprite = &sprite[PlayerList[nLocalPlayer].nSprite]; spritetype* pSprite = &sprite[PlayerList[nLocalPlayer].nSprite];
nCreepyTimer--; nCreepyTimer--;