From 5d22166fc3550d8962cf0e2ed1937a46b555f715 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 23 Sep 2018 12:01:58 +0200 Subject: [PATCH] Fix TestPaint --- test/testpaint/Compat.cpp | 6 ++++++ test/testpaint/TestTrack.cpp | 5 +++++ test/testpaint/generate.cpp | 1 + 3 files changed, 12 insertions(+) diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index ef8142ee0d..a413308750 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -384,6 +384,12 @@ TileCoordsXYZD ride_get_exit_location(const Ride* ride, const int32_t stationInd return ride->exits[stationIndex]; } +void TileElementBase::SetType(uint8_t newType) +{ + this->type &= ~TILE_ELEMENT_TYPE_MASK; + this->type |= (newType & TILE_ELEMENT_TYPE_MASK); +} + uint8_t TileElementBase::GetDirection() const { return this->type & TILE_ELEMENT_DIRECTION_MASK; diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index fe9c4cba4f..acdb2bae8a 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -270,6 +270,7 @@ static uint8_t TestTrackElementPaintCalls(uint8_t rideType, uint8_t trackType, u uint16_t height = 3 * 16; rct_tile_element tileElement = {}; + tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; @@ -432,6 +433,7 @@ static uint8_t TestTrackElementSegmentSupportHeight( uint16_t height = 3 * 16; rct_tile_element tileElement = {}; + tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; @@ -518,6 +520,7 @@ static uint8_t TestTrackElementGeneralSupportHeight( uint16_t height = 3 * 16; rct_tile_element tileElement = {}; + tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; @@ -618,6 +621,7 @@ static uint8_t TestTrackElementSideTunnels(uint8_t rideType, uint8_t trackType, uint16_t height = 3 * 16; rct_tile_element tileElement = {}; + tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; @@ -745,6 +749,7 @@ static uint8_t TestTrackElementVerticalTunnels(uint8_t rideType, uint8_t trackTy uint16_t height = 3 * 16; rct_tile_element tileElement = {}; + tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 19a8c08d7a..beda8bd256 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -445,6 +445,7 @@ private: for (int direction = 0; direction < 4; direction++) { rct_tile_element tileElement = {}; + tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = 3;