From 8f15e3d6efa4e69ef1aec4667e9c57e496d3044e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 17 Jan 2016 08:58:39 -0500
Subject: MADS: Fix call to play speech in generateMessage

---
 engines/mads/conversations.cpp | 6 ++++--
 engines/mads/sound.cpp         | 4 ----
 engines/mads/sound.h           | 5 -----
 3 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'engines/mads')

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);
-
 	//@}
 };
 
-- 
cgit v1.2.3