zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Blood: unpositioned sounds must be limited to one per channel.

This commit is contained in:
Christoph Oelckers 2021-05-16 11:51:51 +02:00
parent 98ca5d5db4
commit 60fe1d32fb
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/common/audio/sound/s_sound.cpp
View File

@ -929,12 +929,7 @@ void SoundEngine::StopSound(int sourcetype, const void* actor, int channel, int
void SoundEngine::StopActorSounds(int sourcetype, const void* actor, int chanmin, int chanmax) void SoundEngine::StopActorSounds(int sourcetype, const void* actor, int chanmin, int chanmax)
{ {
const bool all = (chanmin == 0 && chanmax == 0); const bool all = (chanmin == 0 && chanmax == 0);
if (!all && chanmax > chanmin) if (chanmax < chanmin) std::swap(chanmin, chanmax);
{
const int temp = chanmax;
chanmax = chanmin;
chanmin = temp;
}
FSoundChan* chan = Channels; FSoundChan* chan = Channels;
while (chan != nullptr) while (chan != nullptr)

8
source/core/gamecontrol.cpp
View File

@ -1192,10 +1192,10 @@ void S_SetSoundPaused(int state)
if (paused == 0) if (paused == 0)
{ {
S_ResumeSound(true); S_ResumeSound(true);
if (GSnd != nullptr) }
{ if (GSnd != nullptr)
GSnd->SetInactive(SoundRenderer::INACTIVE_Active); {
} GSnd->SetInactive(SoundRenderer::INACTIVE_Active);
} }
} }
else else

1
source/games/blood/src/sound.cpp
View File

@ -181,6 +181,7 @@ void sndStartSample(unsigned int nSound, int nVolume, int nChannel, bool bLoop,
else nVolume = 255; else nVolume = 255;
} }
if (bLoop) chanflags |= CHANF_LOOP; if (bLoop) chanflags |= CHANF_LOOP;
soundEngine->StopActorSounds(SOURCE_None, nullptr, nChannel + 1, nChannel + 1);
soundEngine->StartSound(SOURCE_None, nullptr, nullptr, (nChannel + 1), chanflags, snd, nVolume / 255.f, ATTN_NONE); soundEngine->StartSound(SOURCE_None, nullptr, nullptr, (nChannel + 1), chanflags, snd, nVolume / 255.f, ATTN_NONE);
} }
} }