From 213064e312c5b6fa7ef68f73bbef98c09144e1c7 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 18:25:43 +0200 Subject: [PATCH] Revert old storage until the complex member types are gone --- src/openrct2/entity/EntityRegistry.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index 477a561116..a020a56b40 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -36,20 +36,12 @@ union Entity { - 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; + uint8_t pad_00[0x200]; + EntityBase base; + Entity() + : pad_00() + { + } }; static Entity _entities[MAX_ENTITIES]{};