From bee424585adf6584494ac80c17173933e504c156 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sat, 6 Jun 2020 10:42:03 +0100
Subject: [PATCH] Remove AsDuck

---
 src/openrct2/world/Duck.cpp   | 10 ----------
 src/openrct2/world/Sprite.cpp |  2 +-
 src/openrct2/world/Sprite.h   |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/world/Duck.cpp
index 1a04b58b8e..264d4f4feb 100644
--- a/src/openrct2/world/Duck.cpp
+++ b/src/openrct2/world/Duck.cpp
@@ -79,16 +79,6 @@ template<> bool SpriteBase::Is<Duck>() const
     return sprite_identifier == SPRITE_IDENTIFIER_MISC && type == SPRITE_MISC_DUCK;
 }
 
-Duck* rct_sprite::AsDuck()
-{
-    Duck* result = nullptr;
-    if (generic.Is<Duck>())
-    {
-        return reinterpret_cast<Duck*>(this);
-    }
-    return result;
-}
-
 void Duck::Invalidate()
 {
     invalidate_sprite_1(this);
diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp
index 11470b04fd..250bcab652 100644
--- a/src/openrct2/world/Sprite.cpp
+++ b/src/openrct2/world/Sprite.cpp
@@ -888,7 +888,7 @@ uint16_t remove_floating_sprites()
         }
         else if (rctSprite->generic.Is<Duck>())
         {
-            if (rctSprite->AsDuck()->IsFlying())
+            if (rctSprite->generic.As<Duck>()->IsFlying())
             {
                 rctSprite->duck.Remove();
                 sprite_misc_update(rctSprite);
diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h
index 18b448ed43..7dbfa2a80a 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;
 
-    Duck* AsDuck();
     MoneyEffect* AsMoneyEffect();
     Peep* AsPeep();
     // Default constructor to prevent non trivial construction issues