diff options
| author | Max Horn | 2008-09-01 17:55:52 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-01 17:55:52 +0000 |
| commit | dcd52c1210506128ee659f3bda0bd40c85a2959e (patch) | |
| tree | 98dddd5ee6e57c2d959ba37390ec89f40aa5147e /engines/queen/sound.cpp | |
| parent | 91df44f8f6448e9adad901cd675926335d84b9db (diff) | |
| parent | 852bc9dbb750b9995d31e70f4158c97d3758c46f (diff) | |
| download | scummvm-rg350-dcd52c1210506128ee659f3bda0bd40c85a2959e.tar.gz scummvm-rg350-dcd52c1210506128ee659f3bda0bd40c85a2959e.tar.bz2 scummvm-rg350-dcd52c1210506128ee659f3bda0bd40c85a2959e.zip | |
Merging more of the GSoC 2008 RTL branch: QUEEN
svn-id: r34247
Diffstat (limited to 'engines/queen/sound.cpp')
| -rw-r--r-- | engines/queen/sound.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index d4fed86bb7..ccaac8227d 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -278,8 +278,6 @@ void PCSound::playSpeech(const char *base) { void PCSound::setVolume(int vol) { Sound::setVolume(vol); - // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume); _music->setVolume(vol); } @@ -333,7 +331,8 @@ void SBSound::playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *so if (sound) { f->read(sound, size); byte flags = Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE; - _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11840, flags); + Audio::Mixer::SoundType type = (soundHandle == &_speechHandle) ? Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType; + _mixer->playRaw(type, soundHandle, sound, size, 11840, flags); } } |