diff options
author | Paul Gilbert | 2016-01-17 08:58:39 -0500 |
---|---|---|
committer | Paul Gilbert | 2016-01-17 08:58:39 -0500 |
commit | 8f15e3d6efa4e69ef1aec4667e9c57e496d3044e (patch) | |
tree | 90df863c971e35c1fe1ee61ab7cf2e6736394fcc /engines/mads | |
parent | d750c85fc8da4128f1f7e8ddbb9ffbf9e86cf16f (diff) | |
download | scummvm-rg350-8f15e3d6efa4e69ef1aec4667e9c57e496d3044e.tar.gz scummvm-rg350-8f15e3d6efa4e69ef1aec4667e9c57e496d3044e.tar.bz2 scummvm-rg350-8f15e3d6efa4e69ef1aec4667e9c57e496d3044e.zip |
MADS: Fix call to play speech in generateMessage
Diffstat (limited to 'engines/mads')
-rw-r--r-- | engines/mads/conversations.cpp | 6 | ||||
-rw-r--r-- | engines/mads/sound.cpp | 4 | ||||
-rw-r--r-- | engines/mads/sound.h | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp index f12acc7e3f..169e844220 100644 --- a/engines/mads/conversations.cpp +++ b/engines/mads/conversations.cpp @@ -452,8 +452,10 @@ void GameConversations::generateMessage(Common::Array<int> &messageList, Common: _dialog->show(); // Play the speech if one was provided - if (voiceList.size() > 0) - _vm->_sound->playSpeech(_runningConv->_data._speechFile, voiceList[0]); + if (voiceList.size() > 0) { + _vm->_audio->setSoundGroup(_runningConv->_data._speechFile); + _vm->_audio->playSound(voiceList[0] - 1); + } } bool GameConversations::nextNode() { diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp index de24907409..c96fd01882 100644 --- a/engines/mads/sound.cpp +++ b/engines/mads/sound.cpp @@ -177,8 +177,4 @@ void SoundManager::noise() { _driver->noise(); } -void SoundManager::playSpeech(const Common::String &speechFile, int speechNum) { - warning("TODO: playSpeech"); -} - } // End of namespace MADS diff --git a/engines/mads/sound.h b/engines/mads/sound.h index 8dfd78edbb..2c4de6f21d 100644 --- a/engines/mads/sound.h +++ b/engines/mads/sound.h @@ -105,11 +105,6 @@ public: */ void noise(); - /** - * Plays a digital speech resource - */ - void playSpeech(const Common::String &speechFile, int speechNum); - //@} }; |