mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 17:42:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2719 from Capostrophic/capofixes

Browse Source 
Fixes of my mistakes
This commit is contained in:
Bret Curtis 2020-03-11 09:05:12 +01:00 committed by GitHub
commit 7096ecdcf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
View File

@ -266,7 +266,7 @@ namespace
MOCK_CONST_METHOD0(numRecords, std::size_t ()); MOCK_CONST_METHOD0(numRecords, std::size_t ());
MOCK_CONST_METHOD1(getRoot, Nif::Record* (std::size_t)); MOCK_CONST_METHOD1(getRoot, Nif::Record* (std::size_t));
MOCK_CONST_METHOD0(numRoots, std::size_t ()); MOCK_CONST_METHOD0(numRoots, std::size_t ());
MOCK_CONST_METHOD1(getString, std::string (std::size_t)); MOCK_CONST_METHOD1(getString, std::string (uint32_t));
MOCK_METHOD1(setUseSkinning, void (bool)); MOCK_METHOD1(setUseSkinning, void (bool));
MOCK_CONST_METHOD0(getUseSkinning, bool ()); MOCK_CONST_METHOD0(getUseSkinning, bool ());
MOCK_CONST_METHOD0(getFilename, std::string ()); MOCK_CONST_METHOD0(getFilename, std::string ());

16
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)
{
for (size_t i = 1; i < len-2; i++)
hash2 = hash2 * 0x1003f + stem[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;

6
components/nif/niffile.hpp
View File

@ -26,7 +26,7 @@ struct File
virtual size_t numRoots() const = 0; virtual size_t numRoots() const = 0;
virtual std::string getString(size_t index) const = 0; virtual std::string getString(uint32_t index) const = 0;
virtual void setUseSkinning(bool skinning) = 0; virtual void setUseSkinning(bool skinning) = 0;
@ -129,8 +129,10 @@ public:
size_t numRoots() const override { return roots.size(); } size_t numRoots() const override { return roots.size(); }
/// Get a given string from the file's string table /// Get a given string from the file's string table
std::string getString(size_t index) const override std::string getString(uint32_t index) const override
{ {
if (index == std::numeric_limits<uint32_t>::max())
return std::string();
return strings.at(index); return strings.at(index);
} }