From 717622ed01cc262811618b8339c88b2ba9e7a77c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 7 Oct 2024 22:32:54 +0200 Subject: [PATCH] Cut out Mini Golf inverted code --- src/openrct2/ride/Vehicle.cpp | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 1bfeb193f6..3baf4634d3 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -7852,7 +7852,7 @@ Loc6DC462: direction = outDirection; } - if (PitchAndRollStart(HasFlag(VehicleFlags::CarIsInverted), tileElement) != TrackPitchAndRollEnd(GetTrackType())) + if (PitchAndRollStart(false, tileElement) != TrackPitchAndRollEnd(GetTrackType())) { _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5; _vehicleVelocityF64E0C -= remaining_distance + 1; @@ -7866,18 +7866,6 @@ Loc6DC462: goto Loc6DCA9A; } - { - int32_t rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type; - ClearFlag(VehicleFlags::CarIsInverted); - if (GetRideTypeDescriptor(rideType).HasFlag(RtdFlag::hasInvertedVariant)) - { - if (tileElement->AsTrack()->IsInverted()) - { - SetFlag(VehicleFlags::CarIsInverted); - } - } - } - TrackLocation = trackPos; if (!IsHead()) @@ -8070,7 +8058,7 @@ Loc6DCA9A: tileElement = trackBeginEnd.begin_element; } - if (PitchAndRollStart(HasFlag(VehicleFlags::CarIsInverted), tileElement) != TrackPitchAndRollEnd(GetTrackType())) + if (PitchAndRollStart(false, tileElement) != TrackPitchAndRollEnd(GetTrackType())) { _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5; _vehicleVelocityF64E0C -= remaining_distance - 0x368A; @@ -8085,18 +8073,6 @@ Loc6DCA9A: goto Loc6DC462; } - { - int32_t rideType = ::GetRide(tileElement->AsTrack()->GetRideIndex())->type; - ClearFlag(VehicleFlags::CarIsInverted); - if (GetRideTypeDescriptor(rideType).HasFlag(RtdFlag::hasInvertedVariant)) - { - if (tileElement->AsTrack()->IsInverted()) - { - SetFlag(VehicleFlags::CarIsInverted); - } - } - } - TrackLocation = trackPos; if (HasFlag(VehicleFlags::OnLiftHill))