aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-08-11 21:03:58 -0400
committerPaul Gilbert2015-08-11 21:03:58 -0400
commit149b31c310e71451b4124feeb30213e6627129a0 (patch)
tree00fa681b39d4fa5a368999059e08dc1b50c02303
parent6dd78a703f0ba89d51a4572ca90ab4783cc8fb61 (diff)
downloadscummvm-rg350-149b31c310e71451b4124feeb30213e6627129a0.tar.gz
scummvm-rg350-149b31c310e71451b4124feeb30213e6627129a0.tar.bz2
scummvm-rg350-149b31c310e71451b4124feeb30213e6627129a0.zip
SHERLOCK: RT: Fix playing all the voice files in a conversation
-rw-r--r--engines/sherlock/talk.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a998c58605..d6194ec5f9 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -928,7 +928,8 @@ int Talk::waitForMore(int delay) {
events.setCursor(ui._lookScriptFlag ? MAGNIFY : ARROW);
}
- if (sound._speechOn && !sound._talkSoundFile.empty()) {
+ // Handle playing any speech associated with the text being displayed
+ if (IS_ROSE_TATTOO && sound._speechOn) {
sound.playSpeech(sound._talkSoundFile);
sound._talkSoundFile.setChar(sound._talkSoundFile.lastChar() + 1, sound._talkSoundFile.size() - 1);
}
@@ -1002,7 +1003,7 @@ int Talk::waitForMore(int delay) {
}
- sound._speechOn = false;
+ sound.stopSpeech();
events.setCursor(_talkToAbort ? ARROW : oldCursor);
events._pressed = events._released = false;