mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Part of #9473: Create Vehicle::UpdateGoKartAttemptSwitchLanes (#11995)

This commit is contained in:
Hudson Oliveira 2020-06-19 14:06:21 -03:00 committed by GitHub
parent 57b121d448
commit ea9dd60b91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7493,12 +7493,12 @@ static bool loc_6DB38B(Vehicle* vehicle, TileElement* tileElement)
return vangleStart == _vehicleVAngleEndF64E36 && bankStart == _vehicleBankEndF64E37;
}
static void VehicleUpdateGoKartAttemptSwitchLanes(Vehicle* vehicle)
void Vehicle::UpdateGoKartAttemptSwitchLanes()
{
uint16_t probability = 0x8000;
if (vehicle->HasUpdateFlag(VEHICLE_UPDATE_FLAG_6))
if (HasUpdateFlag(VEHICLE_UPDATE_FLAG_6))
{
vehicle->ClearUpdateFlag(VEHICLE_UPDATE_FLAG_6);
ClearUpdateFlag(VEHICLE_UPDATE_FLAG_6);
}
else
{
@ -7507,7 +7507,7 @@ static void VehicleUpdateGoKartAttemptSwitchLanes(Vehicle* vehicle)
if ((scenario_rand() & 0xFFFF) <= probability)
{
// This changes "riding left" to "moving to right lane" and "riding right" to "moving to left lane".
vehicle->TrackSubposition += 2;
TrackSubposition += 2;
}
}
@ -8065,16 +8065,10 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur
&& TrackSubposition < VEHICLE_TRACK_SUBPOSITION_GO_KARTS_MOVING_TO_RIGHT_LANE)
{
trackType = tileElement->AsTrack()->GetTrackType();
if (trackType == TRACK_ELEM_FLAT)
if (trackType == TRACK_ELEM_FLAT
|| ((curRide->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) && tileElement->AsTrack()->IsStation()))
{
VehicleUpdateGoKartAttemptSwitchLanes(this);
}
else if (curRide->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING)
{
if (tileElement->AsTrack()->IsStation())
{
VehicleUpdateGoKartAttemptSwitchLanes(this);
}
UpdateGoKartAttemptSwitchLanes();
}
}

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

@ -425,6 +425,7 @@ private:
void UpdateTrackMotionMiniGolfVehicle(Ride* curRide, rct_ride_entry* rideEntry, rct_ride_entry_vehicle* vehicleEntry);
bool UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* curRide, rct_ride_entry* rideEntry);
bool UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, Ride* curRide, uint16_t* progress);
void UpdateGoKartAttemptSwitchLanes();
};
struct train_ref