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

Create Ride::ChangeStatusDoStationChecks()

Browse Source 
Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
This commit is contained in:
Gymnasiast
2022-12-20 22:15:44 +01:00
parent 4f48ccc5c8
commit f848fe5bd4
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3896,14 +3896,12 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
window_close_by_number(WindowClass::RideConstruction, id.ToUnderlying());
}
auto stationIndexCheck = ride_mode_check_station_present(this);
auto stationIndex = stationIndexCheck.StationIndex;
if (stationIndex.IsNull())
return { false, stationIndexCheck.Message };
auto stationNumbersCheck = ride_mode_check_valid_station_numbers(this);
if (!stationNumbersCheck.Successful)
return { false, stationNumbersCheck.Message };
StationIndex stationIndex = {};
auto message = ChangeStatusDoStationChecks(stationIndex);
if (!message.Successful)
{
return message;
}
if (newStatus != RideStatus::Simulating)
{
@@ -3937,7 +3935,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
}
}
auto message = ChangeStatusCheckTrackValidity(trackElement);
message = ChangeStatusCheckTrackValidity(trackElement);
if (!message.Successful)
{
return message;
@@ -3951,7 +3949,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
*/
ResultWithMessage Ride::Open(bool isApplying)
{
CoordsXYE trackElement, problematicTrackElement = {};
CoordsXYE trackElement = {};
// Check to see if construction tool is in use. If it is close the construction window
// to set the track to its final state and clean up ghosts.
@@ -3963,14 +3961,12 @@ ResultWithMessage Ride::Open(bool isApplying)
window_close_by_number(WindowClass::RideConstruction, id.ToUnderlying());
}
auto stationIndexCheck = ride_mode_check_station_present(this);
auto stationIndex = stationIndexCheck.StationIndex;
if (stationIndex.IsNull())
return { false, stationIndexCheck.Message };
auto stationNumbersCheck = ride_mode_check_valid_station_numbers(this);
if (!stationNumbersCheck.Successful)
return { false, stationNumbersCheck.Message };
StationIndex stationIndex = {};
auto message = ChangeStatusDoStationChecks(stationIndex);
if (!message.Successful)
{
return message;
}
auto entranceExitCheck = ride_check_for_entrance_exit(id);
if (!entranceExitCheck.Successful)
@@ -3998,7 +3994,7 @@ ResultWithMessage Ride::Open(bool isApplying)
return { false };
}
auto message = ChangeStatusCheckCompleteCircuit(trackElement);
message = ChangeStatusCheckCompleteCircuit(trackElement);
if (!message.Successful)
{
return message;
@@ -5793,6 +5789,20 @@ std::vector<RideId> GetTracklessRides()
return result;
}
ResultWithMessage Ride::ChangeStatusDoStationChecks(StationIndex& stationIndex)
{
auto stationIndexCheck = ride_mode_check_station_present(this);
stationIndex = stationIndexCheck.StationIndex;
if (stationIndex.IsNull())
return { false, stationIndexCheck.Message };
auto stationNumbersCheck = ride_mode_check_valid_station_numbers(this);
if (!stationNumbersCheck.Successful)
return { false, stationNumbersCheck.Message };
return { true };
}
ResultWithMessage Ride::ChangeStatusCheckCompleteCircuit(const CoordsXYE& trackElement)
{
CoordsXYE problematicTrackElement = {};

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

@@ -309,6 +309,7 @@ private:
void ChainQueues() const;
void ConstructMissingEntranceOrExit() const;
ResultWithMessage ChangeStatusDoStationChecks(StationIndex& stationIndex);
ResultWithMessage ChangeStatusCheckCompleteCircuit(const CoordsXYE& trackElement);
ResultWithMessage ChangeStatusCheckTrackValidity(const CoordsXYE& trackElement);
ResultWithMessage ChangeStatusCreateVehicles(bool isApplying, const CoordsXYE& trackElement);