diff options
| author | Matthew Hoops | 2011-02-02 02:20:25 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2011-02-02 02:20:25 +0000 |
| commit | a6891a4372ec267fec31e082b66f87d0dcb82880 (patch) | |
| tree | b875935990204054f1a7c8e9a80e0736c605fae9 /engines/sci | |
| parent | 1e14752d4d748d03b2d01317c6e3ac4181126274 (diff) | |
| download | scummvm-rg350-a6891a4372ec267fec31e082b66f87d0dcb82880.tar.gz scummvm-rg350-a6891a4372ec267fec31e082b66f87d0dcb82880.tar.bz2 scummvm-rg350-a6891a4372ec267fec31e082b66f87d0dcb82880.zip | |
SCI: Fix Mac sync resource support
svn-id: r55716
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/resource.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/sound/audio.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 381e558e52..b1fa99668d 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -438,7 +438,8 @@ bool MacResourceForkResourceSource::isCompressableResource(ResourceType type) co // (Audio/36 being Mac snd resources here) return type != kResourceTypeMacPict && type != kResourceTypeAudio && type != kResourceTypeMacIconBarPictN && type != kResourceTypeMacIconBarPictS && - type != kResourceTypeAudio36; + type != kResourceTypeAudio36 && type != kResourceTypeSync && + type != kResourceTypeSync36; } #define OUTPUT_LITERAL() \ diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index f2c13cf5f5..1d2d6e8655 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -401,12 +401,12 @@ void AudioPlayer::setSoundSync(ResourceId id, reg_t syncObjAddr, SegManager *seg void AudioPlayer::doSoundSync(reg_t syncObjAddr, SegManager *segMan) { if (_syncResource && (_syncOffset < _syncResource->size - 1)) { int16 syncCue = -1; - int16 syncTime = (int16)READ_LE_UINT16(_syncResource->data + _syncOffset); + int16 syncTime = (int16)READ_SCI11ENDIAN_UINT16(_syncResource->data + _syncOffset); _syncOffset += 2; if ((syncTime != -1) && (_syncOffset < _syncResource->size - 1)) { - syncCue = (int16)READ_LE_UINT16(_syncResource->data + _syncOffset); + syncCue = (int16)READ_SCI11ENDIAN_UINT16(_syncResource->data + _syncOffset); _syncOffset += 2; } |