From 7694195db7bfd77cd740d620cbc86e5919494d29 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 7 Oct 2024 22:35:53 +0200 Subject: [PATCH] Mini golf vehicle code: remove ifs that are always true --- src/openrct2/ride/Vehicle.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 3baf4634d3..f53f634da2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -7839,10 +7839,6 @@ Loc6DC462: _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5; _vehicleVelocityF64E0C -= remaining_distance + 1; remaining_distance = -1; - if (remaining_distance >= 0) - { - Loc6DCDE4(curRide); - } acceleration += AccelerationFromPitch[Pitch]; _vehicleUnkF64E10++; goto Loc6DCA9A; @@ -8045,10 +8041,6 @@ Loc6DCA9A: _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5; _vehicleVelocityF64E0C -= remaining_distance + 1; remaining_distance = -1; - if (remaining_distance >= 0) - { - Loc6DCDE4(curRide); - } acceleration += AccelerationFromPitch[Pitch]; _vehicleUnkF64E10++; goto Loc6DCA9A; @@ -8063,11 +8055,6 @@ Loc6DCA9A: _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5; _vehicleVelocityF64E0C -= remaining_distance - 0x368A; remaining_distance = 0x368A; - if (remaining_distance < 0x368A) - { - Loc6DCDE4(curRide); - return; - } acceleration = AccelerationFromPitch[Pitch]; _vehicleUnkF64E10++; goto Loc6DC462; @@ -8151,11 +8138,6 @@ Loc6DCA9A: vEBP->velocity = vEDI->velocity >> 1; } _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_2; - if (remaining_distance < 0x368A) - { - Loc6DCDE4(curRide); - return; - } acceleration = AccelerationFromPitch[Pitch]; _vehicleUnkF64E10++; goto Loc6DC462;