diff options
| author | Eugene Sandulenko | 2019-08-07 23:44:54 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-09-03 17:17:32 +0200 |
| commit | d548d1dfb8f44b9c3c8071518ac4616c961a79fa (patch) | |
| tree | 54880744946c1b940fd92f0d068cb6d01f85f9e7 | |
| parent | 1658fc806347187be46c132acda6e4dac26c37da (diff) | |
| download | scummvm-rg350-d548d1dfb8f44b9c3c8071518ac4616c961a79fa.tar.gz scummvm-rg350-d548d1dfb8f44b9c3c8071518ac4616c961a79fa.tar.bz2 scummvm-rg350-d548d1dfb8f44b9c3c8071518ac4616c961a79fa.zip | |
HDB: Simplify findFirstData()
| -rw-r--r-- | engines/hdb/file-manager.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/hdb/file-manager.cpp b/engines/hdb/file-manager.cpp index cafc9cd578..c7f39f7893 100644 --- a/engines/hdb/file-manager.cpp +++ b/engines/hdb/file-manager.cpp @@ -173,12 +173,9 @@ Common::SeekableReadStream *FileMan::findFirstData(const char *string, DataType _mpcFile->read(buffer, file->length); - // Return buffer wrapped in a MemoryReadStream - - if (_compressed) - return Common::wrapCompressedReadStream(new Common::MemoryReadStream(buffer, file->length, DisposeAfterUse::YES)); - else - return new Common::MemoryReadStream(buffer, file->length, DisposeAfterUse::YES); + // Return buffer wrapped in a MemoryReadStream, automatically + // uncompressed if it is zlib-compressed + return Common::wrapCompressedReadStream(new Common::MemoryReadStream(buffer, file->length, DisposeAfterUse::NO), file->length); } int32 FileMan::getLength(const char *string, DataType type) { |