mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Remove numerics from common.h and use it as needed

Browse Source
This commit is contained in:
ζeh Matt
2021-09-11 19:53:14 +03:00
parent 2e2bda8f70
commit b733e97bfa
25 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/object/ObjectRepository.cpp
View File

@@ -21,6 +21,7 @@
#include "../core/IStream.hpp"
#include "../core/Memory.hpp"
#include "../core/MemoryStream.h"
#include "../core/Numerics.hpp"
#include "../core/Path.hpp"
#include "../core/String.hpp"
#include "../localisation/Localisation.h"
@@ -757,11 +758,11 @@ int32_t object_calculate_checksum(const rct_object_entry* entry, const void* dat
uint32_t checksum = 0xF369A75B;
checksum ^= entryBytePtr[0];
checksum = rol32(checksum, 11);
checksum = Numerics::rol32(checksum, 11);
for (int32_t i = 4; i < 12; i++)
{
checksum ^= entryBytePtr[i];
checksum = rol32(checksum, 11);
checksum = Numerics::rol32(checksum, 11);
}
const uint8_t* dataBytes = reinterpret_cast<const uint8_t*>(data);
@@ -772,12 +773,12 @@ int32_t object_calculate_checksum(const rct_object_entry* entry, const void* dat
{
checksum ^= dataBytes[j];
}
checksum = rol32(checksum, 11);
checksum = Numerics::rol32(checksum, 11);
}
for (size_t i = dataLength32; i < dataLength; i++)
{
checksum ^= dataBytes[i];
checksum = rol32(checksum, 11);
checksum = Numerics::rol32(checksum, 11);
}
return static_cast<int32_t>(checksum);