From d79c6c1c0a3dd57b5915a3fdeb7ae9aee9dad0a0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 30 Dec 2019 09:09:08 +0100 Subject: [PATCH] - fixed: A_StartSound was still masking the sound channel value for checking if it plays something. --- src/sound/s_doomsound.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sound/s_doomsound.cpp b/src/sound/s_doomsound.cpp index d2f551597..12ec59cf1 100644 --- a/src/sound/s_doomsound.cpp +++ b/src/sound/s_doomsound.cpp @@ -470,14 +470,14 @@ void A_StartSound(AActor *self, int soundid, int channel, int flags, double volu { if (!looping) { - if (!(flags & CHANF_NOSTOP) || !S_IsActorPlayingSomething(self, channel & 7, soundid)) + if (!(flags & CHANF_NOSTOP) || !S_IsActorPlayingSomething(self, channel, soundid)) { S_PlaySoundPitch(self, channel, EChanFlags::FromInt(flags), soundid, (float)volume, (float)attenuation, local, (float)pitch); } } else { - if (!S_IsActorPlayingSomething(self, channel & 7, soundid)) + if (!S_IsActorPlayingSomething(self, channel, soundid)) { S_PlaySoundPitch(self, channel, EChanFlags::FromInt(flags) | CHANF_LOOP, soundid, (float)volume, (float)attenuation, local, (float)pitch); }