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

Merge pull request #10866 from Gymnasiast/refactor/more-tile-element-prep

Browse Source 
Refactor/more tile element prep
This commit is contained in:
Michael Steenbeek
2020-03-06 09:25:32 +01:00
committed by GitHub
parent d64b73c29a c9afcaa5b3
commit 4f86d0115c
31 changed files with 380 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/ride/Track.cpp
View File

@@ -1377,35 +1377,35 @@ void TrackElement::SetInverted(bool inverted)
bool TrackElement::BlockBrakeClosed() const
{
return (flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED) != 0;
return (Flags2 & TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED) != 0;
}
void TrackElement::SetBlockBrakeClosed(bool isClosed)
{
if (isClosed)
{
flags |= TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED;
Flags2 |= TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED;
}
else
{
flags &= ~TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED;
Flags2 &= ~TRACK_ELEMENT_FLAGS2_BLOCK_BRAKE_CLOSED;
}
}
bool TrackElement::IsIndestructible() const
{
return (flags & TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE) != 0;
return (Flags2 & TRACK_ELEMENT_FLAGS2_INDESTRUCTIBLE_TRACK_PIECE) != 0;
}
void TrackElement::SetIsIndestructible(bool isIndestructible)
{
if (isIndestructible)
{
flags |= TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE;
Flags2 |= TRACK_ELEMENT_FLAGS2_INDESTRUCTIBLE_TRACK_PIECE;
}
else
{
flags &= ~TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE;
Flags2 &= ~TRACK_ELEMENT_FLAGS2_INDESTRUCTIBLE_TRACK_PIECE;
}
}