diff options
| author | Travis Howell | 2006-01-16 08:50:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-01-16 08:50:03 +0000 |
| commit | fab5160c5fb68636fde396614a8c8d902d372789 (patch) | |
| tree | b1c742a2b1bb2dd630267a591bb3d5c7930eb0c7 /scumm | |
| parent | 63ff02b3b0f99b675518c76f8e08dea9fe0c1455 (diff) | |
| download | scummvm-rg350-fab5160c5fb68636fde396614a8c8d902d372789.tar.gz scummvm-rg350-fab5160c5fb68636fde396614a8c8d902d372789.tar.bz2 scummvm-rg350-fab5160c5fb68636fde396614a8c8d902d372789.zip | |
Move over more version specific index blocks.
svn-id: r20051
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 67172fdf72..c7d26b592d 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -440,6 +440,10 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) { _imuseDigital->setAudioNames(num, ptr); break; + case MKID('DRSC'): // Used by: COMI + readResTypeList(rtRoomScripts, MKID('RMSC'), "room script"); + break; + default: ScummEngine::readIndexBlock(blocktype, itemsize); } @@ -450,6 +454,18 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) { void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) { int i; switch (blocktype) { + case MKID('DIRI'): + readResTypeList(rtRoomImage, MKID('RMIM'), "room image"); + break; + + case MKID('DIRM'): + readResTypeList(rtImage, MKID('AWIZ'), "images"); + break; + + case MKID('DIRT'): + readResTypeList(rtTalkie, MKID('TLKE'), "talkie"); + break; + case MKID('DLFL'): i = _fileHandle->readUint16LE(); _fileHandle->seek(-2, SEEK_CUR); @@ -464,8 +480,8 @@ void ScummEngine_v70he::readIndexBlock(uint32 blocktype, uint32 itemsize) { break; case MKID('SVER'): + // Index version number _fileHandle->seek(itemsize - 8, SEEK_CUR); - debug(0, "SVER index block not yet handled, skipping"); break; case MKID('INIB'): @@ -516,27 +532,11 @@ void ScummEngine::readIndexBlock(uint32 blocktype, uint32 itemsize) { } break; - case MKID('DIRM'): - readResTypeList(rtImage, MKID('AWIZ'), "images"); - break; - - case MKID('DIRT'): - readResTypeList(rtTalkie, MKID('TLKE'), "talkie"); - break; - - case MKID('DIRI'): - readResTypeList(rtRoomImage, MKID('RMIM'), "room image"); - break; - - case MKID('DIRR'): case MKID('DROO'): + case MKID('DIRR'): readResTypeList(rtRoom, MKID('ROOM'), "room"); break; - case MKID('DRSC'): - readResTypeList(rtRoomScripts, MKID('RMSC'), "room script"); - break; - case MKID('DSCR'): case MKID('DIRS'): readResTypeList(rtScript, MKID('SCRP'), "script"); |