From 881afc7579c36a422622c18b8e02f482bdc8b37d Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sat, 6 Jun 2020 10:24:33 +0100
Subject: [PATCH] Remove IsMoneyEffect

---
 src/openrct2/world/MoneyEffect.cpp | 8 +-------
 src/openrct2/world/Sprite.cpp      | 2 +-
 src/openrct2/world/Sprite.h        | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp
index c89b2d48cd..57c75e6c45 100644
--- a/src/openrct2/world/MoneyEffect.cpp
+++ b/src/openrct2/world/MoneyEffect.cpp
@@ -23,16 +23,10 @@ template<> bool SpriteBase::Is<MoneyEffect>() const
     return sprite_identifier == SPRITE_IDENTIFIER_MISC && type == SPRITE_MISC_MONEY_EFFECT;
 }
 
-bool rct_sprite::IsMoneyEffect()
-{
-    return this->money_effect.sprite_identifier == SPRITE_IDENTIFIER_MISC
-        && this->money_effect.type == SPRITE_MISC_MONEY_EFFECT;
-}
-
 MoneyEffect* rct_sprite::AsMoneyEffect()
 {
     MoneyEffect* result = nullptr;
-    if (IsMoneyEffect())
+    if (generic.Is<MoneyEffect>())
     {
         result = reinterpret_cast<MoneyEffect*>(this);
     }
diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp
index 094f8ddc55..6f36816857 100644
--- a/src/openrct2/world/Sprite.cpp
+++ b/src/openrct2/world/Sprite.cpp
@@ -895,7 +895,7 @@ uint16_t remove_floating_sprites()
                 removed++;
             }
         }
-        else if (rctSprite->IsMoneyEffect())
+        else if (rctSprite->generic.Is<MoneyEffect>())
         {
             sprite_remove(rctSprite->AsMoneyEffect());
             sprite_misc_update(rctSprite);
diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h
index c1cac013b1..2b015521dc 100644
--- a/src/openrct2/world/Sprite.h
+++ b/src/openrct2/world/Sprite.h
@@ -137,7 +137,6 @@ union rct_sprite
     CrashSplashParticle crash_splash;
     SteamParticle steam_particle;
 
-    bool IsMoneyEffect();
     bool IsPeep() const;
     Balloon* AsBalloon();
     Duck* AsDuck();