Revert "Merge pull request #5190 from raven02/patch-32"

This reverts commit aef180259a, reversing
changes made to d69f02dea0.
This commit is contained in:
Henrik Rydgård 2014-01-23 20:57:39 +01:00
parent aef180259a
commit 6c5165e505

View file

@ -394,10 +394,10 @@ void SasVoice::ReadSamples(s16 *output, int numSamples) {
void SasInstance::MixVoice(SasVoice &voice) {
switch (voice.type) {
case VOICETYPE_VAG:
if (!voice.vagAddr)
if (voice.type == VOICETYPE_VAG && !voice.vagAddr)
break;
case VOICETYPE_PCM:
if (!voice.pcmAddr)
if (voice.type == VOICETYPE_PCM && !voice.pcmAddr)
break;
default:
// Load resample history (so we can use a wide filter)