From 247e6bcc26261fbe1b04b274f94095e933870aef Mon Sep 17 00:00:00 2001 From: terminx Date: Sun, 20 Oct 2019 02:40:01 +0000 Subject: [PATCH] Revert a copy/paste error fix in the AdLib code because the fixed version doesn't work right with the timbres Blood ships with git-svn-id: https://svn.eduke32.com/eduke32@8232 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/audiolib/src/driver_adlib.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/audiolib/src/driver_adlib.cpp b/source/audiolib/src/driver_adlib.cpp index b0ddf1aab..e9b0ff94f 100644 --- a/source/audiolib/src/driver_adlib.cpp +++ b/source/audiolib/src/driver_adlib.cpp @@ -350,8 +350,7 @@ static void AL_SetVoiceVolume(int const voice) int const slot = slotVoice[voc][0]; // amplitude - auto t2 = (uint32_t)VoiceLevel[slot][port] * (velocity + 0x80); - t2 = (Channel[channel].Volume * t2) >> 15; + auto t2 = (Channel[channel].Volume * t1) >> 15; volume = t2 ^ 63; volume |= (uint32_t)VoiceKsl[slot][port]; @@ -392,8 +391,7 @@ static void AL_SetVoiceVolume(int const voice) if (timbre->Feedback & 0x01) { // amplitude - auto t2 = (uint32_t)VoiceLevel[slot][port] * (velocity + 0x80); - t2 = (Channel[channel].Volume * t2) >> 15; + auto t2 = (Channel[channel].Volume * t1) >> 15; int const slot = slotVoice[voc][0];