diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 156b9eb38a..9dd1a79f51 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4321,8 +4321,8 @@ STR_6009 :{SMALLFONT}{BLACK}Select cut height STR_6010 :{COMMA2DP32}m STR_6011 :{COMMA1DP16}ft STR_6012 :{COMMA1DP16} -STR_6013 :{SMALLFONT}{BLACK}Guests will only pay entrance tickets for rides and services but they won't pay anything to enter the park. -STR_6014 :{SMALLFONT}{BLACK}Guests will only pay the ticket to enter the park and services but they won't pay anything to enter the rides. +STR_6013 :{SMALLFONT}{BLACK}Guests will only pay the ticket to enter the park and services.{NEWLINE}Ride entry is free. +STR_6014 :{SMALLFONT}{BLACK}Guests will only pay entrance tickets for rides and services.{NEWLINE}They won't pay anything to enter the park. ############# # Scenarios # diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index e67699e62f..155f8f880e 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -3664,7 +3664,6 @@ enum { STR_UNIT2DP_SUFFIX_METRES = 6010, STR_UNIT1DP_SUFFIX_FEET = 6011, STR_UNIT1DP_NO_SUFFIX = 6012, - STR_RIDE_INCOME_ADMISSION_PAY_FOR_ENTRY_TIP = 6013, STR_ADMISSION_PRICE_PAY_PER_RIDE_TIP = 6014, diff --git a/src/openrct2/windows/park.c b/src/openrct2/windows/park.c index ee37e5b6b9..e13839472b 100644 --- a/src/openrct2/windows/park.c +++ b/src/openrct2/windows/park.c @@ -70,7 +70,7 @@ enum WINDOW_PARK_WIDGET_IDX { WIDX_CLOSE_LIGHT, WIDX_OPEN_LIGHT, - WIDX__ = 11, + WIDX_PRICE_LABEL = 11, WIDX_PRICE, WIDX_INCREASE_PRICE, WIDX_DECREASE_PRICE, @@ -1488,9 +1488,12 @@ static void window_park_price_invalidate(rct_window *w) window_park_prepare_window_title_text(); // Show a tooltip if the park is pay per ride. + window_park_price_widgets[WIDX_PRICE_LABEL].tooltip = STR_NONE; window_park_price_widgets[WIDX_PRICE].tooltip = STR_NONE; + if ((gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY) && !gCheatsUnlockAllPrices) { + window_park_price_widgets[WIDX_PRICE_LABEL].tooltip = STR_ADMISSION_PRICE_PAY_PER_RIDE_TIP; window_park_price_widgets[WIDX_PRICE].tooltip = STR_ADMISSION_PRICE_PAY_PER_RIDE_TIP; } diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index e11668c0b6..c020da1f25 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -6009,13 +6009,15 @@ static void window_ride_income_invalidate(rct_window *w) w->pressed_widgets &= ~(1 << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK); w->disabled_widgets &= ~(1 << WIDX_PRIMARY_PRICE); + window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].tooltip = STR_NONE; window_ride_income_widgets[WIDX_PRIMARY_PRICE].tooltip = STR_NONE; - //If the park doesn't have free entry, lock the admission price, unless the cheat to unlock all prices is activated. + // If the park doesn't have free entry, lock the admission price, unless the cheat to unlock all prices is activated. if ((!(gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY) && rideEntry->shop_item == SHOP_ITEM_NONE && ride->type != RIDE_TYPE_TOILETS) && (!gCheatsUnlockAllPrices)) { w->disabled_widgets |= (1 << WIDX_PRIMARY_PRICE); + window_ride_income_widgets[WIDX_PRIMARY_PRICE_LABEL].tooltip = STR_RIDE_INCOME_ADMISSION_PAY_FOR_ENTRY_TIP; window_ride_income_widgets[WIDX_PRIMARY_PRICE].tooltip = STR_RIDE_INCOME_ADMISSION_PAY_FOR_ENTRY_TIP; }