From 2989ef6ccd6bc5de180063a7e794fc3f07c7c98d Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 10 Oct 2021 07:46:55 +0100 Subject: [PATCH] Remove testpaint modifications --- test/testpaint/Compat.cpp | 7 +------ test/testpaint/PaintIntercept.cpp | 24 ++++++++++++------------ test/testpaint/TestPaint.cpp | 1 + 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index 117a0f0716..d0a62db3bf 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -40,8 +40,8 @@ ride_id_t gTrackDesignSaveRideIndex = RIDE_ID_NULL; uint8_t gClipHeight = 255; CoordsXY gClipSelectionA = { 0, 0 }; CoordsXY gClipSelectionB = { MAXIMUM_TILE_START_XY, MAXIMUM_TILE_START_XY }; +uint32_t gScenarioTicks; uint8_t gCurrentRotation; -uint32_t gCurrentTicks; // clang-format off constexpr const std::array CoordsDirectionDelta = { @@ -887,11 +887,6 @@ void TileElementBase::SetOwner(uint8_t newOwner) owner |= (newOwner & OWNER_MASK); } -bool TileElementBase::IsInvisible() const -{ - return (this->Flags & TILE_ELEMENT_FLAG_INVISIBLE) != 0; -} - namespace OpenRCT2 { IContext* GetContext() diff --git a/test/testpaint/PaintIntercept.cpp b/test/testpaint/PaintIntercept.cpp index 9c38823ce8..f5f0ec2df3 100644 --- a/test/testpaint/PaintIntercept.cpp +++ b/test/testpaint/PaintIntercept.cpp @@ -344,8 +344,8 @@ bool metal_b_supports_paint_setup( } paint_struct* PaintAddImageAsParent( - paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x, - int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset) + paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, + int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset) { return PaintIntercept::Paint6C( image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, @@ -360,9 +360,9 @@ paint_struct* PaintAddImageAsParent( } paint_struct* PaintAddImageAsParent( - paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x, - int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset, int32_t bound_box_offset_x, - int32_t bound_box_offset_y, int32_t bound_box_offset_z) + paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, + int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, + int16_t bound_box_offset_y, int16_t bound_box_offset_z) { return PaintIntercept::PaintFull( PAINT_98197C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, @@ -387,9 +387,9 @@ paint_struct* PaintAddImageAsChild( } paint_struct* PaintAddImageAsOrphan( - paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x, - int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset, int32_t bound_box_offset_x, - int32_t bound_box_offset_y, int32_t bound_box_offset_z) + paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, + int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, + int16_t bound_box_offset_y, int16_t bound_box_offset_z) { return PaintIntercept::PaintFull( PAINT_98198C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, @@ -397,16 +397,16 @@ paint_struct* PaintAddImageAsOrphan( } paint_struct* PaintAddImageAsChild( - paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x, - int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset, int32_t bound_box_offset_x, - int32_t bound_box_offset_y, int32_t bound_box_offset_z) + paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, + int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, + int16_t bound_box_offset_y, int16_t bound_box_offset_z) { return PaintIntercept::PaintFull( PAINT_98199C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, bound_box_offset_x, bound_box_offset_y, bound_box_offset_z, session->CurrentRotation); } -bool PaintAttachToPreviousPS(paint_session* session, uint32_t image_id, int32_t x, int32_t y) +bool PaintAttachToPreviousPS(paint_session* session, uint32_t image_id, int16_t x, int16_t y) { return false; } diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp index f4dc4d8260..334fd850b6 100644 --- a/test/testpaint/TestPaint.cpp +++ b/test/testpaint/TestPaint.cpp @@ -64,6 +64,7 @@ namespace TestPaint RCT2_CurrentViewportFlags = 0; + gScenarioTicks = 0; RCT2_ScenarioTicks = 0; }