From ae70a7034e7760338b7f10fd915f5e5f8946c270 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 13 Jul 2004 01:40:47 +0000
Subject: Stop music when requested in HE games. Fix sfx status for HE games.

svn-id: r14200
---
 scumm/sound.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scumm/sound.cpp')

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 8c914f6741..b2964f1782 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -708,7 +708,7 @@ int Sound::isSoundRunning(int sound) const {
 
 	if (_vm->_features & GF_HUMONGOUS) {
 		if (sound == -2 || sound == 10001) {
-			return isSfxFinished();
+			return !isSfxFinished();
 		} else if (sound == -1 || sound == 10000 || sound == _currentMusic) {
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
@@ -793,6 +793,10 @@ void Sound::stopSound(int a) {
 			// Stop current sfx
 		} else if (a == -1 || a == 10000) {
 			// Stop current music
+			if (_currentMusic)
+				_vm->_mixer->stopID(_currentMusic);
+			else if (_vm->_imuse)
+				_vm->_imuse->stopSound(_vm->_imuse->getSoundStatus(-1));
 		}
 	}
 
-- 
cgit v1.2.3