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

Fix #9909: 'Build 10 roller coasters' objectives do not complete (#9922)

This commit is contained in:
Michael Steenbeek 2019-08-22 23:08:11 +02:00 committed by GitHub
parent af2ad8045c
commit 4093480f83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/scenario/Scenario.cpp
View File

@ -748,10 +748,10 @@ static void scenario_objective_check_park_value_by()
static void scenario_objective_check_10_rollercoasters()
{
auto rcs = 0;
std::bitset<RIDE_TYPE_COUNT> type_already_counted;
std::bitset<MAX_RIDE_OBJECTS> type_already_counted;
for (const auto& ride : GetRideManager())
{
if (ride.status == RIDE_STATUS_OPEN && ride.excitement >= RIDE_RATING(6, 00) && ride.subtype < RIDE_TYPE_COUNT)
if (ride.status == RIDE_STATUS_OPEN && ride.excitement >= RIDE_RATING(6, 00) && ride.subtype != RIDE_ENTRY_INDEX_NULL)
{
auto rideEntry = ride.GetRideEntry();
if (rideEntry != nullptr)
@ -842,11 +842,11 @@ static void scenario_objective_check_monthly_ride_income()
static void scenario_objective_check_10_rollercoasters_length()
{
const auto objective_length = gScenarioObjectiveNumGuests;
std::bitset<RIDE_TYPE_COUNT> type_already_counted;
std::bitset<MAX_RIDE_OBJECTS> type_already_counted;
auto rcs = 0;
for (const auto& ride : GetRideManager())
{
if (ride.status == RIDE_STATUS_OPEN && ride.excitement >= RIDE_RATING(7, 00) && ride.subtype < RIDE_TYPE_COUNT)
if (ride.status == RIDE_STATUS_OPEN && ride.excitement >= RIDE_RATING(7, 00) && ride.subtype != RIDE_ENTRY_INDEX_NULL)
{
auto rideEntry = ride.GetRideEntry();
if (rideEntry != nullptr)