diff options
| author | Martin Kiewitz | 2009-12-23 12:39:24 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-12-23 12:39:24 +0000 |
| commit | 957737d0182b9a99225e3645e60087d7fdc36a4b (patch) | |
| tree | c3aaeac863c73e8a8f3f867b54be1619e2e2f682 /engines/sci | |
| parent | 4be2788ffd8b9e8ec8a2ba6080bcd7701bd6c08a (diff) | |
| download | scummvm-rg350-957737d0182b9a99225e3645e60087d7fdc36a4b.tar.gz scummvm-rg350-957737d0182b9a99225e3645e60087d7fdc36a4b.tar.bz2 scummvm-rg350-957737d0182b9a99225e3645e60087d7fdc36a4b.zip | |
SCI: sound resource handling fixed (fixes lsl5 music w/ new music code)
svn-id: r46494
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/resource.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 0dbb35d2eb..62a936c15d 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1852,6 +1852,9 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan) : _resMa aTracks[i].nDigital = j; ptr += 6; } + } else { + // Skip over digital track + ptr += 6; } ptr++; // skipping 0xFF that closes channels list } @@ -1879,9 +1882,10 @@ SoundResource::tagTrack* SoundResource::getTrackByNumber(uint16 number) { } SoundResource::tagTrack* SoundResource::getTrackByType(kTrackType type) { - for (int i = 0; i < nTracks; i++) + for (int i = 0; i < nTracks; i++) { if (aTracks[i].type == type) return &aTracks[i]; + } return NULL; } |