diff options
| author | Travis Howell | 2006-03-03 00:45:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-03 00:45:27 +0000 |
| commit | ab0cf121c992732720c325db96114592534f1ca2 (patch) | |
| tree | 3603293ed3bc197ecd15d8f6162e98f362e501bf /engines/scumm/he/sound_he.cpp | |
| parent | 7423394bddd3e00177fb43819dc5da22e49de682 (diff) | |
| download | scummvm-rg350-ab0cf121c992732720c325db96114592534f1ca2.tar.gz scummvm-rg350-ab0cf121c992732720c325db96114592534f1ca2.tar.bz2 scummvm-rg350-ab0cf121c992732720c325db96114592534f1ca2.zip | |
Always use music sound type, for music in 3DO versions of HE games
svn-id: r21019
Diffstat (limited to 'engines/scumm/he/sound_he.cpp')
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index a2c4a2c048..fb621954f9 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -336,10 +336,10 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) { byte flags = Audio::Mixer::FLAG_UNSIGNED; Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType; - if (soundID == 1) - type = Audio::Mixer::kSpeechSoundType; - else if (soundID > _vm->_numSounds) + if (soundID > _vm->_numSounds) type = Audio::Mixer::kMusicSoundType; + else if (soundID == 1) + type = Audio::Mixer::kSpeechSoundType; if (heChannel == -1) @@ -492,7 +492,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) { _vm->_mixer->stopID(_currentMusic); _currentMusic = soundID; - _vm->_mixer->playRaw(NULL, ptr + 8, size, rate, flags, soundID, 255, 0, 0,0, type); + _vm->_mixer->playRaw(NULL, ptr + 8, size, rate, flags, soundID, 255, 0, 0,0, Audio::Mixer::kMusicSoundType); } else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) { if (_vm->_imuse) { |