mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Rename sub_6B5952 to ChainQueues (#13357)

Browse Source 
Also remove unreachable call to it
This commit is contained in:
Manuel Vögele
2020-11-04 02:43:26 +01:00
committed by GitHub
parent 438b197b80
commit b40ea0169d
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/ride/Ride.cpp
View File

@@ -3893,14 +3893,14 @@ static int32_t ride_check_for_entrance_exit(ride_id_t rideIndex)
}
/**
*
* Calls footpath_chain_ride_queue for all entrances of the ride
* rct2: 0x006B5952
*/
static void sub_6B5952(Ride* ride)
void Ride::ChainQueues() const
{
for (int32_t i = 0; i < MAX_STATIONS; i++)
{
auto location = ride_get_entrance_location(ride, i);
auto location = ride_get_entrance_location(this, i);
if (location.isNull())
continue;
@@ -3919,7 +3919,7 @@ static void sub_6B5952(Ride* ride)
continue;
int32_t direction = tileElement->GetDirection();
footpath_chain_ride_queue(ride->id, i, mapLocation, tileElement, direction_reverse(direction));
footpath_chain_ride_queue(id, i, mapLocation, tileElement, direction_reverse(direction));
} while (!(tileElement++)->IsLastForTile());
}
}
@@ -5139,12 +5139,6 @@ bool Ride::Test(int32_t newStatus, bool isApplying)
return false;
}
if (newStatus == RIDE_STATUS_OPEN && isApplying)
{
sub_6B5952(this);
lifecycle_flags |= RIDE_LIFECYCLE_EVER_BEEN_OPENED;
}
// z = ride->stations[i].GetBaseZ();
auto startLoc = stations[stationIndex].Start;
trackElement.x = startLoc.x;
@@ -5274,7 +5268,7 @@ bool Ride::Open(int32_t goingToBeOpen, bool isApplying)
if (goingToBeOpen && isApplying)
{
sub_6B5952(this);
ChainQueues();
lifecycle_flags |= RIDE_LIFECYCLE_EVER_BEEN_OPENED;
}

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

@@ -377,6 +377,7 @@ private:
void UpdateSpiralSlide();
void UpdateQueueLength(StationIndex stationIndex);
money32 CalculateIncomePerHour() const;
void ChainQueues() const;
void ConstructMissingEntranceOrExit() const;
public: