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

Fix remaining bugs

Browse Source
This commit is contained in:
Cédric Mocquillon 2023-03-06 15:50:45 +01:00
parent d2244c8d97
commit 1a7b2cd611
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/bsa/ba2dx10file.cpp
View File

@ -45,7 +45,7 @@ namespace Bsa
in.read(reinterpret_cast<char*>(&dirHash), sizeof(uint32_t)); in.read(reinterpret_cast<char*>(&dirHash), sizeof(uint32_t));
FileRecord file; FileRecord file;
uint32_t unknown; uint8_t unknown;
in.read(reinterpret_cast<char*>(&unknown), sizeof(uint8_t)); in.read(reinterpret_cast<char*>(&unknown), sizeof(uint8_t));
uint8_t nbChunks; uint8_t nbChunks;
@ -400,7 +400,7 @@ namespace Bsa
header.mipMapCount = fileRecord.numMips; header.mipMapCount = fileRecord.numMips;
if (header.mipMapCount > 1) if (header.mipMapCount > 1)
header.caps = header.caps | DDSCAPS_MIPMAP | DDSCAPS_COMPLEX; header.caps = header.caps | DDSCAPS_MIPMAP | DDSCAPS_COMPLEX;
header.depth = 1; header.depth = 0;
header.resourceDimension = DDS_DIMENSION_TEXTURE2D; header.resourceDimension = DDS_DIMENSION_TEXTURE2D;
header.arraySize = 1; header.arraySize = 1;
@ -631,15 +631,15 @@ namespace Bsa
buff = (char*)std::memcpy(buff, &dds, sizeof(uint32_t)) + sizeof(uint32_t); buff = (char*)std::memcpy(buff, &dds, sizeof(uint32_t)) + sizeof(uint32_t);
std::memcpy(buff, &header, headerSize); std::memcpy(buff, &header, headerSize);
size_t offset = headerSize; size_t offset = sizeof(uint32_t) + headerSize;
// append chunks // append chunks
for (const auto& c : fileRecord.texturesChunks) for (const auto& c : fileRecord.texturesChunks)
{ {
Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilepath, c.offset, c.packedSize);
std::istream* fileStream = streamPtr.get();
if (c.packedSize != 0) if (c.packedSize != 0)
{ {
Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilepath, c.offset, c.packedSize);
std::istream* fileStream = streamPtr.get();
boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf; boost::iostreams::filtering_streambuf<boost::iostreams::input> inputStreamBuf;
inputStreamBuf.push(boost::iostreams::zlib_decompressor()); inputStreamBuf.push(boost::iostreams::zlib_decompressor());
inputStreamBuf.push(*fileStream); inputStreamBuf.push(*fileStream);
@ -650,6 +650,9 @@ namespace Bsa
// uncompressed chunk // uncompressed chunk
else else
{ {
Files::IStreamPtr streamPtr = Files::openConstrainedFileStream(mFilepath, c.offset, c.size);
std::istream* fileStream = streamPtr.get();
fileStream->read(memoryStreamPtr->getRawData() + offset, c.size); fileStream->read(memoryStreamPtr->getRawData() + offset, c.size);
} }
offset += c.size; offset += c.size;