[Scummvm-cvs-logs] scummvm master -> 149b31c310e71451b4124feeb30213e6627129a0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
149b31c310 SHERLOCK: RT: Fix playing all the voice files in a conversation


Commit: 149b31c310e71451b4124feeb30213e6627129a0
    https://github.com/scummvm/scummvm/commit/149b31c310e71451b4124feeb30213e6627129a0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-11T21:03:58-04:00

Commit Message:
SHERLOCK: RT: Fix playing all the voice files in a conversation

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a998c58..d6194ec 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;