[Scummvm-cvs-logs] scummvm master -> 2bf1ff690b08ce1bcfe05ae635d28b1bcf59466d

[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:
2bf1ff690b SHERLOCK: 3DO: Fix portrait display when leaving Baker Street


Commit: 2bf1ff690b08ce1bcfe05ae635d28b1bcf59466d
    https://github.com/scummvm/scummvm/commit/2bf1ff690b08ce1bcfe05ae635d28b1bcf59466d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-12T15:19:59-04:00

Commit Message:
SHERLOCK: 3DO: Fix portrait display when leaving Baker Street

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.cpp
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 2d1a8a9..2dca5a5 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -609,7 +609,6 @@ bool ScalpelTalk::talk3DOMovieTrigger(int subIndex) {
 		if (scriptSelector >= 0) {
 			// Script-selected dialog
 			selector = scriptSelector;
-			subIndex--; // for scripts we adjust subIndex, b/c we won't get called from doTalkControl()
 		} else {
 			warning("talk3DOMovieTrigger: unable to find selector");
 			return true;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index fa00b9d..9509050 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -569,8 +569,6 @@ void Talk::loadTalkFile(const Common::String &filename) {
 	// Create the base of the sound filename used for talking in Rose Tattoo
 	if (IS_ROSE_TATTOO && _scriptMoreFlag != 1)
 		sound._talkSoundFile = Common::String(filename.c_str(), filename.c_str() + 7) + ".";
-	else if (IS_3DO)
-		_3doSpeechIndex = 1;
 
 	// Open the talk file for reading
 	Common::SeekableReadStream *talkStream = res.load(talkFile);