diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/draci/barchive.cpp | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/draci/barchive.cpp')
| -rw-r--r-- | engines/draci/barchive.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/draci/barchive.cpp b/engines/draci/barchive.cpp index 154073250c..31dfe62dee 100644 --- a/engines/draci/barchive.cpp +++ b/engines/draci/barchive.cpp @@ -212,7 +212,8 @@ void BArchive::openArchive(const Common::String &path) { _files[i]._offset = fileOffset; // Offset of file from start - assert(_f.readByte() == 0 && + byte compressionType = _f.readByte(); + assert(compressionType == 0 && "Compression type flag is non-zero (file is compressed)"); _files[i]._crc = _f.readByte(); // CRC checksum of the file @@ -221,7 +222,8 @@ void BArchive::openArchive(const Common::String &path) { } // Last footer item should be equal to footerOffset - assert(reader.readUint32LE() == footerOffset && "Footer offset mismatch"); + uint32 footerOffset2 = reader.readUint32LE(); + assert(footerOffset2 == footerOffset && "Footer offset mismatch"); // Indicate that the archive has been successfully opened _opened = true; |