diff options
| author | Paul Gilbert | 2017-09-06 19:26:58 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-06 19:26:58 -0400 |
| commit | 0a3b6d34d5c8828537585ad8603a5191437824b1 (patch) | |
| tree | 44f4fca233e32209c28e5fc7ab9d5c548ada49e7 /engines | |
| parent | f58156aba003a6be069b432959e9fe7f2311539d (diff) | |
| download | scummvm-rg350-0a3b6d34d5c8828537585ad8603a5191437824b1.tar.gz scummvm-rg350-0a3b6d34d5c8828537585ad8603a5191437824b1.tar.bz2 scummvm-rg350-0a3b6d34d5c8828537585ad8603a5191437824b1.zip | |
TITANIC: Make Parrot speech respect the Parrot volume level
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/sound/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
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; |