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

Create Ride::ChangeStatusCheckCompleteCircuit() 

Co-authored-by: spacek531 <spacek531@users.noreply.github.com>
This commit is contained in:
Gymnasiast 2022-12-20 21:56:37 +01:00
parent 079d99d7b2
commit 4f48ccc5c8
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3998,16 +3998,13 @@ ResultWithMessage Ride::Open(bool isApplying)
return { false };
}
if (mode == RideMode::Race || mode == RideMode::ContinuousCircuit || IsBlockSectioned())
auto message = ChangeStatusCheckCompleteCircuit(trackElement);
if (!message.Successful)
{
if (FindTrackGap(trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_IS_NOT_A_COMPLETE_CIRCUIT };
}
return message;
}
auto message = ChangeStatusCheckTrackValidity(trackElement);
message = ChangeStatusCheckTrackValidity(trackElement);
if (!message.Successful)
{
return message;
@ -5796,6 +5793,21 @@ std::vector<RideId> GetTracklessRides()
return result;
}
ResultWithMessage Ride::ChangeStatusCheckCompleteCircuit(const CoordsXYE& trackElement)
{
CoordsXYE problematicTrackElement = {};
if (mode == RideMode::Race || mode == RideMode::ContinuousCircuit || IsBlockSectioned())
{
if (FindTrackGap(trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_IS_NOT_A_COMPLETE_CIRCUIT };
}
}
return { true };
}
ResultWithMessage Ride::ChangeStatusCheckTrackValidity(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 ChangeStatusCheckCompleteCircuit(const CoordsXYE& trackElement);
ResultWithMessage ChangeStatusCheckTrackValidity(const CoordsXYE& trackElement);
ResultWithMessage ChangeStatusCreateVehicles(bool isApplying, const CoordsXYE& trackElement);