diff options
| author | Paul Gilbert | 2015-08-21 21:37:29 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-21 21:37:29 -0400 |
| commit | 6862c9dd9bc03b0ce425c71c62f203d9ae996e8a (patch) | |
| tree | 43c9a75c0c2f863d1ce4bcf1484dd5999b0c911f /engines/sherlock/scalpel | |
| parent | 2f077dba80bb35555bde3360d3a43e4f49c7bcb2 (diff) | |
| download | scummvm-rg350-6862c9dd9bc03b0ce425c71c62f203d9ae996e8a.tar.gz scummvm-rg350-6862c9dd9bc03b0ce425c71c62f203d9ae996e8a.tar.bz2 scummvm-rg350-6862c9dd9bc03b0ce425c71c62f203d9ae996e8a.zip | |
SHERLOCK: 3DO: Cleanup of conversation message playback
The changes remove most of the hardcoding that was in place for showing
the conversation movies, and have them triggered like the Rose Tattoo
speech files. It will still need some work to hook it into our new
voice playback, though, so text dialogs are closed at the right time
Diffstat (limited to 'engines/sherlock/scalpel')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 6f98a17d1d..9b38a95c64 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -540,10 +540,10 @@ void ScalpelTalk::nothingToSay() { error("Character had no talk options available"); } -void ScalpelTalk::switchSpeaker(int subIndex) { +void ScalpelTalk::switchSpeaker() { // If it's the 3DO, pass on to start the actor's conversation movie if (IS_3DO) - talk3DOMovieTrigger(subIndex); + talk3DOMovieTrigger(_3doSpeechIndex++); } void ScalpelTalk::talk3DOMovieTrigger(int subIndex) { diff --git a/engines/sherlock/scalpel/scalpel_talk.h b/engines/sherlock/scalpel/scalpel_talk.h index 9e07b26dc8..4d13258985 100644 --- a/engines/sherlock/scalpel/scalpel_talk.h +++ b/engines/sherlock/scalpel/scalpel_talk.h @@ -68,7 +68,7 @@ protected: /** * Called when the active speaker is switched */ - virtual void switchSpeaker(int subIndex); + virtual void switchSpeaker(); /** * Called when a character being spoken to has no talk options to display |