diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index ee48e7a1ca..9ee250e78b 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -169,6 +169,25 @@ enum RCT12_ENTITY_FLAGS_IS_CRASHED_VEHICLE_ENTITY = 1 << 7, }; +// Only written to in RCT2, not used in OpenRCT2. All of these are elements that had to be invented in RCT1. +enum : uint32_t +{ + TRACK_FLAGS_CONTAINS_VERTICAL_LOOP = (1 << 7), + TRACK_FLAGS_CONTAINS_INLINE_TWIST = (1 << 17), + TRACK_FLAGS_CONTAINS_HALF_LOOP = (1 << 18), + TRACK_FLAGS_CONTAINS_CORKSCREW = (1 << 19), + TRACK_FLAGS_CONTAINS_WATER_SPLASH = (1 << 27), + TRACK_FLAGS_CONTAINS_BARREL_ROLL = (1 << 29), + TRACK_FLAGS_CONTAINS_POWERED_LIFT = (1 << 30), + TRACK_FLAGS_CONTAINS_LARGE_HALF_LOOP = (1u << 31), +}; + +enum : uint32_t +{ + TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER = (1 << 1), + TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1u << 31) // Not used anymore. +}; + #pragma pack(push, 1) struct RCT12xy8 diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index 5325556f19..d9babec962 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -177,25 +177,6 @@ private: CoordsXYE MazeGetFirstElement(const Ride& ride); }; -// Only written to in RCT2, not used in OpenRCT2. All of these are elements that had to be invented in RCT1. -enum : uint32_t -{ - TRACK_FLAGS_CONTAINS_VERTICAL_LOOP = (1 << 7), - TRACK_FLAGS_CONTAINS_INLINE_TWIST = (1 << 17), - TRACK_FLAGS_CONTAINS_HALF_LOOP = (1 << 18), - TRACK_FLAGS_CONTAINS_CORKSCREW = (1 << 19), - TRACK_FLAGS_CONTAINS_WATER_SPLASH = (1 << 27), - TRACK_FLAGS_CONTAINS_BARREL_ROLL = (1 << 29), - TRACK_FLAGS_CONTAINS_POWERED_LIFT = (1 << 30), - TRACK_FLAGS_CONTAINS_LARGE_HALF_LOOP = (1u << 31), -}; - -enum : uint32_t -{ - TRACK_FLAGS2_CONTAINS_LOG_FLUME_REVERSER = (1 << 1), - TRACK_FLAGS2_SIX_FLAGS_RIDE_DEPRECATED = (1u << 31) // Not used anymore. -}; - enum { TDPF_PLACE_SCENERY = 1 << 0,