mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

Entity type4: Remove MiscEntityType and add FountainType (#14344)

Browse Source 
* Move jumpingfountain type out of misc entity type

* Remove SubType for MiscEntities as it is no longer required

* Update replays

* Apply review comments

* Increment network version
This commit is contained in:
Duncan
2021-03-22 21:24:50 +00:00
committed by GitHub
parent 4631c22a3c
commit ccfa22c230
21 changed files with 165 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,9 +78,9 @@ template<> bool SpriteBase::Is<Litter>() const
return Type == EntityType::Litter;
}
template<> bool SpriteBase::Is<MiscEntity>() const
constexpr bool EntityTypeIsMiscEntity(const EntityType type)
{
switch (Type)
switch (type)
{
case EntityType::SteamParticle:
case EntityType::MoneyEffect:
@@ -97,6 +97,11 @@ template<> bool SpriteBase::Is<MiscEntity>() const
}
}
template<> bool SpriteBase::Is<MiscEntity>() const
{
return EntityTypeIsMiscEntity(Type);
}
template<> bool SpriteBase::Is<SteamParticle>() const
{
return Type == EntityType::SteamParticle;
@@ -195,35 +200,6 @@ void SpriteBase::Invalidate()
viewports_invalidate(sprite_left, sprite_top, sprite_right, sprite_bottom, maxZoom);
}
constexpr SpriteIdentifier EntityTypeToSpriteIdentifier(const EntityType type)
{
switch (type)
{
case EntityType::Vehicle:
return SpriteIdentifier::Vehicle;
case EntityType::Guest:
return SpriteIdentifier::Peep;
case EntityType::Staff:
return SpriteIdentifier::Peep;
case EntityType::Litter:
return SpriteIdentifier::Litter;
case EntityType::SteamParticle:
case EntityType::MoneyEffect:
case EntityType::CrashedVehicleParticle:
case EntityType::ExplosionCloud:
case EntityType::CrashSplash:
case EntityType::ExplosionFlare:
case EntityType::JumpingFountain:
case EntityType::Balloon:
case EntityType::Duck:
return SpriteIdentifier::Misc;
case EntityType::Null:
case EntityType::Count:
return SpriteIdentifier::Null;
}
return SpriteIdentifier::Null;
}
void RebuildEntityLists()
{
for (auto& list : gEntityLists)
@@ -444,8 +420,7 @@ rct_sprite* create_sprite(EntityType type)
return nullptr;
}
auto spriteIdentifier = EntityTypeToSpriteIdentifier(type);
if (spriteIdentifier == SpriteIdentifier::Misc)
if (EntityTypeIsMiscEntity(type))
{
// Misc sprites are commonly used for effects, if there are less than MAX_MISC_SPRITES
// free it will fail to keep slots for more relevant sprites.
@@ -519,7 +494,6 @@ void sprite_misc_explosion_cloud_create(const CoordsXYZ& cloudPos)
sprite->sprite_height_negative = 32;
sprite->sprite_height_positive = 34;
sprite->MoveTo(cloudPos + CoordsXYZ{ 0, 0, 4 });
sprite->SubType = MiscEntityType::ExplosionCloud;
sprite->frame = 0;
}
}
@@ -551,7 +525,6 @@ void sprite_misc_explosion_flare_create(const CoordsXYZ& flarePos)
sprite->sprite_height_negative = 85;
sprite->sprite_height_positive = 8;
sprite->MoveTo(flarePos + CoordsXYZ{ 0, 0, 4 });
sprite->SubType = MiscEntityType::ExplosionFlare;
sprite->frame = 0;
}
}