diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9733abaf49..1ce15c5c10 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -62,6 +62,7 @@ - Fix: [#12505] Stores selling multiple items can only have the first product advertised. - Fix: [#12506] Cannot advertise food if there are no rides in the park. - Fix: [#12533] Track designs list does not use natural sorting. +- Fix: [#12611] 'Monthly Income from ride tickets' in Scenario Editor is removed when park is not free entry. - Fix: 'j' character has broken kerning (original bug). - Fix: RCT1 scenarios have more items in the object list than are present in the park or the research list. - Fix: Brakes keep working during "Brakes failure". diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 46aa659699..016f5a6b54 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -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); diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index f9dd4e8b24..c257d15431 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -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))