From dc297e90c062706f0f5effe1b1612397342f2aeb Mon Sep 17 00:00:00 2001 From: Richard Fine Date: Mon, 7 Sep 2020 22:42:42 -0400 Subject: [PATCH] Fix compile errors in TestPaint project --- test/testpaint/Compat.cpp | 2 +- test/testpaint/TestTrack.cpp | 2 +- test/testpaint/Utils.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index 17cbec98cd..bfae0134da 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -457,7 +457,7 @@ bool TrackElement::IsHighlighted() const uint8_t PathElement::GetEdges() const { - return Edges & 0xF; + return EdgesAndCorners & 0xF; } StationObject* ride_get_station_object(const Ride* ride) diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index 679a4a67d4..e167ab49a4 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -194,7 +194,7 @@ static void CallNew( uint8_t rideType, uint8_t trackType, uint8_t direction, uint8_t trackSequence, uint16_t height, TileElement* tileElement) { TRACK_PAINT_FUNCTION_GETTER newPaintFunctionGetter = RideTypeDescriptors[rideType].TrackPaintFunction; - TRACK_PAINT_FUNCTION newPaintFunction = newPaintFunctionGetter(trackType, direction); + TRACK_PAINT_FUNCTION newPaintFunction = newPaintFunctionGetter(trackType); newPaintFunction(&gPaintSession, 0, trackSequence, direction, height, tileElement); } diff --git a/test/testpaint/Utils.cpp b/test/testpaint/Utils.cpp index 26238f0ab4..9c6a605745 100644 --- a/test/testpaint/Utils.cpp +++ b/test/testpaint/Utils.cpp @@ -54,7 +54,7 @@ namespace Utils return false; } - if (newPaintGetter(trackType, 0) == nullptr) + if (newPaintGetter(trackType) == nullptr) { return false; }