diff options
| author | Filippos Karapetis | 2012-12-11 02:56:48 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2012-12-11 02:56:48 +0200 |
| commit | b05fa7f20414d6a7571a9ba52f542e527f598c62 (patch) | |
| tree | a93459a6cf40000040167e3c6565b2fe1e1b39d8 /engines/tinsel/music.cpp | |
| parent | ce87175bede46c1bb938b73484e1db05212defbd (diff) | |
| download | scummvm-rg350-b05fa7f20414d6a7571a9ba52f542e527f598c62.tar.gz scummvm-rg350-b05fa7f20414d6a7571a9ba52f542e527f598c62.tar.bz2 scummvm-rg350-b05fa7f20414d6a7571a9ba52f542e527f598c62.zip | |
TINSEL: Add resource handling of the BE resources in DW1 Mac
This is the second attempt. All the BE resources of DW1 Mac are
handled correctly now. Added READ_16, READ_32, FROM_16, FROM_32 and
TO_32 to handle all of the different cases where endianess is
already handled. Note that the game scripts are LE, so these
haven't been changed
Diffstat (limited to 'engines/tinsel/music.cpp')
| -rw-r--r-- | engines/tinsel/music.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 15406c5d43..952b629f08 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -788,8 +788,8 @@ bool PCMMusicPlayer::getNextChunk() { // Set parameters for this chunk of music id = _scriptNum; while (id--) - script = scriptBuffer + READ_LE_UINT32(script); - snum = FROM_LE_32(script[_scriptIndex++]); + script = scriptBuffer + READ_32(script); + snum = FROM_32(script[_scriptIndex++]); if (snum == MUSIC_JUMP || snum == MUSIC_END) { // Let usual code sort it out! @@ -801,11 +801,11 @@ bool PCMMusicPlayer::getNextChunk() { musicSegments = (MusicSegment *) LockMem(_hSegment); - assert(FROM_LE_32(musicSegments[snum].numChannels) == 1); - assert(FROM_LE_32(musicSegments[snum].bitsPerSample) == 16); + assert(FROM_32(musicSegments[snum].numChannels) == 1); + assert(FROM_32(musicSegments[snum].bitsPerSample) == 16); - sampleOffset = FROM_LE_32(musicSegments[snum].sampleOffset); - sampleLength = FROM_LE_32(musicSegments[snum].sampleLength); + sampleOffset = FROM_32(musicSegments[snum].sampleOffset); + sampleLength = FROM_32(musicSegments[snum].sampleLength); sampleCLength = (((sampleLength + 63) & ~63)*33)/64; if (!file.open(_filename)) @@ -843,14 +843,14 @@ bool PCMMusicPlayer::getNextChunk() { id = _scriptNum; while (id--) - script = scriptBuffer + READ_LE_UINT32(script); - snum = FROM_LE_32(script[_scriptIndex]); + script = scriptBuffer + READ_32(script); + snum = FROM_32(script[_scriptIndex]); if (snum == MUSIC_END) { _state = S_END2; } else { if (snum == MUSIC_JUMP) - _scriptIndex = FROM_LE_32(script[_scriptIndex+1]); + _scriptIndex = FROM_32(script[_scriptIndex+1]); _state = _forcePlay ? S_NEW : S_NEXT; _forcePlay = false; |