diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index 016be80088..8ba1fd17cc 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -34,6 +34,17 @@ #include #include +union Entity +{ + uint8_t pad_00[0x200]; + EntityBase base; + // Provide a constructor as EntityBase is not trivially constructible + Entity() + : pad_00() + { + } +}; + static Entity _entities[MAX_ENTITIES]; static std::array, EnumValue(EntityType::Count)> gEntityLists; static std::vector _freeIdList; diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index a1740b6c4d..affeb4b833 100644 --- a/src/openrct2/world/Sprite.h +++ b/src/openrct2/world/Sprite.h @@ -15,29 +15,12 @@ #include #pragma pack(push, 1) -/** - * Entity structure. - * size: 0x0200 - */ -union Entity -{ - uint8_t pad_00[0x200]; - EntityBase base; - // Provide a constructor as EntityBase is not trivially constructible - Entity() - : pad_00() - { - } -}; -assert_struct_size(Entity, 0x200); - struct EntitiesChecksum { std::array raw; std::string ToString() const; }; - #pragma pack(pop) void ResetAllEntities();