From 4698ddc5f5d6973002f524ee69e6109679e5fec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 12 Sep 2025 14:40:01 +0300
Subject: [PATCH] Add a cast method for entities, sometimes we know the type

---
 src/openrct2/entity/EntityBase.h    | 12 ++++++++++++
 src/openrct2/paint/Paint.Entity.cpp | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/openrct2/entity/EntityBase.h b/src/openrct2/entity/EntityBase.h
index 56918a6006..7e38d30c87 100644
--- a/src/openrct2/entity/EntityBase.h
+++ b/src/openrct2/entity/EntityBase.h
@@ -80,6 +80,18 @@ struct EntityBase
         return Is<T>() ? reinterpret_cast<const T*>(this) : nullptr;
     }
 
+    template<typename T>
+    T* cast()
+    {
+        return reinterpret_cast<T*>(this);
+    }
+
+    template<typename T>
+    const T* cast() const
+    {
+        return reinterpret_cast<const T*>(this);
+    }
+
     void Serialise(class DataSerialiser& stream);
 
     void Paint() const;
diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp
index c6be9767ef..ce91548854 100644
--- a/src/openrct2/paint/Paint.Entity.cpp
+++ b/src/openrct2/paint/Paint.Entity.cpp
@@ -131,45 +131,45 @@ void EntityPaintSetup(PaintSession& session, const CoordsXY& pos)
         switch (entity->Type)
         {
             case EntityType::Vehicle:
-                entity->As<Vehicle>()->Paint(session, image_direction);
+                entity->cast<Vehicle>()->Paint(session, image_direction);
                 if (LightFx::ForVehiclesIsAvailable())
                 {
-                    LightFx::AddLightsMagicVehicle(entity->As<Vehicle>());
+                    LightFx::AddLightsMagicVehicle(entity->cast<Vehicle>());
                 }
                 break;
             case EntityType::Guest:
             case EntityType::Staff:
-                entity->As<Peep>()->Paint(session, image_direction);
+                entity->cast<Peep>()->Paint(session, image_direction);
                 break;
             case EntityType::SteamParticle:
-                entity->As<SteamParticle>()->Paint(session, image_direction);
+                entity->cast<SteamParticle>()->Paint(session, image_direction);
                 break;
             case EntityType::MoneyEffect:
-                entity->As<MoneyEffect>()->Paint(session, image_direction);
+                entity->cast<MoneyEffect>()->Paint(session, image_direction);
                 break;
             case EntityType::CrashedVehicleParticle:
-                entity->As<VehicleCrashParticle>()->Paint(session, image_direction);
+                entity->cast<VehicleCrashParticle>()->Paint(session, image_direction);
                 break;
             case EntityType::ExplosionCloud:
-                entity->As<ExplosionCloud>()->Paint(session, image_direction);
+                entity->cast<ExplosionCloud>()->Paint(session, image_direction);
                 break;
             case EntityType::CrashSplash:
-                entity->As<CrashSplashParticle>()->Paint(session, image_direction);
+                entity->cast<CrashSplashParticle>()->Paint(session, image_direction);
                 break;
             case EntityType::ExplosionFlare:
-                entity->As<ExplosionFlare>()->Paint(session, image_direction);
+                entity->cast<ExplosionFlare>()->Paint(session, image_direction);
                 break;
             case EntityType::JumpingFountain:
-                entity->As<JumpingFountain>()->Paint(session, image_direction);
+                entity->cast<JumpingFountain>()->Paint(session, image_direction);
                 break;
             case EntityType::Balloon:
-                entity->As<Balloon>()->Paint(session, image_direction);
+                entity->cast<Balloon>()->Paint(session, image_direction);
                 break;
             case EntityType::Duck:
-                entity->As<Duck>()->Paint(session, image_direction);
+                entity->cast<Duck>()->Paint(session, image_direction);
                 break;
             case EntityType::Litter:
-                entity->As<Litter>()->Paint(session, image_direction);
+                entity->cast<Litter>()->Paint(session, image_direction);
                 break;
             default:
                 assert(false);