[Scummvm-cvs-logs] scummvm master -> 8f15e3d6efa4e69ef1aec4667e9c57e496d3044e

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8f15e3d6ef MADS: Fix call to play speech in generateMessage


Commit: 8f15e3d6efa4e69ef1aec4667e9c57e496d3044e
    https://github.com/scummvm/scummvm/commit/8f15e3d6efa4e69ef1aec4667e9c57e496d3044e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-01-17T08:58:39-05:00

Commit Message:
MADS: Fix call to play speech in generateMessage

Changed paths:
    engines/mads/conversations.cpp
    engines/mads/sound.cpp
    engines/mads/sound.h



diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index f12acc7..169e844 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 de24907..c96fd01 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 8dfd78e..2c4de6f 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);
-
 	//@}
 };