mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'Fix-BA2GNRLFile-GetFile' into 'master'

Browse Source 
Fix BA2 general reading file

See merge request OpenMW/openmw!3365
This commit is contained in:
psi29a 2023-08-20 11:52:41 +00:00
commit c5789b5543
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/bsa/ba2gnrlfile.cpp
View File

@ -202,23 +202,21 @@ namespace Bsa
Files::IStreamPtr BA2GNRLFile::getFile(const FileRecord& fileRecord)
{
Files::IStreamPtr streamPtr
= Files::openConstrainedFileStream(mFilepath, fileRecord.offset, fileRecord.packedSize);
std::istream* fileStream = streamPtr.get();
uint32_t uncompressedSize = fileRecord.size;
auto memoryStreamPtr = std::make_unique<MemoryInputStream>(uncompressedSize);
if (fileRecord.packedSize != 0)
const uint32_t inputSize = fileRecord.packedSize ? fileRecord.packedSize : fileRecord.size;
Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilepath, fileRecord.offset, inputSize);
auto memoryStreamPtr = std::make_unique<MemoryInputStream>(fileRecord.size);
if (fileRecord.packedSize)
{
boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
inputStreamBuf.push(boost::iostreams::zlib_decompressor());
inputStreamBuf.push(*fileStream);
inputStreamBuf.push(*streamPtr);
boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), uncompressedSize);
boost::iostreams::basic_array_sink<char> sr(memoryStreamPtr->getRawData(), fileRecord.size);
boost::iostreams::copy(inputStreamBuf, sr);
}
else
{
fileStream->read(memoryStreamPtr->getRawData(), fileRecord.size);
streamPtr->read(memoryStreamPtr->getRawData(), fileRecord.size);
}
return std::make_unique<Files::StreamWithBuffer<MemoryInputStream>>(std::move(memoryStreamPtr));
}