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

Merge branch 'develop' into HEAD

Browse Source
This commit is contained in:
duncanspumpkin
2021-06-10 12:46:34 +01:00
parent 35fdcdb256 6b1141b5a2
commit d8eb762a19
49 changed files with 272 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/testpaint/Compat.cpp
View File

@@ -471,7 +471,7 @@ Ride* Vehicle::GetRide() const
bool Vehicle::IsGhost() const
{
auto r = GetRide();
return r != nullptr && r->status == RIDE_STATUS_SIMULATING;
return r != nullptr && r->status == RideStatus::Simulating;
}
uint8_t TileElementBase::GetOccupiedQuadrants() const

4
test/tests/PlayTests.cpp
View File

@@ -107,7 +107,7 @@ TEST_F(PlayTests, SecondGuestInQueueShouldNotRideIfNoFunds)
Ride& ferrisWheel = *it;
// Open it for free
ride_set_status(&ferrisWheel, RIDE_STATUS_OPEN);
ride_set_status(&ferrisWheel, RideStatus::Open);
execute<RideSetPriceAction>(ferrisWheel.id, 0, true);
// Ignore intensity to stimulate peeps to queue into ferris wheel
@@ -167,7 +167,7 @@ TEST_F(PlayTests, CarRideWithOneCarOnlyAcceptsTwoGuests)
Ride& carRide = *it;
// Open it for free
ride_set_status(&carRide, RIDE_STATUS_OPEN);
ride_set_status(&carRide, RideStatus::Open);
execute<RideSetPriceAction>(carRide.id, 0, true);
// Ignore intensity to stimulate peeps to queue into the ride