mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816)

Browse Source
This commit is contained in:
Duncan
2021-06-04 12:41:23 +01:00
committed by GitHub
parent 12c5484f44
commit c34079acee
27 changed files with 153 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/world/MapAnimation.cpp
View File

@@ -447,7 +447,6 @@ static bool map_animation_invalidate_large_scenery(const CoordsXYZ& loc)
{
TileCoordsXYZ tileLoc{ loc };
TileElement* tileElement;
rct_scenery_entry* sceneryEntry;
bool wasInvalidated = false;
tileElement = map_get_first_element_at(loc);
@@ -460,8 +459,8 @@ static bool map_animation_invalidate_large_scenery(const CoordsXYZ& loc)
if (tileElement->GetType() != TILE_ELEMENT_TYPE_LARGE_SCENERY)
continue;
sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
if (sceneryEntry->large_scenery.flags & LARGE_SCENERY_FLAG_ANIMATED)
auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
if (sceneryEntry->flags & LARGE_SCENERY_FLAG_ANIMATED)
{
map_invalidate_tile_zoom1({ loc, loc.z, loc.z + 16 });
wasInvalidated = true;
@@ -651,7 +650,7 @@ void AutoCreateMapAnimations()
{
auto sceneryEl = el->AsLargeScenery();
auto entry = sceneryEl->GetEntry();
if (entry != nullptr && (entry->large_scenery.flags & LARGE_SCENERY_FLAG_ANIMATED))
if (entry != nullptr && (entry->flags & LARGE_SCENERY_FLAG_ANIMATED))
{
map_animation_create(MAP_ANIMATION_TYPE_LARGE_SCENERY, loc);
}