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

Remove IsMoneyEffect

This commit is contained in:
duncanspumpkin 2020-06-06 10:24:33 +01:00
parent f5772fae48
commit 881afc7579
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/world/MoneyEffect.cpp
View File

@ -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);
}

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

@ -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);

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

@ -137,7 +137,6 @@ union rct_sprite
CrashSplashParticle crash_splash;
SteamParticle steam_particle;
bool IsMoneyEffect();
bool IsPeep() const;
Balloon* AsBalloon();
Duck* AsDuck();