diff options
| author | Littleboy | 2011-05-02 17:18:22 -0400 |
|---|---|---|
| committer | Littleboy | 2011-05-02 17:21:10 -0400 |
| commit | 0e45aa8655dc3122e8d88dbcb67ab2013a292989 (patch) | |
| tree | f523e5c1870497528d85385ce5ef24259937813c /engines/sci/resource.cpp | |
| parent | 580986aa42889c9a775b3ebe5709292d779f41cf (diff) | |
| parent | 1aff380a15f12e53bd380fc2a189882e2d6172c0 (diff) | |
| download | scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.gz scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.bz2 scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.zip | |
Merge remote-tracking branch 'upstream/master' into nsis
Conflicts:
devtools/create_project/scripts/postbuild.cmd
devtools/create_project/visualstudio.cpp
ports.mk
Diffstat (limited to 'engines/sci/resource.cpp')
| -rw-r--r-- | engines/sci/resource.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 4caa77b0ae..a48ae0fad7 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -28,6 +28,7 @@ #include "common/file.h" #include "common/fs.h" #include "common/macresman.h" +#include "common/textconsole.h" #include "sci/resource.h" #include "sci/resource_intern.h" @@ -1275,7 +1276,7 @@ ResVersion ResourceManager::detectVolVersion() { // SCI32 volume format: {bResType wResNumber dwPacked dwUnpacked wCompression} = 13 bytes // Try to parse volume with SCI0 scheme to see if it make sense // Checking 1MB of data should be enough to determine the version - uint16 resId, wCompression; + uint16 wCompression; uint32 dwPacked, dwUnpacked; ResVersion curVersion = kResVersionSci0Sci1Early; bool failed = false; @@ -1285,7 +1286,7 @@ ResVersion ResourceManager::detectVolVersion() { while (!fileStream->eos() && fileStream->pos() < 0x100000) { if (curVersion > kResVersionSci0Sci1Early) fileStream->readByte(); - resId = fileStream->readUint16LE(); + fileStream->skip(2); // resId dwPacked = (curVersion < kResVersionSci2) ? fileStream->readUint16LE() : fileStream->readUint32LE(); dwUnpacked = (curVersion < kResVersionSci2) ? fileStream->readUint16LE() : fileStream->readUint32LE(); |