aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-02-19 20:07:51 -0500
committerPaul Gilbert2016-02-19 20:07:51 -0500
commit8706f8c28836b171886e5f0092a773863a2fedd3 (patch)
tree7fdbfa1b5c39689328fea4a5c31b73f8d323ffa7
parent12fadf713d867653cd871fa1788358b63a29aee2 (diff)
downloadscummvm-rg350-8706f8c28836b171886e5f0092a773863a2fedd3.tar.gz
scummvm-rg350-8706f8c28836b171886e5f0092a773863a2fedd3.tar.bz2
scummvm-rg350-8706f8c28836b171886e5f0092a773863a2fedd3.zip
SHERLOCK: RT: Fix violin not playing all the way through
-rw-r--r--engines/sherlock/sound.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 5a9f0c2ec6..e5b1099123 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -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);