From 42180527c4d9df920ab1b77c78e9c5e36b93b74d Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Fri, 6 Oct 2017 13:15:16 -0500
Subject: SCI32: Fix music volume not being restored after speech in Torin

This was a regression introduced by
d556dcc57bf50a03d81ab7a1ef59a9e5758465bf.
---
 engines/sci/sound/music.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'engines/sci/sound/music.cpp')

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 5530952dcf..b2bd72e669 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -626,13 +626,7 @@ void SciMusic::soundStop(MusicEntry *pSnd) {
 
 void SciMusic::soundSetVolume(MusicEntry *pSnd, byte volume) {
 	assert(volume <= MUSIC_VOLUME_MAX);
-	if (pSnd->isSample) {
-#ifdef ENABLE_SCI32
-		if (_soundVersion >= SCI_VERSION_2_1_EARLY) {
-			g_sci->_audio32->setVolume(ResourceId(kResourceTypeAudio, pSnd->resourceId), pSnd->soundObj, volume);
-		}
-#endif
-	} else if (pSnd->pMidiParser) {
+	if (!pSnd->isSample && pSnd->pMidiParser) {
 		Common::StackLock lock(_mutex);
 		pSnd->pMidiParser->mainThreadBegin();
 		pSnd->pMidiParser->setVolume(volume);
-- 
cgit v1.2.3