mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 10:15:36 +01:00
Code Issues Releases Wiki Activity

Rework and refactor PathBitEntry (#14809)

Browse Source
This commit is contained in:
Duncan
2021-06-03 21:23:00 +01:00
committed by GitHub
parent 425f968a67
commit 6f81248084
18 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/world/Scenery.cpp
View File

@@ -80,14 +80,14 @@ void scenery_update_tile(const CoordsXY& sceneryPos)
{
if (tileElement->AsPath()->HasAddition() && !tileElement->AsPath()->AdditionIsGhost())
{
rct_scenery_entry* sceneryEntry = tileElement->AsPath()->GetAdditionEntry();
if (sceneryEntry != nullptr)
auto* pathAddEntry = tileElement->AsPath()->GetAdditionEntry();
if (pathAddEntry != nullptr)
{
if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER)
if (pathAddEntry->flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER)
{
JumpingFountain::StartAnimation(JumpingFountainType::Water, sceneryPos, tileElement);
}
else if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW)
else if (pathAddEntry->flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW)
{
JumpingFountain::StartAnimation(JumpingFountainType::Snow, sceneryPos, tileElement);
}
@@ -253,14 +253,14 @@ rct_scenery_entry* get_banner_entry(ObjectEntryIndex entryIndex)
return result;
}
rct_scenery_entry* get_footpath_item_entry(ObjectEntryIndex entryIndex)
PathBitEntry* get_footpath_item_entry(ObjectEntryIndex entryIndex)
{
rct_scenery_entry* result = nullptr;
PathBitEntry* result = nullptr;
auto& objMgr = OpenRCT2::GetContext()->GetObjectManager();
auto obj = objMgr.GetLoadedObject(ObjectType::PathBits, entryIndex);
if (obj != nullptr)
{
result = static_cast<rct_scenery_entry*>(obj->GetLegacyData());
result = static_cast<PathBitEntry*>(obj->GetLegacyData());
}
return result;
}