mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Ensure the spatial index invalidates when moving the entity position

Browse Source
This commit is contained in:
ζeh Matt
2024-10-12 04:57:19 +03:00
parent 6a90e91237
commit 698a6491fc
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/entity/EntityBase.cpp
View File

@@ -20,18 +20,6 @@ template<> bool EntityBase::Is<EntityBase>() const
return true;
}
CoordsXYZ EntityBase::GetLocation() const
{
return { x, y, z };
}
void EntityBase::SetLocation(const CoordsXYZ& newLocation)
{
x = newLocation.x;
y = newLocation.y;
z = newLocation.z;
}
void EntityBase::Invalidate()
{
if (x == kLocationNull)

23
src/openrct2/entity/EntityRegistry.cpp
View File

@@ -464,6 +464,19 @@ void UpdateEntitiesSpatialIndex()
}
}
CoordsXYZ EntityBase::GetLocation() const
{
return { x, y, z };
}
void EntityBase::SetLocation(const CoordsXYZ& newLocation)
{
x = newLocation.x;
y = newLocation.y;
z = newLocation.z;
SpatialIndex |= kSpatialIndexDirtyMask;
}
void EntityBase::MoveTo(const CoordsXYZ& newLocation)
{
if (x != kLocationNull)
@@ -478,17 +491,9 @@ void EntityBase::MoveTo(const CoordsXYZ& newLocation)
loc.x = kLocationNull;
}
const auto newSpatialIndex = ComputeSpatialIndex(loc);
if (newSpatialIndex != GetSpatialIndex(this))
{
SpatialIndex |= kSpatialIndexDirtyMask;
}
if (loc.x == kLocationNull)
{
x = loc.x;
y = loc.y;
z = loc.z;
SetLocation(loc);
}
else
{