From 19f9860c1122592edd8a5e8d9a58a4fa303f0030 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 16 Feb 2020 16:52:02 +0100
Subject: [PATCH] - fixed Blood's sfxKill3DSound function checking the wrong
ID.
---
source/blood/src/sfx.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/source/blood/src/sfx.cpp b/source/blood/src/sfx.cpp
index abbd1f024..f0b8cd1a5 100644
--- a/source/blood/src/sfx.cpp
+++ b/source/blood/src/sfx.cpp
@@ -215,9 +215,10 @@ void sfxKill3DSound(spritetype *pSprite, int a2, int a3)
return;
if (a2 >= 0) a2++;
+ auto sid = soundEngine->FindSoundByResID(a3);
soundEngine->EnumerateChannels([=](FSoundChan* channel)
{
- if (channel->SourceType == SOURCE_Actor && channel->Source == pSprite && (a2 < 0 || a2 == channel->EntChannel) && (a3 < 0 || a3 == channel->OrgID))
+ if (channel->SourceType == SOURCE_Actor && channel->Source == pSprite && (a2 < 0 || a2 == channel->EntChannel) && (a3 < 0 || sid == channel->OrgID))
{
soundEngine->StopChannel(channel);
}