From 0a3b6d34d5c8828537585ad8603a5191437824b1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 6 Sep 2017 19:26:58 -0400
Subject: TITANIC: Make Parrot speech respect the Parrot volume level

---
 engines/titanic/sound/sound.cpp                 | 4 +++-
 engines/titanic/true_talk/true_talk_manager.cpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index fb8cc299df..befe1a8e09 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 e2e411559f..d0cead3206 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;
-- 
cgit v1.2.3