diff options
| author | Paul Gilbert | 2015-08-07 06:52:58 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-07 06:52:58 -0400 |
| commit | 2696be83c04ddb5042091a2c52db9ed9f4a4e439 (patch) | |
| tree | 3260670b1d7a5cfd20a602eee38114887f139411 /engines/sherlock/scalpel/scalpel_talk.cpp | |
| parent | b573e0cf7af9bf194888a132ebe1a96d8deb9d25 (diff) | |
| download | scummvm-rg350-2696be83c04ddb5042091a2c52db9ed9f4a4e439.tar.gz scummvm-rg350-2696be83c04ddb5042091a2c52db9ed9f4a4e439.tar.bz2 scummvm-rg350-2696be83c04ddb5042091a2c52db9ed9f4a4e439.zip | |
SHERLOCK: SS: Cleaned up handling of 3DO portrait playback
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_talk.cpp')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
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; |