From 1a2cd1d1863b239e4a2d271d02269168b217d18a Mon Sep 17 00:00:00 2001 From: Spacek531 Date: Wed, 4 Oct 2023 22:26:23 -0700 Subject: [PATCH] revert some changes --- src/openrct2/ride/TrackPaint.h | 9 --------- src/openrct2/ride/coaster/WoodenRollerCoaster.h | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index 6fdda43b84..65a7e85a66 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -10,7 +10,6 @@ #pragma once #include "../common.h" -#include "../paint/Boundbox.h" #include "../paint/Paint.h" #include "../paint/Supports.h" #include "../paint/tile_element/Paint.TileElement.h" @@ -284,14 +283,6 @@ extern const uint8_t mapLeftEighthTurnToOrthogonal[5]; extern const size_t MiniGolfPeepAnimationLengths[]; -struct SpriteBoundBox2 -{ - ImageIndex ImageIdA; - ImageIndex ImageIdB; - CoordsXYZ offset; - ::BoundBoxXYZ BoundBox; -}; - bool TrackPaintUtilHasFence( enum edge_t edge, const CoordsXY& position, const TrackElement& trackElement, const Ride& ride, uint8_t rotation); void TrackPaintUtilPaintFloor( diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/WoodenRollerCoaster.h index 9ea50eecb0..9d8b16fb35 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.h @@ -17,6 +17,14 @@ #include +struct SpriteBoundBox2 +{ + ImageIndex ImageIdA; + ImageIndex ImageIdB; + CoordsXYZ offset; + ::BoundBoxXYZ BoundBox; +}; + // Magic number 4 refers to the number of track blocks in a diagonal track element static constexpr const int8_t WoodenRCDiagonalSupports[4][NumOrthogonalDirections] = { { -1, -1, -1, -1 }, // sequence 0