diff options
| author | Vincent Hamm | 2002-03-25 01:31:16 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2002-03-25 01:31:16 +0000 |
| commit | e732682d9b66086dd878d0167b762fc555e673cf (patch) | |
| tree | cacb2b1cc2ada75e55b18c9f04da22bea5653458 /v3 | |
| parent | 29f2188c2d625e90a47ea3aac1a5a553f4e1a460 (diff) | |
| download | scummvm-rg350-e732682d9b66086dd878d0167b762fc555e673cf.tar.gz scummvm-rg350-e732682d9b66086dd878d0167b762fc555e673cf.tar.bz2 scummvm-rg350-e732682d9b66086dd878d0167b762fc555e673cf.zip | |
Little clean up of the v3 specific readIndex
svn-id: r3818
Diffstat (limited to 'v3')
| -rw-r--r-- | v3/resource.cpp | 85 |
1 files changed, 42 insertions, 43 deletions
diff --git a/v3/resource.cpp b/v3/resource.cpp index 28a2787269..71407cc317 100644 --- a/v3/resource.cpp +++ b/v3/resource.cpp @@ -3,49 +3,48 @@ void Scumm_v3::readIndexFile() { - uint16 blocktype; - uint32 itemsize; - int numblock = 0; - int num, i; - byte* _oldClass; - - debug(9, "readIndexFile()"); - - openRoom(-1); - openRoom(0); - - if (!(_features & GF_AFTER_V6)) { - while (!fileEof(_fileHandle)) { - itemsize = fileReadDwordLE(); - blocktype = fileReadWordLE(); - if (fileReadFailed(_fileHandle)) - break; - - switch(blocktype) { - case 0x4E52: - fileReadWordLE(); - break; - case 0x5230: - _numRooms = fileReadWordLE(); - break; - case 0x5330: - _numScripts = fileReadWordLE(); - break; - case 0x4E30: - _numSounds = fileReadWordLE(); - break; - case 0x4330: - _numCostumes = fileReadWordLE(); - break; - case 0x4F30: - _numGlobalObjects = fileReadWordLE(); - break; - } - fileSeek(_fileHandle, itemsize-8,SEEK_CUR); - } - clearFileReadFailed(_fileHandle); - fileSeek(_fileHandle, 0, SEEK_SET); - } + uint16 blocktype; + uint32 itemsize; + int numblock = 0; + int num, i; + byte* _oldClass; + + debug(9, "readIndexFile()"); + + openRoom(-1); + openRoom(0); + + while (!fileEof(_fileHandle)) { + itemsize = fileReadDwordLE(); + blocktype = fileReadWordLE(); + if (fileReadFailed(_fileHandle)) + break; + + switch(blocktype) { + case 0x4E52: + fileReadWordLE(); + break; + case 0x5230: + _numRooms = fileReadWordLE(); + break; + case 0x5330: + _numScripts = fileReadWordLE(); + break; + case 0x4E30: + _numSounds = fileReadWordLE(); + break; + case 0x4330: + _numCostumes = fileReadWordLE(); + break; + case 0x4F30: + _numGlobalObjects = fileReadWordLE(); + break; + } + fileSeek(_fileHandle, itemsize-8,SEEK_CUR); + } + + clearFileReadFailed(_fileHandle); + fileSeek(_fileHandle, 0, SEEK_SET); /* I'm not sure for those values yet, they will have to be rechecked */ |