diff options
| author | Jonathan Gray | 2003-05-26 23:23:44 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-05-26 23:23:44 +0000 |
| commit | a871dfafafa9e81fabf027c07c99b6eab0da3394 (patch) | |
| tree | 40797c1b640e3a8f6fc1b44ef3e52b378e8b13db | |
| parent | bd61a1298ef92ce47607a923262caee004c0d54d (diff) | |
| download | scummvm-rg350-a871dfafafa9e81fabf027c07c99b6eab0da3394.tar.gz scummvm-rg350-a871dfafafa9e81fabf027c07c99b6eab0da3394.tar.bz2 scummvm-rg350-a871dfafafa9e81fabf027c07c99b6eab0da3394.zip | |
don't attempt to play sound on amiga versions of zak/maniac
svn-id: r8029
| -rw-r--r-- | scumm/sound.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 246a6bbb01..1f35490878 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -391,8 +391,16 @@ void Sound::playSound(int soundID) { } if (_scumm->_features & GF_OLD_BUNDLE) { - if (_scumm->_playerV2) - _scumm->_playerV2->startSound (soundID, ptr); + // FIXME: support amiga sounds + uint16 amigatest; + amigatest = READ_LE_UINT16(ptr + 12); + // other versions seem to be 0000 at this point... + // hopefully this test is correct + // 0xfe7f seems to be sound and 0x764a music + if ((amigatest != 0xfe7f) && (amigatest != 0x764a)) { + if (_scumm->_playerV2) + _scumm->_playerV2->startSound (soundID, ptr); + } return; } |