diff options
| author | Christopher Page | 2008-07-18 01:46:33 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-18 01:46:33 +0000 |
| commit | 45d24a58f9f87c02a56db08773cbfd8d1ce7d586 (patch) | |
| tree | edfc00dc0b74f0004bcd01be4d45bec1f7ddd8af /engines/queen/sound.cpp | |
| parent | 437b9ee281587fe97e3e21c0989dfe620f96d2c9 (diff) | |
| download | scummvm-rg350-45d24a58f9f87c02a56db08773cbfd8d1ce7d586.tar.gz scummvm-rg350-45d24a58f9f87c02a56db08773cbfd8d1ce7d586.tar.bz2 scummvm-rg350-45d24a58f9f87c02a56db08773cbfd8d1ce7d586.zip | |
QUEEN sound settings work with the GMM
svn-id: r33093
Diffstat (limited to 'engines/queen/sound.cpp')
| -rw-r--r-- | engines/queen/sound.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 0801d72ca4..d17a73c90b 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -224,7 +224,6 @@ void PCSound::playSpeech(const char *base) { void PCSound::setVolume(int vol) { Sound::setVolume(vol); - _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol); _music->setVolume(vol); } @@ -275,7 +274,10 @@ 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, 11025, flags); + if (soundHandle == &_speechHandle) + _mixer->playRaw(Audio::Mixer::kSpeechSoundType, soundHandle, sound, size, 11025, flags); + else + _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags); } } |