diff options
| author | Paul Gilbert | 2016-08-09 22:16:17 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-09 22:16:17 -0400 |
| commit | 17a665e2aab9466d7362168ded8d870986120eca (patch) | |
| tree | aaccb3962a51c4676d39b6e3e97e612bde7918d5 /engines/titanic/true_talk/true_talk_manager.cpp | |
| parent | 668c486f4fdf270a88cfd799ba54871d5a314383 (diff) | |
| download | scummvm-rg350-17a665e2aab9466d7362168ded8d870986120eca.tar.gz scummvm-rg350-17a665e2aab9466d7362168ded8d870986120eca.tar.bz2 scummvm-rg350-17a665e2aab9466d7362168ded8d870986120eca.zip | |
TITANIC: Field renaming and warning fixes in sound code
Diffstat (limited to 'engines/titanic/true_talk/true_talk_manager.cpp')
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index 82d443fcda..61ad924d90 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -523,6 +523,9 @@ void CTrueTalkManager::playSpeech(TTtalker *talker, TTroomScript *roomScript, CV view->getPosition(p1._posX, p1._posY, p1._posZ); } + // Loop through adding each of the speech portions in. We use the + // _priorSoundHandle of CProximity to chain each successive speech + // to start when the prior one finishes for (uint idx = 0; idx < _titleEngine._indexes.size(); ++idx) { uint id = _titleEngine._indexes[idx]; if (id > 100000) @@ -535,18 +538,18 @@ void CTrueTalkManager::playSpeech(TTtalker *talker, TTroomScript *roomScript, CV } // Start the speech - p1._soundHandle = _gameManager->_sound.playSpeech(_dialogueFile, id - _dialogueId, p1); + p1._priorSoundHandle = _gameManager->_sound.playSpeech(_dialogueFile, id - _dialogueId, p1); if (!milli) continue; if (idx == 0) g_vm->_events->sleep(milli); - p3._soundHandle = _gameManager->_sound.playSpeech(_dialogueFile, id - _dialogueId, p3); + p3._priorSoundHandle = _gameManager->_sound.playSpeech(_dialogueFile, id - _dialogueId, p3); if (idx == 0) g_vm->_events->sleep(milli); - p2._soundHandle = _gameManager->_sound.playSpeech(_dialogueFile, id - _dialogueId, p2); + p2._priorSoundHandle = _gameManager->_sound.playSpeech(_dialogueFile, id - _dialogueId, p2); } } |