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

Add is animating state to scenery doors

Browse Source
This commit is contained in:
mix
2025-05-19 16:42:50 +01:00
parent e467f5db02
commit daf8c186d3
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ static bool UpdateWallAnimation(WallElement& wall, const CoordsXYZ& loc, const i
return false;
}
if (entry->flags & WALL_SCENERY_IS_DOOR)
if (entry->flags & WALL_SCENERY_IS_DOOR && wall.IsAnimating())
{
if (getGameState().currentTicks & 1)
{
@@ -205,6 +205,7 @@ static bool UpdateWallAnimation(WallElement& wall, const CoordsXYZ& loc, const i
if (currentFrame == 15)
{
newFrame = 0;
wall.SetIsAnimating(false);
}
else
{
@@ -327,7 +328,7 @@ static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation)
return hasAnimations;
}
static bool IsElementAnimated(const TileElementBase& element, const bool skipDoors)
static bool IsElementAnimated(const TileElementBase& element)
{
switch (element.GetType())
{
@@ -343,7 +344,7 @@ static bool IsElementAnimated(const TileElementBase& element, const bool skipDoo
{
return true;
}
if (!skipDoors && (entry->flags & WALL_SCENERY_IS_DOOR))
if (entry->flags & WALL_SCENERY_IS_DOOR && wall->IsAnimating())
{
return true;
}
@@ -432,7 +433,7 @@ void MapAnimation::CreateAll()
TileElementIteratorBegin(&it);
while (TileElementIteratorNext(&it))
{
if (IsElementAnimated(*it.element, true))
if (IsElementAnimated(*it.element))
{
_mapAnimations.insert(TileCoordsXY(it.x, it.y));
}