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

Make FreeEntity take a reference

Browse Source
This commit is contained in:
Gymnasiast
2021-09-12 18:29:37 +02:00
parent 002c17cec8
commit 0f183e9ad2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ constexpr const uint32_t SPATIAL_INDEX_LOCATION_NULL = SPATIAL_INDEX_SIZE - 1;
static std::array<std::vector<uint16_t>, SPATIAL_INDEX_SIZE> gSpriteSpatialIndex;
static void FreeEntity(EntityBase* entity);
static void FreeEntity(EntityBase& entity);
constexpr size_t GetSpatialIndexOffset(int32_t x, int32_t y)
{
@@ -238,7 +238,7 @@ void reset_sprite_list()
{
continue;
}
FreeEntity(spr);
FreeEntity(*spr);
spr->Type = EntityType::Null;
spr->sprite_index = i;
@@ -545,10 +545,10 @@ void sprite_set_coordinates(const CoordsXYZ& spritePos, EntityBase* sprite)
/**
* Frees any dynamically attached memory to the entity, such as peep name.
*/
static void FreeEntity(EntityBase* entity)
static void FreeEntity(EntityBase& entity)
{
auto* guest = entity->As<Guest>();
auto* staff = entity->As<Staff>();
auto* guest = entity.As<Guest>();
auto* staff = entity.As<Staff>();
if (staff != nullptr)
{
staff->SetName({});
@@ -567,7 +567,7 @@ static void FreeEntity(EntityBase* entity)
*/
void sprite_remove(EntityBase* sprite)
{
FreeEntity(sprite);
FreeEntity(*sprite);
EntityTweener::Get().RemoveEntity(sprite);
RemoveFromEntityList(sprite); // remove from existing list