mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Remove goto label 6DCE02 (#18907)

Browse Source
This commit is contained in:
frutiemax
2022-12-26 04:48:50 -05:00
committed by GitHub
parent 53f8522e8d
commit 580639aa3b
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/openrct2/ride/Vehicle.cpp
View File

@@ -8115,6 +8115,7 @@ bool Vehicle::UpdateTrackMotionBackwards(CarEntry* carEntry, Ride* curRide, rct_
*
*
*/
void Vehicle::UpdateTrackMotionMiniGolfVehicle(Ride* curRide, rct_ride_entry* rideEntry, CarEntry* carEntry)
{
EntityId otherVehicleIndex = EntityId::GetNull();
@@ -8130,7 +8131,8 @@ void Vehicle::UpdateTrackMotionMiniGolfVehicle(Ride* curRide, rct_ride_entry* ri
}
if (remaining_distance >= 0 && remaining_distance < 0x368A)
{
goto loc_6DCE02;
Loc6DCE02(*curRide);
return;
}
sound2_flags &= ~VEHICLE_SOUND2_FLAGS_LIFT_HILL;
_vehicleCurPosition.x = x;
@@ -8581,24 +8583,27 @@ loc_6DCD6B:
loc_6DCDE4:
MoveTo(_vehicleCurPosition);
loc_6DCE02:
Loc6DCE02(*curRide);
}
void Vehicle::Loc6DCE02(const Ride& curRide)
{
acceleration /= _vehicleUnkF64E10;
if (TrackSubposition == VehicleTrackSubposition::ChairliftGoingBack)
{
return;
}
auto trackType = GetTrackType();
const auto& ted = GetTrackElementDescriptor(trackType);
if (!(std::get<0>(ted.SequenceProperties) & TRACK_SEQUENCE_FLAG_ORIGIN))
{
auto trackType = GetTrackType();
const auto& ted = GetTrackElementDescriptor(trackType);
if (!(std::get<0>(ted.SequenceProperties) & TRACK_SEQUENCE_FLAG_ORIGIN))
{
return;
}
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_3;
if (trackType != TrackElemType::EndStation)
{
return;
}
return;
}
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_3;
if (trackType != TrackElemType::EndStation)
{
return;
}
if (this != gCurrentVehicle)
{
@@ -8618,7 +8623,7 @@ loc_6DCE02:
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION;
for (const auto& station : curRide->GetStations())
for (const auto& station : curRide.GetStations())
{
if (TrackLocation != station.Start)
{
@@ -8628,7 +8633,7 @@ loc_6DCE02:
{
continue;
}
_vehicleStationIndex = curRide->GetStationIndex(&station);
_vehicleStationIndex = curRide.GetStationIndex(&station);
}
}

2
src/openrct2/ride/Vehicle.h
View File

@@ -374,6 +374,8 @@ private:
void UpdateLandscapeDoor() const;
void UpdateLandscapeDoorBackwards() const;
int32_t CalculateRiderBraking() const;
void Loc6DCE02(const Ride& curRide);
};
static_assert(sizeof(Vehicle) <= 512);