mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 16:45:33 +00:00
Code Issues Releases Wiki Activity

Don't save space in compressed BSA hash generation

Browse source
This commit is contained in:
Capostrophic 2020-03-10 22:50:12 +03:00
parent aef6cd7006
commit d3244dc777
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/bsa/compressedbsafile.cpp
View file

@ -422,7 +422,8 @@ void CompressedBSAFile::convertCompressedSizesToUncompressed()
std::uint64_t CompressedBSAFile::generateHash(std::string stem, std::string extension) const std::uint64_t CompressedBSAFile::generateHash(std::string stem, std::string extension) const
{ {
size_t len = stem.length(); size_t len = stem.length();
if (len == 0) return 0; if (len == 0)
return 0;
std::uint64_t hash = 0; std::uint64_t hash = 0;
unsigned int hash2 = 0; unsigned int hash2 = 0;
Misc::StringUtils::lowerCaseInPlace(stem); Misc::StringUtils::lowerCaseInPlace(stem);
@ -434,12 +435,19 @@ std::uint64_t CompressedBSAFile::generateHash(std::string stem, std::string exte
for (const char &c : extension) for (const char &c : extension)
hash = hash * 0x1003f + c; hash = hash * 0x1003f + c;
} }
for (size_t i = 1; i < len-2 && len > 3; i++) if (len >= 4)
hash2 = hash2 * 0x1003f + stem[i]; {
for (size_t i = 1; i < len-2; i++)
hash2 = hash2 * 0x1003f + stem[i];
}
hash = (hash + hash2) << 32; hash = (hash + hash2) << 32;
hash2 = (stem[0] << 24) | (len << 16); hash2 = (stem[0] << 24) | (len << 16);
if (len >= 3) hash2 |= stem[len-2] << 8; if (len >= 2)
if (len >= 2) hash2 |= stem[len-1]; {
if (len >= 3)
hash2 |= stem[len-2] << 8;
hash2 |= stem[len-1];
}
if (!extension.empty()) if (!extension.empty())
{ {
if (extension == ".kf") hash2 |= 0x80; if (extension == ".kf") hash2 |= 0x80;