From 39fad0387be5fb4bd061718ce6cdd99d62ca086e Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 8 Oct 2004 01:07:44 +0000
Subject: Unfortunately still not perfect.

svn-id: r15460
---
 scumm/script.cpp | 3 ++-
 scumm/sound.cpp  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scumm')

diff --git a/scumm/script.cpp b/scumm/script.cpp
index f9dae2e90d..d015d10c5e 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -695,7 +695,8 @@ void ScummEngine::stopObjectCode() {
 			ss->cutsceneOverride = 0;
 		}
 	}
-	nukeArrays(ss->number);
+	// FIXME Sometimes nukes the incorrect array in HE games
+	// nukeArrays(ss->number);
 	ss->number = 0;
 	ss->status = ssDead;
 	_currentScript = 0xFF;
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 52edc56d46..b9896a63eb 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -767,6 +767,8 @@ int Sound::isSoundRunning(int sound) const {
 				return (_musicChannelHandle.isActive()) ? 1 : 0;
 			else if (_vm->_imuse)
 				return (_vm->_imuse->getSoundStatus(sound));
+		} else if (sound > _vm->_numSounds) {
+			return _vm->_mixer->isSoundIDActive(sound);
 		}
 	}
 
-- 
cgit v1.2.3