mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

CompressedBSAFile::FileRecord::isCompressed implementation simplified.

Browse Source 
Double space in CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag removed.
This commit is contained in:
Azdul 2019-01-19 14:41:17 +01:00
parent a8c1c4315c
commit 7880e6f761
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/compressedbsafile.cpp
View File

@ -61,16 +61,19 @@ bool CompressedBSAFile::FileRecord::isValid() const
bool CompressedBSAFile::FileRecord::isCompressed(bool bsaCompressedByDefault) const bool CompressedBSAFile::FileRecord::isCompressed(bool bsaCompressedByDefault) const
{ {
bool compressionFlagEnabled = ((size & sCompressedFlag) == sCompressedFlag); bool recordCompressionFlagEnabled = ((size & sCompressedFlag) == sCompressedFlag);
if (bsaCompressedByDefault) { //record is compressed when:
return !compressionFlagEnabled; //- bsaCompressedByDefault flag is set and 30th bit is NOT set, or
} //- bsaCompressedByDefault flag is NOT set and 30th bit is set
return compressionFlagEnabled; //record is NOT compressed when:
//- bsaCompressedByDefault flag is NOT set and 30th bit is NOT set, or
//- bsaCompressedByDefault flag is set and 30th bit is set
return (bsaCompressedByDefault != recordCompressionFlagEnabled);
} }
std::uint32_t CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag() const { std::uint32_t CompressedBSAFile::FileRecord::getSizeWithoutCompressionFlag() const {
return size & (~sCompressedFlag); return size & (~sCompressedFlag);
} }
void CompressedBSAFile::getBZString(std::string& str, std::istream& filestream) void CompressedBSAFile::getBZString(std::string& str, std::istream& filestream)