From 9cc7594384eabde62624d5fcda82605e5e66c5c4 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 23 Jun 2004 09:13:25 +0000
Subject: Remove HE7 check that wasn't needed and caused resource load
 failures. Enable startSound code in HE7 games. Avoid loading music resources
 in HE7 games, since they are unsupported at the moment.

svn-id: r14010
---
 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 f5c3338d3a..8d433ee63e 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -657,7 +657,11 @@ int Sound::isSoundRunning(int sound) const {
 		return pollCD();
 
 	if (_vm->_features & GF_HUMONGOUS) {
-		if (sound == -2) {
+		if (sound == 10000)
+			// FIXME: Music resources in HE7 games are currently unsupported,
+			// so prevent music restart attempt
+			return 1;
+		else if (sound == -2) {
 			return isSfxFinished();
 		} else if (sound == -1) {
 			// getSoundStatus(), with a -1, will return the
-- 
cgit v1.2.3