mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Update dist_x and dist_y to camelCase. (1 >> 1) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_1, and (1 >> 0) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION

Browse Source
This commit is contained in:
Mustapha Elghoul
2020-04-21 16:51:00 -04:00
parent b38bf7a438
commit 38630eeb59
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/ride/CableLift.cpp
View File

@@ -124,7 +124,7 @@ void Vehicle::CableLiftUpdateMovingToEndOfStation()
acceleration = 0;
}
if (!(cable_lift_update_track_motion(this) & (1 << 0)))
if (!(cable_lift_update_track_motion(this) & VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION))
return;
velocity = 0;
@@ -155,10 +155,10 @@ void Vehicle::CableLiftUpdateWaitingToDepart()
Vehicle* passengerVehicle = GET_VEHICLE(cable_lift_target);
Vehicle* cableLiftSecondPart = GET_VEHICLE(prev_vehicle_on_ride);
int16_t dist_x = abs(passengerVehicle->x - cableLiftSecondPart->x);
int16_t dist_y = abs(passengerVehicle->y - cableLiftSecondPart->y);
int16_t distX = abs(passengerVehicle->x - cableLiftSecondPart->x);
int16_t distY = abs(passengerVehicle->y - cableLiftSecondPart->y);
if (dist_x + dist_y > 2)
if (distX + distY > 2)
return;
velocity = 0;
@@ -194,7 +194,7 @@ void Vehicle::CableLiftUpdateTravelling()
if (passengerVehicle->update_flags & VEHICLE_UPDATE_FLAG_BROKEN_TRAIN)
return;
if (!(cable_lift_update_track_motion(this) & (1 << 1)))
if (!(cable_lift_update_track_motion(this) & VEHICLE_UPDATE_MOTION_TRACK_FLAG_1))
return;
velocity = 0;