From e17f09c25c85f5507837522dc6feb049f5d9792e Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 21 Jan 2023 23:25:31 +0100 Subject: [PATCH] Move three tables to MazeSetTrackACtion.cpp --- src/openrct2/actions/MazeSetTrackAction.cpp | 27 +++++++++++++++++++++ src/openrct2/actions/MazeSetTrackAction.h | 26 -------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index 9876dbe69d..907cdad5c6 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -25,6 +25,33 @@ using namespace OpenRCT2::TrackMetaData; +// clang-format off +/** rct2: 0x00993CE9 */ +static constexpr const uint8_t Byte993CE9[] = { + 0xFF, 0xE0, 0xFF, + 14, 0, 1, 2, + 6, 2, 4, 5, + 9, 10, 6, 8, + 12, 13, 14, 10, +}; + +/** rct2: 0x00993CFC */ +static constexpr const uint8_t Byte993CFC[] = { + 5, 12, 0xFF, 0xFF, + 9, 0, 0xFF, 0xFF, + 13, 4, 0xFF, 0xFF, + 1, 8, 0xFF, 0xFF, +}; + +/** rct2: 0x00993D0C */ +static constexpr const uint8_t Byte993D0C[] = { + 3, 0, 0xFF, 0xFF, + 0, 1, 0xFF, 0xFF, + 1, 2, 0xFF, 0xFF, + 2, 3, 0xFF, 0xFF, +}; +// clang-format on + MazeSetTrackAction::MazeSetTrackAction(const CoordsXYZD& location, bool initialPlacement, RideId rideIndex, uint8_t mode) : _loc(location) , _initialPlacement(initialPlacement) diff --git a/src/openrct2/actions/MazeSetTrackAction.h b/src/openrct2/actions/MazeSetTrackAction.h index cc6a8d082e..e2d32a3435 100644 --- a/src/openrct2/actions/MazeSetTrackAction.h +++ b/src/openrct2/actions/MazeSetTrackAction.h @@ -10,32 +10,6 @@ #pragma once #include "GameAction.h" -// clang-format off -/** rct2: 0x00993CE9 */ -static constexpr const uint8_t Byte993CE9[] = { - 0xFF, 0xE0, 0xFF, - 14, 0, 1, 2, - 6, 2, 4, 5, - 9, 10, 6, 8, - 12, 13, 14, 10, -}; - -/** rct2: 0x00993CFC */ -static constexpr const uint8_t Byte993CFC[] = { - 5, 12, 0xFF, 0xFF, - 9, 0, 0xFF, 0xFF, - 13, 4, 0xFF, 0xFF, - 1, 8, 0xFF, 0xFF, -}; - -/** rct2: 0x00993D0C */ -static constexpr const uint8_t Byte993D0C[] = { - 3, 0, 0xFF, 0xFF, - 0, 1, 0xFF, 0xFF, - 1, 2, 0xFF, 0xFF, - 2, 3, 0xFF, 0xFF, -}; -// clang-format on class MazeSetTrackAction final : public GameActionBase {