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
This commit is contained in:
terminx 2019-10-20 02:40:01 +00:00 committed by Christoph Oelckers
parent f0acbc1ca5
commit 247e6bcc26

View file

@ -350,8 +350,7 @@ static void AL_SetVoiceVolume(int const voice)
int const slot = slotVoice[voc][0]; int const slot = slotVoice[voc][0];
// amplitude // amplitude
auto t2 = (uint32_t)VoiceLevel[slot][port] * (velocity + 0x80); auto t2 = (Channel[channel].Volume * t1) >> 15;
t2 = (Channel[channel].Volume * t2) >> 15;
volume = t2 ^ 63; volume = t2 ^ 63;
volume |= (uint32_t)VoiceKsl[slot][port]; volume |= (uint32_t)VoiceKsl[slot][port];
@ -392,8 +391,7 @@ static void AL_SetVoiceVolume(int const voice)
if (timbre->Feedback & 0x01) if (timbre->Feedback & 0x01)
{ {
// amplitude // amplitude
auto t2 = (uint32_t)VoiceLevel[slot][port] * (velocity + 0x80); auto t2 = (Channel[channel].Volume * t1) >> 15;
t2 = (Channel[channel].Volume * t2) >> 15;
int const slot = slotVoice[voc][0]; int const slot = slotVoice[voc][0];