diff options
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/talk.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 2d1a8a9775..2dca5a59a0 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 fa00b9d715..950905084b 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); |