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

Fix #4493: - Fix tooltip order.\n - Add tooltip to price label.

Browse Source
This commit is contained in:
Olivier Wervers
2017-02-10 19:30:57 +01:00
parent 9c8232e735
commit dcf0702f3c
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/language/en-GB.txt
View File

@@ -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 #

1
src/openrct2/localisation/string_ids.h
View File

@@ -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,

5
src/openrct2/windows/park.c
View File

@@ -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;
}

4
src/openrct2/windows/ride.c
View File

@@ -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;
}