diff options
| author | Strangerke | 2013-06-26 23:11:34 +0200 |
|---|---|---|
| committer | Strangerke | 2013-06-26 23:11:34 +0200 |
| commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
| tree | 9880f0c496263ffb6928248d495ce4172dabed18 /engines/gob/sound/adlib.cpp | |
| parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
| parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
| download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip | |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'engines/gob/sound/adlib.cpp')
| -rw-r--r-- | engines/gob/sound/adlib.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp index d9fc362547..2bf7f266a1 100644 --- a/engines/gob/sound/adlib.cpp +++ b/engines/gob/sound/adlib.cpp @@ -375,8 +375,10 @@ void AdLib::setVoiceTimbre(uint8 voice, const uint16 *params) { const int voicePerc = voice - kVoiceBaseDrum; if (!isPercussionMode() || (voice < kVoiceBaseDrum)) { - setOperatorParams(kVoiceMelodyOperator[0][voice], params0, waves[0]); - setOperatorParams(kVoiceMelodyOperator[1][voice], params1, waves[1]); + if (voice < kMelodyVoiceCount) { + setOperatorParams(kVoiceMelodyOperator[0][voice], params0, waves[0]); + setOperatorParams(kVoiceMelodyOperator[1][voice], params1, waves[1]); + } } else if (voice == kVoiceBaseDrum) { setOperatorParams(kVoicePercussionOperator[0][voicePerc], params0, waves[0]); setOperatorParams(kVoicePercussionOperator[1][voicePerc], params1, waves[1]); |