mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Merge pull request #24036 from ZehMatt/bypass-type-check

Browse Source 
Skip the type checking in GetEntity/TryGetEntity with T as BaseEntity
This commit is contained in:
Matt
2025-03-21 00:36:41 +02:00
committed by GitHub
parent 3e0826e85c c7c5a2c9c0
commit 34478640b5
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/openrct2/entity/EntityRegistry.h
View File

@@ -29,22 +29,44 @@ namespace OpenRCT2
constexpr uint16_t kMaxEntities = 65535;
EntityBase* GetEntity(EntityId sprite_idx);
EntityBase* GetEntity(EntityId entityId);
template<typename T>
T* GetEntity(EntityId sprite_idx)
T* GetEntity(EntityId entityId)
{
auto spr = GetEntity(sprite_idx);
return spr != nullptr ? spr->As<T>() : nullptr;
auto* ent = GetEntity(entityId);
if (ent == nullptr)
{
return nullptr;
}
if constexpr (std::is_same_v<T, EntityBase>)
{
return ent;
}
else
{
return ent->As<T>();
}
}
EntityBase* TryGetEntity(EntityId spriteIndex);
template<typename T>
T* TryGetEntity(EntityId sprite_idx)
T* TryGetEntity(EntityId entityId)
{
auto spr = TryGetEntity(sprite_idx);
return spr != nullptr ? spr->As<T>() : nullptr;
auto* ent = TryGetEntity(entityId);
if (ent == nullptr)
{
return nullptr;
}
if constexpr (std::is_same_v<T, EntityBase>)
{
return ent;
}
else
{
return ent->As<T>();
}
}
EntityBase* CreateEntity(EntityType type);