diff options
| author | Travis Howell | 2004-06-23 09:13:25 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-06-23 09:13:25 +0000 |
| commit | 9cc7594384eabde62624d5fcda82605e5e66c5c4 (patch) | |
| tree | f0b9f5108af3def1a354bad8a23e003c60b2cd14 /scumm/sound.cpp | |
| parent | c7f06142a00a625c1f3bfe76bdc2b5429ba2cdc3 (diff) | |
| download | scummvm-rg350-9cc7594384eabde62624d5fcda82605e5e66c5c4.tar.gz scummvm-rg350-9cc7594384eabde62624d5fcda82605e5e66c5c4.tar.bz2 scummvm-rg350-9cc7594384eabde62624d5fcda82605e5e66c5c4.zip | |
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
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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 |