diff options
| author | Paul Gilbert | 2015-08-13 18:43:51 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-13 18:43:51 -0400 |
| commit | e02965c40a607209cc7a46b78cfeab21b0e292da (patch) | |
| tree | 632ee260ff3356813d94cb23d4cb643cfe64506e /engines/sherlock/scalpel | |
| parent | 336abef4012d359759a607f10138352cdae514c7 (diff) | |
| download | scummvm-rg350-e02965c40a607209cc7a46b78cfeab21b0e292da.tar.gz scummvm-rg350-e02965c40a607209cc7a46b78cfeab21b0e292da.tar.bz2 scummvm-rg350-e02965c40a607209cc7a46b78cfeab21b0e292da.zip | |
SHERLOCK: RT: SImplification of old speech code
Diffstat (limited to 'engines/sherlock/scalpel')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 3 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.cpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 80e9b79364..2fd9ede763 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -487,11 +487,10 @@ OpcodeReturn ScalpelTalk::cmdSfxCommand(const byte *&str) { if (sound._voices) { for (int idx = 0; idx < 8 && str[idx] != '~'; ++idx) tempString += str[idx]; - sound.playSound(tempString, WAIT_RETURN_IMMEDIATELY); + sound.playSpeech(tempString); // Set voices to wait for more sound._voices = 2; - sound._speechOn = (*sound._soundIsOn); } _wait = 1; diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index 5fe8c74c1a..f948b786e7 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -1637,13 +1637,12 @@ void ScalpelUserInterface::doTalkControl() { people.setTalking(0); if (!talk._statements[_selector]._voiceFile.empty() && sound._voices) { - sound.playSound(talk._statements[_selector]._voiceFile, WAIT_RETURN_IMMEDIATELY); + sound.playSpeech(talk._statements[_selector]._voiceFile); // Set voices as an indicator for waiting sound._voices = 2; - sound._speechOn = *sound._soundIsOn; } else { - sound._speechOn = false; + sound._speechPlaying = false; } if (IS_3DO) |