diff options
author | Paweł Kołodziejski | 2004-06-19 15:05:18 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2004-06-19 15:05:18 +0000 |
commit | 212a451b1aa6b1a865c8af1112113ce4fdd21b9a (patch) | |
tree | e6a32537f69e60d3c9e71bd449c2238887cb7fb8 | |
parent | eb867d6d3d6afce460ef56fed5c1cd06df8e8211 (diff) | |
download | scummvm-rg350-212a451b1aa6b1a865c8af1112113ce4fdd21b9a.tar.gz scummvm-rg350-212a451b1aa6b1a865c8af1112113ce4fdd21b9a.tar.bz2 scummvm-rg350-212a451b1aa6b1a865c8af1112113ce4fdd21b9a.zip |
correct for last commit, changed dummy reads to seek
svn-id: r13965
-rw-r--r-- | scumm/imuse_digi/dimuse_bndmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp index f57bdbf8ae..d41106b597 100644 --- a/scumm/imuse_digi/dimuse_bndmgr.cpp +++ b/scumm/imuse_digi/dimuse_bndmgr.cpp @@ -104,6 +104,7 @@ int BundleDirCache::matchFile(const char *filename, const char *directory) { name[z] = '\0'; strcpy(_budleDirCache[freeSlot].bundleTable[i].filename, name); _budleDirCache[freeSlot].bundleTable[i].offset = file.readUint32BE(); + file.seek(4); } return freeSlot; } else { @@ -184,8 +185,7 @@ int32 BundleMgr::decompressSampleByIndex(int32 index, int32 offset, int32 size, _file.seek(_bundleTable[index].offset, SEEK_SET); tag = _file.readUint32BE(); _numCompItems = num = _file.readUint32BE(); - _file.readUint32BE(); - _file.readUint32BE(); + _file.seek(8); if (tag != MKID_BE('COMP')) { warning("BundleMgr::decompressSampleByIndex() Compressed sound %d invalid (%s)", index, tag2str(tag)); @@ -198,7 +198,7 @@ int32 BundleMgr::decompressSampleByIndex(int32 index, int32 offset, int32 size, _compTable[i].offset = _file.readUint32BE(); _compTable[i].size = _file.readUint32BE(); _compTable[i].codec = _file.readUint32BE(); - _file.readUint32BE(); + _file.seek(4); if (_compTable[i].size > maxSize) maxSize = _compTable[i].size; } |