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

Fix #12611: Bad check for pay-per-ride ability

Browse Source
This commit is contained in:
Michael Steenbeek
2020-08-10 18:56:06 +02:00
committed by GitHub
parent 2bd8f21b2c
commit be0123decb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@@ -461,7 +461,7 @@ static void window_editor_objective_options_show_objective_dropdown(rct_window*
gDropdownItemsArgs[numItems] = STR_OBJECTIVE_DROPDOWN_PARK_VALUE_AT_A_GIVEN_DATE;
numItems++;
if (parkFlags & PARK_FLAGS_PARK_FREE_ENTRY)
if (park_ride_prices_unlocked())
{
gDropdownItemsFormat[numItems] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[numItems] = STR_OBJECTIVE_DROPDOWN_MONTHLY_INCOME_FROM_RIDE_TICKETS;
@@ -752,8 +752,7 @@ static void window_editor_objective_options_main_update(rct_window* w)
objectiveType != OBJECTIVE_HAVE_FUN && objectiveType != OBJECTIVE_10_ROLLERCOASTERS
&& objectiveType != OBJECTIVE_GUESTS_AND_RATING && objectiveType != OBJECTIVE_10_ROLLERCOASTERS_LENGTH
&& objectiveType != OBJECTIVE_FINISH_5_ROLLERCOASTERS)
// The park must be free for the monthly ride income objective
|| (!(parkFlags & PARK_FLAGS_PARK_FREE_ENTRY) && objectiveType == OBJECTIVE_MONTHLY_RIDE_INCOME))
|| (!park_ride_prices_unlocked() && objectiveType == OBJECTIVE_MONTHLY_RIDE_INCOME))
{
// Reset objective
window_editor_objective_options_set_objective(w, OBJECTIVE_GUESTS_AND_RATING);

2
src/openrct2/management/Award.cpp
View File

@@ -171,7 +171,7 @@ static bool award_is_deserved_best_value(int32_t activeAwardTypes)
if (activeAwardTypes & (1 << PARK_AWARD_MOST_DISAPPOINTING))
return false;
if (gParkFlags & (PARK_FLAGS_NO_MONEY | PARK_FLAGS_PARK_FREE_ENTRY))
if ((gParkFlags & PARK_FLAGS_NO_MONEY) || !park_entry_price_unlocked())
return false;
if (gTotalRideValueForMoney < MONEY(10, 00))