[Scummvm-git-logs] scummvm master -> 0a3b6d34d5c8828537585ad8603a5191437824b1

[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:
0a3b6d34d5 TITANIC: Make Parrot speech respect the Parrot volume level


Commit: 0a3b6d34d5c8828537585ad8603a5191437824b1
    https://github.com/scummvm/scummvm/commit/0a3b6d34d5c8828537585ad8603a5191437824b1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-06T19:26:58-04:00

Commit Message:
TITANIC: Make Parrot speech respect the Parrot volume level

Changed paths:
    engines/titanic/sound/sound.cpp
    engines/titanic/true_talk/true_talk_manager.cpp


diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index fb8cc29..befe1a8 100644
--- a/engines/titanic/sound/sound.cpp
+++ b/engines/titanic/sound/sound.cpp
@@ -210,8 +210,10 @@ int CSound::playSpeech(CDialogueFile *dialogueFile, int speechId, CProximity &pr
 		return -1;
 
 	prox._soundDuration = waveFile->getDurationTicks();
-	activateSound(waveFile, prox._disposeAfterUse);
+	if (prox._soundType != Audio::Mixer::kPlainSoundType)
+		waveFile->_soundType = prox._soundType;
 
+	activateSound(waveFile, prox._disposeAfterUse);
 	return _soundManager.playSound(*waveFile, prox);
 }
 
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index e2e4115..d0cead3 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -487,6 +487,7 @@ void CTrueTalkManager::playSpeech(TTtalker *talker, TTroomScript *roomScript, CV
 	// Setup proximities
 	CProximity p1, p2, p3;
 	if (isParrot) {
+		p1._soundType = Audio::Mixer::kSFXSoundType;
 		p1._channelMode = 3;
 		p2._channelMode = 5;
 		p3._channelMode = 4;