mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-24 11:22:02 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile and formating

Browse source
This commit is contained in:
duncanspumpkin 2019-02-27 10:54:08 +00:00
parent 584c4d5134
commit 9d78bb0d4e
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/openrct2/paint/tile_element/Paint.Path.cpp
View file

@ -703,8 +703,7 @@ static void sub_6A3F61(
if (sceneryEntry == nullptr)
return;
if ((session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)
&& !(tile_element->AsPath()->IsBroken())
if ((session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) && !(tile_element->AsPath()->IsBroken())
&& !(sceneryEntry->path_bit.draw_type == PATH_BIT_DRAW_TYPE_BINS))
{
return;

1
src/openrct2/world/Footpath.cpp
View file

@ -2035,7 +2035,6 @@ void PathElement::SetHasQueueBanner(bool hasQueueBanner)
entryIndex |= FOOTPATH_PROPERTIES_FLAG_HAS_QUEUE_BANNER;
}
bool PathElement::IsBroken() const
{
return (flags & TILE_ELEMENT_FLAG_BROKEN) != 0;

5
test/testpaint/Compat.cpp
View file

@ -170,6 +170,11 @@ bool TileElementBase::IsGhost() const
return (this->flags & TILE_ELEMENT_FLAG_GHOST) != 0;
}
bool TrackElement::BlockBrakeClosed() const
{
return (flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED) != 0;
}
TileElement* map_get_first_element_at(int x, int y)
{
if (x < 0 || y < 0 || x > 255 || y > 255)