From 088db4a7c32c687e72d6cd4e4f7f44d640bfe2fb Mon Sep 17 00:00:00 2001 From: Simon Jarrett Date: Tue, 18 Aug 2020 09:49:31 +0100 Subject: [PATCH] Fix incorrect const names of long base pieces - Fix function names referring to that of the renamed consts - Fix incorrect mirror of TrackType::FlatToDown60Long in TrackData --- src/openrct2/ride/Track.h | 4 ++-- src/openrct2/ride/TrackData.cpp | 16 ++++++++-------- src/openrct2/ride/Vehicle.cpp | 4 ++-- .../ride/coaster/CorkscrewRollerCoaster.cpp | 8 ++++---- src/openrct2/ride/coaster/GigaCoaster.cpp | 8 ++++---- .../ride/coaster/TwisterRollerCoaster.cpp | 8 ++++---- .../ride/coaster/VerticalDropRollerCoaster.cpp | 8 ++++---- src/openrct2/windows/_legacy.cpp | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 9aeb606463..65c639cb98 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -365,8 +365,8 @@ namespace TrackElemType constexpr uint16_t FlatToUp60LongBase = 118; constexpr uint16_t Up60ToFlatLongBase = 119; constexpr uint16_t Whirlpool = 120; - constexpr uint16_t FlatToDown60LongBase = 121; - constexpr uint16_t Up60ToFlatLongBase122 = 122; + constexpr uint16_t Down60ToFlatLongBase = 121; + constexpr uint16_t FlatToDown60LongBase = 122; constexpr uint16_t CableLiftHill = 123; constexpr uint16_t ReverseFreefallSlope = 124; constexpr uint16_t ReverseFreefallVertical = 125; diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index 5b327b09df..fbaefec665 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -3678,8 +3678,8 @@ const uint8_t TrackPieceLengths[TrackElemType::Count] = { 165, // TrackElemType::FlatToUp60LongBase 165, // TrackElemType::Up60ToFlatLongBase 32, // TrackElemType::Whirlpool + 165, // TrackElemType::Down60ToFlatLongBase 165, // TrackElemType::FlatToDown60LongBase - 165, // TrackElemType::Up60ToFlatLongBase 138, // TrackElemType::CableLiftHill 32, // TrackElemType::ReverseFreefallSlope 32, // TrackElemType::ReverseFreefallVertical @@ -4863,8 +4863,8 @@ const money32 TrackPricing[] = { 376832, // TrackElemType::FlatToUp60LongBase 376832, // TrackElemType::Up60ToFlatLongBase 126976, // TrackElemType::Whirlpool + 376832, // TrackElemType::Down60ToFlatLongBase 376832, // TrackElemType::FlatToDown60LongBase - 376832, // TrackElemType::Up60ToFlatLongBase 643072, // TrackElemType::CableLiftHill 491520, // TrackElemType::ReverseFreefallSlope 65536, // TrackElemType::ReverseFreefallVertical @@ -5637,8 +5637,8 @@ const uint8_t TrackElementMirrorMap[] = { TrackElemType::FlatToUp60LongBase, TrackElemType::Up60ToFlatLongBase, TrackElemType::Whirlpool, + TrackElemType::Down60ToFlatLongBase, TrackElemType::FlatToDown60LongBase, - TrackElemType::Up60ToFlatLongBase, TrackElemType::CableLiftHill, TrackElemType::ReverseFreefallSlope, TrackElemType::ReverseFreefallVertical, @@ -5897,8 +5897,8 @@ const uint32_t TrackHeightMarkerPositions[TrackElemType::Count] = { (1 << 0) | (1 << 3), // TrackElemType::FlatToUp60LongBase (1 << 0) | (1 << 3), // TrackElemType::Up60ToFlatLongBase (1 << 0), // TrackElemType::Whirlpool - (1 << 0) | (1 << 3), // TrackElemType::FlatToDown60LongBase - (1 << 0) | (1 << 3), // TrackElemType::Up60ToFlatLongBase + (1 << 0) | (1 << 3), // TrackElemType::Down60ToFlatLongBase + (1 << 0) | (1 << 3), // TrackElemType::FlatToUp60LongBase (1 << 0) | (1 << 3), // TrackElemType::CableLiftHill (1 << 0) | (1 << 5), // TrackElemType::ReverseFreefallSlope (1 << 0), // TrackElemType::ReverseFreefallVertical @@ -6157,8 +6157,8 @@ const uint8_t TrackSequenceElementAllowedWallEdges[][16] = { { 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::FlatToUp60LongBase { 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::Up60ToFlatLongBase { 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::Whirlpool + { 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::Down60ToFlatLongBase { 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::FlatToDown60LongBase - { 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::Up60ToFlatLongBase { 0b1010, 0b1010, 0b1010, 0b1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::CableLiftHill { 0b1010, 0b1010, 0b1010, 0b1010, 0b1010, 0b1011, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::ReverseFreefallSlope { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // TrackElemType::ReverseFreefallVertical @@ -6932,8 +6932,8 @@ const uint16_t TrackFlags[] = { /* TrackElemType::FlatToUp60LongBase */ TRACK_ELEM_FLAG_UP, /* TrackElemType::Up60ToFlatLongBase */ TRACK_ELEM_FLAG_UP | TRACK_ELEM_FLAG_STARTS_AT_HALF_HEIGHT, /* TrackElemType::Whirlpool */ 0, - /* TrackElemType::FlatToDown60LongBase */ TRACK_ELEM_FLAG_DOWN, - /* TrackElemType::Up60ToFlatLongBase */ TRACK_ELEM_FLAG_DOWN | TRACK_ELEM_FLAG_STARTS_AT_HALF_HEIGHT, + /* TrackElemType::Down60ToFlatLongBase */ TRACK_ELEM_FLAG_DOWN, + /* TrackElemType::FlatToDown60LongBase */ TRACK_ELEM_FLAG_DOWN | TRACK_ELEM_FLAG_STARTS_AT_HALF_HEIGHT, /* TrackElemType::CableLiftHill */ TRACK_ELEM_FLAG_DOWN | TRACK_ELEM_FLAG_STARTS_AT_HALF_HEIGHT, /* TrackElemType::ReverseFreefallSlope */ TRACK_ELEM_FLAG_UP, /* TrackElemType::ReverseFreefallVertical */ TRACK_ELEM_FLAG_UP, diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index c99a333778..a70d95490c 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -5976,12 +5976,12 @@ GForces Vehicle::GetGForces() const // 6d7408 break; case TrackElemType::FlatToUp60LongBase: - case TrackElemType::FlatToDown60LongBase: + case TrackElemType::Down60ToFlatLongBase: vertFactor = 160; // 6d74F1 break; case TrackElemType::Up60ToFlatLongBase: - case TrackElemType::Up60ToFlatLongBase122: + case TrackElemType::FlatToDown60LongBase: vertFactor = -160; // 6d74FD break; diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 8eceb26a6a..de83709d14 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -4906,7 +4906,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base( } /** rct2: 0x008A81B8 */ -static void corkscrew_rc_track_flat_to_60_deg_down_long_base( +static void corkscrew_rc_track_60_deg_down_to_flat_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -4915,7 +4915,7 @@ static void corkscrew_rc_track_flat_to_60_deg_down_long_base( } /** rct2: 0x008A81C8 */ -static void corkscrew_rc_track_60_deg_up_to_flat_long_base122( +static void corkscrew_rc_track_flat_to_60_deg_down_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -8728,10 +8728,10 @@ TRACK_PAINT_FUNCTION get_track_paint_function_corkscrew_rc(int32_t trackType) return corkscrew_rc_track_flat_to_60_deg_up_long_base; case TrackElemType::Up60ToFlatLongBase: return corkscrew_rc_track_60_deg_up_to_flat_long_base; + case TrackElemType::Down60ToFlatLongBase: + return corkscrew_rc_track_60_deg_down_to_flat_long_base; case TrackElemType::FlatToDown60LongBase: return corkscrew_rc_track_flat_to_60_deg_down_long_base; - case TrackElemType::Up60ToFlatLongBase122: - return corkscrew_rc_track_60_deg_up_to_flat_long_base122; case TrackElemType::LeftEighthToDiag: return corkscrew_rc_track_left_eighth_to_diag; case TrackElemType::RightEighthToDiag: diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index b8a73cdc0c..e59416a3cf 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -4369,7 +4369,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base( } /** rct2: 0x008ADEF4 */ -static void giga_rc_track_flat_to_60_deg_down_long_base( +static void giga_rc_track_60_deg_down_to_flat_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -4377,7 +4377,7 @@ static void giga_rc_track_flat_to_60_deg_down_long_base( } /** rct2: 0x008ADF04 */ -static void giga_rc_track_60_deg_up_to_flat_long_base122( +static void giga_rc_track_flat_to_60_deg_down_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -9087,10 +9087,10 @@ TRACK_PAINT_FUNCTION get_track_paint_function_giga_rc(int32_t trackType) return giga_rc_track_flat_to_60_deg_up_long_base; case TrackElemType::Up60ToFlatLongBase: return giga_rc_track_60_deg_up_to_flat_long_base; + case TrackElemType::Down60ToFlatLongBase: + return giga_rc_track_60_deg_down_to_flat_long_base; case TrackElemType::FlatToDown60LongBase: return giga_rc_track_flat_to_60_deg_down_long_base; - case TrackElemType::Up60ToFlatLongBase122: - return giga_rc_track_60_deg_up_to_flat_long_base122; case TrackElemType::CableLiftHill: return giga_rc_track_cable_lift_hill; case TrackElemType::LeftEighthToDiag: diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 3be43c44d2..5a47b1cdac 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -1491,7 +1491,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base( } /** rct2: 0x008AC114 */ -static void twister_rc_track_flat_to_60_deg_down_long_base( +static void twister_rc_track_60_deg_down_to_flat_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -1500,7 +1500,7 @@ static void twister_rc_track_flat_to_60_deg_down_long_base( } /** rct2: 0x008AC124 */ -static void twister_rc_track_60_deg_up_to_flat_long_base122( +static void twister_rc_track_flat_to_60_deg_down_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -1952,10 +1952,10 @@ TRACK_PAINT_FUNCTION get_track_paint_function_twister_rc(int32_t trackType) return twister_rc_track_flat_to_60_deg_up_long_base; case TrackElemType::Up60ToFlatLongBase: return twister_rc_track_60_deg_up_to_flat_long_base; + case TrackElemType::Down60ToFlatLongBase: + return twister_rc_track_60_deg_down_to_flat_long_base; case TrackElemType::FlatToDown60LongBase: return twister_rc_track_flat_to_60_deg_down_long_base; - case TrackElemType::Up60ToFlatLongBase122: - return twister_rc_track_60_deg_up_to_flat_long_base122; case TrackElemType::LeftBarrelRollUpToDown: return twister_rc_track_left_barrel_roll_up_to_down; case TrackElemType::RightBarrelRollUpToDown: diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index 671f1ed294..2a15f7b474 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -1482,7 +1482,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_flat_to_60_deg_down_long_base( +static void vertical_drop_rc_track_60_deg_down_to_flat_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -1490,7 +1490,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_down_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } -static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122( +static void vertical_drop_rc_track_flat_to_60_deg_down_long_base( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -1931,10 +1931,10 @@ TRACK_PAINT_FUNCTION get_track_paint_function_vertical_drop_rc(int32_t trackType return vertical_drop_rc_track_flat_to_60_deg_up_long_base; case TrackElemType::Up60ToFlatLongBase: return vertical_drop_rc_track_60_deg_up_to_flat_long_base; + case TrackElemType::Down60ToFlatLongBase: + return vertical_drop_rc_track_60_deg_down_to_flat_long_base; case TrackElemType::FlatToDown60LongBase: return vertical_drop_rc_track_flat_to_60_deg_down_long_base; - case TrackElemType::Up60ToFlatLongBase122: - return vertical_drop_rc_track_60_deg_up_to_flat_long_base122; case TrackElemType::LeftBarrelRollUpToDown: return vertical_drop_rc_track_left_barrel_roll_up_to_down; case TrackElemType::RightBarrelRollUpToDown: diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index 80d5497745..9b15b35133 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -285,11 +285,11 @@ bool window_ride_construction_update_state( break; case TrackElemType::FlatToDown60: - trackType = TrackElemType::Up60ToFlatLongBase122; + trackType = TrackElemType::FlatToDown60LongBase; break; case TrackElemType::Down60ToFlat: - trackType = TrackElemType::FlatToDown60LongBase; + trackType = TrackElemType::Down60ToFlatLongBase; break; case TrackElemType::DiagFlatToUp60: