diff options
| author | Travis Howell | 2003-07-23 05:17:21 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-23 05:17:21 +0000 |
| commit | 13dae9b394dd9d7c8046b0771c6800d74b6f6ab9 (patch) | |
| tree | daccd6e49afb54aa64f9ba9481b18965cb3eeb4b /scumm | |
| parent | 88cf307273579ea0448844b7f79560a85f3b2db6 (diff) | |
| download | scummvm-rg350-13dae9b394dd9d7c8046b0771c6800d74b6f6ab9.tar.gz scummvm-rg350-13dae9b394dd9d7c8046b0771c6800d74b6f6ab9.tar.bz2 scummvm-rg350-13dae9b394dd9d7c8046b0771c6800d74b6f6ab9.zip | |
fm towns cd audio fix from Hibernatus
svn-id: r9141
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index cca3d1ab86..2e6777609c 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2044,7 +2044,7 @@ void Scumm_v5::o5_startMusic() { break; } warning("unknown: o5_startMusic(%d)", b); - setResult(0); + setResult(result); } else { _sound->addSoundToQueue(getVarOrDirectByte(0x80)); } diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 0a7eefaeca..98361cb816 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -470,7 +470,7 @@ void Sound::playSound(int soundID) { } - if (_scumm->_gameId == GID_LOOM && (READ_LE_UINT16(ptr + 4) == 'so')) { + if (_scumm->_gameId == GID_LOOM) { // Mac version of Loom uses yet another sound format /* playSound #9 (room 70) |