From 19a96699a43c173752ebcd5e1a171d658efbce16 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 8 May 2013 00:25:29 +0200
Subject: HOPKINS: Fix bug #3611824 - music cut during dialogs after loading
 from launcher

---
 engines/hopkins/hopkins.cpp | 6 +++++-
 engines/hopkins/sound.cpp   | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 960a5cf524..87d4600187 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -804,6 +804,7 @@ bool HopkinsEngine::runFull() {
 		if (shouldQuit())
 			return false;
 	}
+
 	if (getPlatform() != Common::kPlatformLinux && _startGameSlot == -1) {
 		_graphicsMan->fadeOutShort();
 		_graphicsMan->loadImage("H2");
@@ -819,8 +820,11 @@ bool HopkinsEngine::runFull() {
 
 	_globals->_exitId = 0;
 
-	if (_startGameSlot != -1)
+
+	if (_startGameSlot != -1) {
+		_soundMan->playSound(28);
 		_saveLoad->loadGame(_startGameSlot);
+	}
 
 	for (;;) {
 		if (_globals->_exitId == 300)
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 94f90f7971..bf816c08a4 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -467,7 +467,6 @@ void SoundManager::checkVoiceActivity() {
 
 bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) {
 	int fileNumber;
-	int oldMusicVol;
 	bool breakFlag;
 	Common::String prefix;
 	Common::String filename;
@@ -573,7 +572,7 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) {
 			}
 		}
 	}
-	oldMusicVol = _musicVolume;
+	int oldMusicVol = _musicVolume;
 	if (!loadVoice(filename, catPos, catLen, _sWav[20])) {
 		// This case only concerns the English Win95 demo
 		// If it's not possible to load the voice, we force the active flag
-- 
cgit v1.2.3