mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove AsBalloon

This commit is contained in:
duncanspumpkin 2020-06-06 10:37:43 +01:00
parent 517ed57593
commit 6e78d8d654
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@ -170,7 +170,7 @@ int32_t viewport_interaction_left_click(const ScreenCoordsXY& screenCoords)
{ {
case SPRITE_MISC_BALLOON: case SPRITE_MISC_BALLOON:
{ {
auto balloonPress = BalloonPressAction(info.sprite->AsBalloon()->sprite_index); auto balloonPress = BalloonPressAction(info.sprite->generic.sprite_index);
GameActions::Execute(&balloonPress); GameActions::Execute(&balloonPress);
} }
break; break;

2
src/openrct2/actions/BalloonPressAction.hpp
View File

@ -54,7 +54,7 @@ public:
return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE); return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_NONE);
} }
sprite->AsBalloon()->Press(); sprite->generic.As<Balloon>()->Press();
return MakeResult(); return MakeResult();
} }

10
src/openrct2/world/Balloon.cpp
View File

@ -19,16 +19,6 @@ template<> bool SpriteBase::Is<Balloon>() const
return sprite_identifier == SPRITE_IDENTIFIER_MISC && type == SPRITE_MISC_BALLOON; return sprite_identifier == SPRITE_IDENTIFIER_MISC && type == SPRITE_MISC_BALLOON;
} }
Balloon* rct_sprite::AsBalloon()
{
Balloon* result = nullptr;
if (generic.Is<Balloon>())
{
result = reinterpret_cast<Balloon*>(this);
}
return result;
}
void Balloon::Update() void Balloon::Update()
{ {
invalidate_sprite_2(this); invalidate_sprite_2(this);

4
src/openrct2/world/Sprite.cpp
View File

@ -882,7 +882,7 @@ uint16_t remove_floating_sprites()
rct_sprite* rctSprite = get_sprite(i); rct_sprite* rctSprite = get_sprite(i);
if (rctSprite->generic.Is<Balloon>()) if (rctSprite->generic.Is<Balloon>())
{ {
sprite_remove(rctSprite->AsBalloon()); sprite_remove(&rctSprite->generic);
sprite_misc_update(rctSprite); sprite_misc_update(rctSprite);
removed++; removed++;
} }
@ -897,7 +897,7 @@ uint16_t remove_floating_sprites()
} }
else if (rctSprite->generic.Is<MoneyEffect>()) else if (rctSprite->generic.Is<MoneyEffect>())
{ {
sprite_remove(rctSprite->AsMoneyEffect()); sprite_remove(&rctSprite->generic);
sprite_misc_update(rctSprite); sprite_misc_update(rctSprite);
removed++; removed++;
} }

1
src/openrct2/world/Sprite.h
View File

@ -137,7 +137,6 @@ union rct_sprite
CrashSplashParticle crash_splash; CrashSplashParticle crash_splash;
SteamParticle steam_particle; SteamParticle steam_particle;
Balloon* AsBalloon();
Duck* AsDuck(); Duck* AsDuck();
MoneyEffect* AsMoneyEffect(); MoneyEffect* AsMoneyEffect();
Peep* AsPeep(); Peep* AsPeep();