thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Fix call to play speech in generateMessage

Browse source
This commit is contained in:
Paul Gilbert 2016-01-17 08:58:39 -05:00
parent d750c85fc8
commit 8f15e3d6ef
3 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/mads/conversations.cpp
View file

@ -452,8 +452,10 @@ void GameConversations::generateMessage(Common::Array<int> &messageList, Common:
_dialog->show(); _dialog->show();
// Play the speech if one was provided // Play the speech if one was provided
if (voiceList.size() > 0) if (voiceList.size() > 0) {
_vm->_sound->playSpeech(_runningConv->_data._speechFile, voiceList[0]); _vm->_audio->setSoundGroup(_runningConv->_data._speechFile);
_vm->_audio->playSound(voiceList[0] - 1);
}
} }
bool GameConversations::nextNode() { bool GameConversations::nextNode() {

4
engines/mads/sound.cpp
View file

@ -177,8 +177,4 @@ void SoundManager::noise() {
_driver->noise(); _driver->noise();
} }
void SoundManager::playSpeech(const Common::String &speechFile, int speechNum) {
warning("TODO: playSpeech");
}
} // End of namespace MADS } // End of namespace MADS

5
engines/mads/sound.h
View file

@ -105,11 +105,6 @@ public:
*/ */
void noise(); void noise();
/**
* Plays a digital speech resource
*/
void playSpeech(const Common::String &speechFile, int speechNum);
//@} //@}
}; };