From 2696be83c04ddb5042091a2c52db9ed9f4a4e439 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 7 Aug 2015 06:52:58 -0400
Subject: SHERLOCK: SS: Cleaned up handling of 3DO portrait playback

---
 engines/sherlock/scalpel/scalpel_talk.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/sherlock/scalpel/scalpel_talk.cpp')

diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index d85820e3dc..8261304675 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -537,12 +537,13 @@ void ScalpelTalk::talkWait(const byte *&str) {
 	}
 }
 
-void ScalpelTalk::talk3DOMovieTrigger(int subIndex) {
-	if (!IS_3DO) {
-		// No 3DO? No movie!
-		return;
-	}
+void ScalpelTalk::switchSpeaker(int subIndex) {
+	// If it's the 3DO, pass on to start the actor's conversation movie
+	if (IS_3DO)
+		talk3DOMovieTrigger(subIndex);
+}
 
+void ScalpelTalk::talk3DOMovieTrigger(int subIndex) {
 	// Find out a few things that we need
 	int userSelector = _vm->_ui->_selector;
 	int scriptSelector = _scriptSelect;
-- 
cgit v1.2.3