mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

add diagonal brakes to dropdown

Browse Source
This commit is contained in:
Spacek531
2023-07-23 20:12:23 -07:00
parent 88ee7445d7
commit 56ec0f721a
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2-ui/ride/Construction.h
View File

@@ -19,25 +19,6 @@ enum class RideConstructionState : uint8_t;
*/
constexpr std::array DropdownOrder = {
TrackElemType::EndStation,
<<<<<<< HEAD
=======
TrackElemType::Brakes,
TrackElemType::DiagBrakes,
TrackElemType::BlockBrakes,
TrackElemType::DiagBlockBrakes,
TrackElemType::Booster,
TrackElemType::RotationControlToggle,
TrackElemType::LogFlumeReverser,
TrackElemType::BrakeForDrop,
TrackElemType::HeartLineTransferUp,
TrackElemType::HeartLineTransferDown,
TrackElemType::LeftCurvedLiftHill,
TrackElemType::RightCurvedLiftHill,
TrackElemType::PoweredLift,
TrackElemType::CableLiftHill,
// Simple track elements
>>>>>>> b8810fc4a (Diagonal Brakes and Block Brakes)
TrackElemType::SBendLeft,
TrackElemType::SBendRight,
TrackElemType::LeftVerticalLoop,
@@ -64,6 +45,7 @@ constexpr std::array DropdownOrder = {
TrackElemType::RightHalfBankedHelixDownLarge,
TrackElemType::Booster,
TrackElemType::Brakes,
TrackElemType::DiagBrakes,
TrackElemType::OnRidePhoto,
TrackElemType::LeftQuarterBankedHelixLargeUp,
TrackElemType::RightQuarterBankedHelixLargeUp,
@@ -127,6 +109,7 @@ constexpr std::array DropdownOrder = {
TrackElemType::AirThrustVerticalDown,
TrackElemType::AirThrustVerticalDownToLevel,
TrackElemType::BlockBrakes,
TrackElemType::DiagBlockBrakes,
TrackElemType::RotationControlToggle,
TrackElemType::LeftLargeCorkscrewUp,
TrackElemType::LeftLargeCorkscrewDown,
@@ -155,13 +138,8 @@ constexpr std::array DropdownOrder = {
};
constexpr size_t DropdownLength = DropdownOrder.size();
<<<<<<< HEAD
// Update the magic number with the current number of track elements to silence
static_assert(TrackElemType::Count == 337, "Reminder to add new track element to special dropdown list");
=======
// Reminder to add your track element to the list, if applicable
static_assert(TrackElemType::Count == 339);
>>>>>>> b8810fc4a (Diagonal Brakes and Block Brakes)
static_assert(TrackElemType::Count == 339, "Reminder to add new track element to special dropdown list");
constexpr bool TrackPieceDirectionIsDiagonal(const uint8_t direction)
{