mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Part of #9473: Create Vehicle::OpenRestraints()

Browse Source 
Converted from vehicle_open_restraints
This commit is contained in:
hdpoliveira
2020-04-19 22:29:11 -03:00
parent fe161aa826
commit f129fb55af
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1398,11 +1398,11 @@ static bool vehicle_close_restraints(Vehicle* vehicle)
* rct2: 0x006D6A2C
* @returns true when all open
*/
static bool vehicle_open_restraints(Vehicle* vehicle)
bool Vehicle::OpenRestraints()
{
int32_t restraintsOpen = true;
uint16_t vehicle_id = vehicle->sprite_index;
uint16_t vehicle_id = sprite_index;
Vehicle* vehicle = this;
do
{
vehicle = GET_VEHICLE(vehicle_id);
@@ -1411,8 +1411,8 @@ static bool vehicle_open_restraints(Vehicle* vehicle)
vehicle->var_4E = 0;
vehicle->swing_sprite = 0;
auto ride = get_ride(vehicle->ride);
if (ride == nullptr)
auto curRide = get_ride(vehicle->ride);
if (curRide == nullptr)
continue;
auto rideEntry = get_ride_entry(vehicle->ride_subtype);
@@ -1468,24 +1468,24 @@ static bool vehicle_open_restraints(Vehicle* vehicle)
}
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_BROKEN_CAR && vehicle->restraints_position != 0xFF
&& (ride->breakdown_reason_pending == BREAKDOWN_RESTRAINTS_STUCK_CLOSED
|| ride->breakdown_reason_pending == BREAKDOWN_DOORS_STUCK_CLOSED))
&& (curRide->breakdown_reason_pending == BREAKDOWN_RESTRAINTS_STUCK_CLOSED
|| curRide->breakdown_reason_pending == BREAKDOWN_DOORS_STUCK_CLOSED))
{
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN))
if (!(curRide->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN))
{
ride->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN;
curRide->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN;
ride_breakdown_add_news_item(ride);
ride_breakdown_add_news_item(curRide);
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST
curRide->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST
| RIDE_INVALIDATE_RIDE_MAINTENANCE;
ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING;
curRide->mechanic_status = RIDE_MECHANIC_STATUS_CALLING;
Vehicle* broken_vehicle = GET_VEHICLE(ride->vehicles[ride->broken_vehicle]);
ride->inspection_station = broken_vehicle->current_station;
Vehicle* broken_vehicle = GET_VEHICLE(curRide->vehicles[curRide->broken_vehicle]);
curRide->inspection_station = broken_vehicle->current_station;
ride->breakdown_reason = ride->breakdown_reason_pending;
curRide->breakdown_reason = curRide->breakdown_reason_pending;
}
}
else
@@ -2230,7 +2230,7 @@ void Vehicle::UpdateWaitingForPassengers()
if (sub_state == 0)
{
if (!vehicle_open_restraints(this))
if (!OpenRestraints())
return;
if (ride_get_entrance_location(curRide, current_station).isNull())
@@ -4035,7 +4035,7 @@ void Vehicle::UpdateUnloadingPassengers()
{
if (sub_state == 0)
{
if (vehicle_open_restraints(this))
if (OpenRestraints())
{
sub_state = 1;
}

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

@@ -382,6 +382,7 @@ private:
void UpdateTrackMotionUpStopCheck() const;
void CheckAndApplyBlockSectionStopSite();
void UpdateVelocity();
bool OpenRestraints();
};
struct train_ref