R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary member from 'VPKChunkDescriptor_t'

Browse Source
This commit is contained in:
Kawe Mazidjatari 2023-04-03 21:16:15 +02:00
parent dc0fba9319
commit 081c548bdd
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/vpklib/packedstore.cpp
View File

@ -455,7 +455,6 @@ void CPackedStore::PackWorkspace(const VPKPair_t& vPair, const string& svWorkspa
vDescriptor.m_nCompressedSize = vDescriptor.m_nUncompressedSize;
}
vDescriptor.m_bIsCompressed = vDescriptor.m_nCompressedSize != vDescriptor.m_nUncompressedSize;
FileSystem()->Write(pEntryBuffer, int(vDescriptor.m_nCompressedSize), hPackFile);
}
@ -539,7 +538,7 @@ void CPackedStore::UnpackWorkspace(const VPKDir_t& vDirectory, const string& svW
FileSystem()->Seek(hPackFile, int(vChunk.m_nPackFileOffset), FileSystemSeek_t::FILESYSTEM_SEEK_HEAD);
FileSystem()->Read(pSourceBuffer, int(vChunk.m_nCompressedSize), hPackFile);
if (vChunk.m_bIsCompressed)
if (vChunk.m_nCompressedSize != vChunk.m_nUncompressedSize) // Data is compressed.
{
size_t nDstLen = ENTRY_MAX_LEN;
assert(vChunk.m_nCompressedSize <= nDstLen);
@ -669,7 +668,6 @@ VPKChunkDescriptor_t::VPKChunkDescriptor_t(FileHandle_t hDirectoryFile)
FileSystem()->Read(&m_nPackFileOffset, sizeof(uint64_t), hDirectoryFile); //
FileSystem()->Read(&m_nCompressedSize, sizeof(uint64_t), hDirectoryFile); //
FileSystem()->Read(&m_nUncompressedSize, sizeof(uint64_t), hDirectoryFile); //
m_bIsCompressed = (m_nCompressedSize != m_nUncompressedSize);
}
//-----------------------------------------------------------------------------
@ -689,8 +687,6 @@ VPKChunkDescriptor_t::VPKChunkDescriptor_t(uint32_t nLoadFlags, uint16_t nTextur
m_nCompressedSize = nCompressedSize;
m_nUncompressedSize = nUncompressedSize;
m_bIsCompressed = (m_nCompressedSize != m_nUncompressedSize);
}
//-----------------------------------------------------------------------------

1
r5dev/vpklib/packedstore.h
View File

@ -66,7 +66,6 @@ struct VPKChunkDescriptor_t
uint64_t m_nPackFileOffset; // Offset in pack file.
uint64_t m_nCompressedSize; // Compressed size of chunk.
uint64_t m_nUncompressedSize; // Uncompressed size of chunk.
bool m_bIsCompressed = false;
VPKChunkDescriptor_t(FileHandle_t hDirectoryFile);
VPKChunkDescriptor_t(uint32_t nLoadFlags, uint16_t nTextureFlags, uint64_t nPackFileOffset, uint64_t nCompressedSize, uint64_t nUncompressedSize);