mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Remove unnecessary parameter from Ride::Open (#13368)

Browse Source 
Ride::Open is only ever called with RIDE_STATUS_OPEN,
so the parameter is redundant.
This commit is contained in:
Manuel Vögele
2020-11-04 12:24:32 +01:00
committed by GitHub
parent 2015acd4c0
commit 96ff1894ee
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/actions/RideSetStatus.hpp
View File

@@ -110,7 +110,7 @@ public:
}
else if (_status == RIDE_STATUS_OPEN)
{
if (!ride->Open(_status == RIDE_STATUS_OPEN, false))
if (!ride->Open(false))
{
res->Error = GameActions::Status::Unknown;
res->ErrorMessage = gGameCommandErrorText;
@@ -220,7 +220,7 @@ public:
return res;
}
}
else if (!ride->Open(_status == RIDE_STATUS_OPEN, true))
else if (!ride->Open(true))
{
res->Error = GameActions::Status::Unknown;
res->ErrorMessage = gGameCommandErrorText;

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

@@ -5241,7 +5241,7 @@ bool Ride::Test(int32_t newStatus, bool isApplying)
*
* rct2: 0x006B4EEA
*/
bool Ride::Open(int32_t goingToBeOpen, bool isApplying)
bool Ride::Open(bool isApplying)
{
CoordsXYE trackElement, problematicTrackElement = {};
@@ -5266,7 +5266,7 @@ bool Ride::Open(int32_t goingToBeOpen, bool isApplying)
return false;
}
if (goingToBeOpen && isApplying)
if (isApplying)
{
ChainQueues();
lifecycle_flags |= RIDE_LIFECYCLE_EVER_BEEN_OPENED;

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

@@ -409,7 +409,7 @@ public:
void StopGuestsQueuing();
bool Open(int32_t goingToBeOpen, bool isApplying);
bool Open(bool isApplying);
bool Test(int32_t newStatus, bool isApplying);
RideMode GetDefaultMode() const;