From 0e1dbf7cf17ccad2522c5d8d996fb0c657c647f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 27 Nov 2021 15:38:58 +0200
Subject: [PATCH] Move painting for SplashCrash entity

---
 src/openrct2/entity/Particle.cpp         | 5 ++++-
 src/openrct2/entity/Particle.h           | 2 +-
 src/openrct2/paint/sprite/Paint.Misc.cpp | 8 --------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/openrct2/entity/Particle.cpp b/src/openrct2/entity/Particle.cpp
index 827859e5a0..0507e8be6d 100644
--- a/src/openrct2/entity/Particle.cpp
+++ b/src/openrct2/entity/Particle.cpp
@@ -186,8 +186,11 @@ void CrashSplashParticle::Serialise(DataSerialiser& stream)
     stream << frame;
 }
 
-void CrashSplashParticle::Paint() const
+void CrashSplashParticle::Paint(paint_session* session, int32_t imageDirection) const
 {
+    // TODO: Create constant in sprites.h
+    uint32_t imageId = 22927 + (frame / 256);
+    PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 0 });
 }
 
 /**
diff --git a/src/openrct2/entity/Particle.h b/src/openrct2/entity/Particle.h
index 710280039a..0c0173ff19 100644
--- a/src/openrct2/entity/Particle.h
+++ b/src/openrct2/entity/Particle.h
@@ -42,7 +42,7 @@ struct CrashSplashParticle : EntityBase
     static void Create(const CoordsXYZ& splashPos);
     void Update();
     void Serialise(DataSerialiser& stream);
-    void Paint() const;
+    void Paint(paint_session* session, int32_t imageDirection) const;
 };
 
 struct ExplosionFlare : EntityBase
diff --git a/src/openrct2/paint/sprite/Paint.Misc.cpp b/src/openrct2/paint/sprite/Paint.Misc.cpp
index 1b135a59b6..1acc851ca2 100644
--- a/src/openrct2/paint/sprite/Paint.Misc.cpp
+++ b/src/openrct2/paint/sprite/Paint.Misc.cpp
@@ -73,11 +73,3 @@ template<> void PaintEntity(paint_session* session, const ExplosionCloud* partic
     uint32_t imageId = 22878 + (particle->frame / 256);
     PaintAddImageAsParent(session, imageId, { 0, 0, particle->z }, { 1, 1, 0 });
 }
-
-template<> void PaintEntity(paint_session* session, const CrashSplashParticle* crashSplash, int32_t imageDirection)
-{
-    if (crashSplash == nullptr)
-        return;
-    uint32_t imageId = 22927 + (crashSplash->frame / 256);
-    PaintAddImageAsParent(session, imageId, { 0, 0, crashSplash->z }, { 1, 1, 0 });
-}