diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index b5ab4795ce..64121664e2 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -657,7 +657,7 @@ static void window_title_command_editor_tool_down( } else if (spriteIdentifier == SPRITE_IDENTIFIER_MISC) { - if (info.sprite->IsBalloon()) + if (info.sprite->generic.Is()) { validSprite = true; format_string(command.SpriteName, USER_STRING_MAX_LENGTH, STR_SHOP_ITEM_SINGULAR_BALLOON, nullptr); diff --git a/src/openrct2/actions/BalloonPressAction.hpp b/src/openrct2/actions/BalloonPressAction.hpp index 087f0f6501..85c997d2ea 100644 --- a/src/openrct2/actions/BalloonPressAction.hpp +++ b/src/openrct2/actions/BalloonPressAction.hpp @@ -37,7 +37,7 @@ public: GameActionResult::Ptr Query() const override { rct_sprite* sprite = try_get_sprite(_spriteIndex); - if (sprite == nullptr || !sprite->IsBalloon()) + if (sprite == nullptr || !sprite->generic.Is()) { log_error("Tried getting invalid sprite for balloon: %u", _spriteIndex); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); @@ -48,7 +48,7 @@ public: GameActionResult::Ptr Execute() const override { rct_sprite* sprite = try_get_sprite(_spriteIndex); - if (sprite == nullptr || !sprite->IsBalloon()) + if (sprite == nullptr || !sprite->generic.Is()) { log_error("Tried getting invalid sprite for balloon: %u", _spriteIndex); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); diff --git a/src/openrct2/world/Balloon.cpp b/src/openrct2/world/Balloon.cpp index 7b453a761c..39d2e27a91 100644 --- a/src/openrct2/world/Balloon.cpp +++ b/src/openrct2/world/Balloon.cpp @@ -14,11 +14,6 @@ #include "../util/Util.h" #include "Sprite.h" -bool rct_sprite::IsBalloon() -{ - return this->balloon.sprite_identifier == SPRITE_IDENTIFIER_MISC && this->balloon.type == SPRITE_MISC_BALLOON; -} - template<> bool SpriteBase::Is() const { return sprite_identifier == SPRITE_IDENTIFIER_MISC && type == SPRITE_MISC_BALLOON; @@ -27,7 +22,7 @@ template<> bool SpriteBase::Is() const Balloon* rct_sprite::AsBalloon() { Balloon* result = nullptr; - if (IsBalloon()) + if (generic.Is()) { result = reinterpret_cast(this); } diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index 96fe403fc4..a14e49a07c 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -880,7 +880,7 @@ uint16_t remove_floating_sprites() for (uint16_t i = 0; i < MAX_SPRITES; i++) { rct_sprite* rctSprite = get_sprite(i); - if (rctSprite->IsBalloon()) + if (rctSprite->generic.Is()) { sprite_remove(rctSprite->AsBalloon()); sprite_misc_update(rctSprite); diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index 992937624f..c72d3ca494 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 IsBalloon(); bool IsDuck(); bool IsMoneyEffect(); bool IsPeep() const;