[Scummvm-cvs-logs] scummvm master -> 27e9aebbb1c83dbf0a2675116087b477284c4801

[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:
27e9aebbb1 SHERLOCK: 3DO: Further alignment between portraits and talk text


Commit: 27e9aebbb1c83dbf0a2675116087b477284c4801
    https://github.com/scummvm/scummvm/commit/27e9aebbb1c83dbf0a2675116087b477284c4801
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-11T21:41:10-04:00

Commit Message:
SHERLOCK: 3DO: Further alignment between portraits and talk text

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



diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 5241f7b..848502e 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -528,6 +528,11 @@ OpcodeReturn ScalpelTalk::cmdSummonWindow(const byte *&str) {
 	return RET_SUCCESS;
 }
 
+void ScalpelTalk::loadTalkFile(const Common::String &filename) {
+	Talk::loadTalkFile(filename);
+	_3doSpeechIndex = 0;
+}
+
 void ScalpelTalk::talkWait(const byte *&str) {
 	UserInterface &ui = *_vm->_ui;
 	bool pauseFlag = _pauseFlag;
diff --git a/engines/sherlock/scalpel/scalpel_talk.h b/engines/sherlock/scalpel/scalpel_talk.h
index 025c8ed..66b6f98 100644
--- a/engines/sherlock/scalpel/scalpel_talk.h
+++ b/engines/sherlock/scalpel/scalpel_talk.h
@@ -84,6 +84,12 @@ public:
 	virtual ~ScalpelTalk() {}
 
 	/**
+	 * Opens the talk file 'talk.tlk' and searches the index for the specified
+	 * conversation. If found, the data for that conversation is loaded
+	 */
+	virtual void loadTalkFile(const Common::String &filename);
+
+	/**
 	 * Called whenever a conversation or item script needs to be run. For standard conversations,
 	 * it opens up a description window similar to how 'talk' does, but shows a 'reply' directly
 	 * instead of waiting for a statement option.
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index aed7df8..be8f1aa 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1666,9 +1666,6 @@ void ScalpelUserInterface::doTalkControl() {
 				sound._speechPlaying = false;
 			}
 
-			if (IS_3DO)
-				// Trigger to play 3DO movie
-				talk.talk3DOMovieTrigger(0);
 
 			talk.waitForMore(talk._statements[_selector]._statement.size());
 			if (talk._talkToAbort)
diff --git a/engines/sherlock/talk.h b/engines/sherlock/talk.h
index 3bbb326..f354c28 100644
--- a/engines/sherlock/talk.h
+++ b/engines/sherlock/talk.h
@@ -308,7 +308,7 @@ public:
 	 * Opens the talk file 'talk.tlk' and searches the index for the specified
 	 * conversation. If found, the data for that conversation is loaded
 	 */
-	void loadTalkFile(const Common::String &filename);
+	virtual void loadTalkFile(const Common::String &filename);
 
 	/**
 	 * Push the sequence of a background object that's an NPC that needs to be