From dadf94b5c04aacb334f45fc200190736e04097c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 16:22:29 +0200
Subject: [PATCH] Remove unnecessary padding from entities

---
 src/openrct2/world/Sprite.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp
index 8ba1fd17cc..882d9beb88 100644
--- a/src/openrct2/world/Sprite.cpp
+++ b/src/openrct2/world/Sprite.cpp
@@ -36,16 +36,23 @@
 
 union Entity
 {
-    uint8_t pad_00[0x200];
-    EntityBase base;
-    // Provide a constructor as EntityBase is not trivially constructible
-    Entity()
-        : pad_00()
-    {
-    }
+    EntityBase base{};
+    Vehicle vehicle;
+    Guest guest;
+    Staff staff;
+    Litter litter;
+    SteamParticle steamParticle;
+    MoneyEffect money;
+    VehicleCrashParticle crashParticle;
+    ExplosionCloud explosionCloud;
+    CrashSplashParticle crashSplash;
+    ExplosionFlare explosionFlare;
+    JumpingFountain jumpingFountain;
+    Balloon balloon;
+    Duck duck;
 };
 
-static Entity _entities[MAX_ENTITIES];
+static Entity _entities[MAX_ENTITIES]{};
 static std::array<std::list<uint16_t>, EnumValue(EntityType::Count)> gEntityLists;
 static std::vector<uint16_t> _freeIdList;