diff options
Diffstat (limited to 'engines/sherlock/sound.cpp')
| -rw-r--r-- | engines/sherlock/sound.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp index 5a9f0c2ec6..0e5652d52c 100644 --- a/engines/sherlock/sound.cpp +++ b/engines/sherlock/sound.cpp @@ -72,7 +72,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) { _vm->_res->addToCache("TITLE.SND"); else { _vm->_res->addToCache("MUSIC.LIB"); - + if (IS_ROSE_TATTOO) { _vm->_res->addToCache("SOUND.LIB"); } else { @@ -120,7 +120,9 @@ byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) { } bool Sound::playSound(const Common::String &name, WaitType waitType, int priority, const char *libraryFilename) { - stopSound(); + // Scalpel has only a single sound handle, so it must be stopped before starting a new sound + if (IS_SERRATED_SCALPEL) + stopSound(); Common::String filename = formFilename(name); |