mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into new-save-format

Browse Source
This commit is contained in:
ζeh Matt
2021-09-28 01:53:18 +03:00
parent d8ce486fa4 fb51f796c2
commit 8ae8a26a0f
4 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2/world/Sprite.cpp
View File

@@ -48,21 +48,18 @@ static void FreeEntity(EntityBase& entity);
constexpr size_t GetSpatialIndexOffset(int32_t x, int32_t y)
{
size_t index = SPATIAL_INDEX_LOCATION_NULL;
if (x != LOCATION_NULL)
{
x = std::clamp(x, 0, 0xFFFF);
y = std::clamp(y, 0, 0xFFFF);
if (x == LOCATION_NULL)
return SPATIAL_INDEX_LOCATION_NULL;
int16_t flooredX = floor2(x, 32);
uint8_t tileY = y >> 5;
index = (flooredX << 3) | tileY;
}
const auto tileX = std::clamp<size_t>(x / COORDS_XY_STEP, 0, MAXIMUM_MAP_SIZE_TECHNICAL);
const auto tileY = std::clamp<size_t>(y / COORDS_XY_STEP, 0, MAXIMUM_MAP_SIZE_TECHNICAL);
const auto index = tileX * MAXIMUM_MAP_SIZE_TECHNICAL + tileY;
if (index >= sizeof(gSpriteSpatialIndex))
if (index >= std::size(gSpriteSpatialIndex))
{
return SPATIAL_INDEX_LOCATION_NULL;
}
return index;
}