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

Refactor more string & sprite hard-coded ids (#3670)

This commit is contained in:
Martin Černáč 2016-05-19 19:22:24 +02:00 committed by Ted John
parent c8b8f0f226
commit 6e9d1bf1ea
20 changed files with 264 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/localisation/string_ids.h
View File

@ -712,7 +712,7 @@ enum {
STR_LAND_NOT_OWNED_BY_PARK = 1729,
STR_BANNER_TEXT = 1731,
STR_BANNER_TEXT_FORMAT = 1731,
STR_RIDE_CONSTRUCTION_BUILD = 1732,
STR_RIDE_CONSTRUCTION_MODE = 1733,
@ -736,6 +736,8 @@ enum {
STR_CANT_CHANGE_TIME_LIMIT = 1751,
STR_INDIVIDUAL_GUESTS_TIP = 1752,
STR_SUMMARISED_GUESTS_TIP = 1753,
STR_FORMAT_NUM_GUESTS_PLURAL = 1754,
STR_FORMAT_NUM_GUESTS_SINGULAR = 1755,
STR_ADMISSION_PRICE = 1756,
STR_RELIABILITY_LABEL_1757 = 1757,
@ -912,18 +914,21 @@ enum {
STR_RIDE_IS_BROKEN_DOWN = 1927,
STR_RIDE_HAS_CRASHED = 1928,
STR_RIDE_IS_STILL_NOT_FIXED = 1929,
STR_TOGGLE_GUEST_TRACKING_TIP = 1930,
STR_PEEP_TRACKING_PEEP_JOINED_QUEUE_FOR_X = 1931,
STR_PEEP_TRACKING_PEEP_IS_ON_X = 1932,
STR_PEEP_TRACKING_PEEP_IS_IN_X = 1933,
STR_PEEP_TRACKING_LEFT_RIDE_X = 1934,
STR_PEEP_TRACKING_LEFT_PARK = 1935,
STR_PEEP_TRACKING_NOTIFICATION_BOUGHT_X = 1936,
STR_SHOW_SUBJECT_TIP = 1937,
STR_SHOW_GUEST_VIEW_TIP = 1938,
STR_STAFF_OVERVIEW_TIP = 1939,
STR_SHOW_GUEST_NEEDS_TIP = 1940,
STR_SHOW_GUEST_VISITED_RIDES_TIP = 1941,
STR_SHOW_GUEST_FINANCE_TIP = 1942,
STR_SHOW_GUEST_THOUGHTS_TIP = 1943,
STR_SHOW_GUEST_ITEMS_TIP = 1944,
STR_STAFF_OPTIONS_TIP = 1945,
STR_SELECT_COSTUME_TIP = 1946,
STR_SHOW_PATROL_AREA_TIP = 1947,
@ -1588,6 +1593,8 @@ enum {
STR_TOO_MANY_BANNERS_IN_GAME = 2980,
STR_NO_ENTRY = 2981,
STR_BANNER_TEXT = 2982,
STR_ENTER_BANNER_TEXT = 2983,
STR_CHANGE_BANNER_TEXT_TIP = 2986,
STR_SET_AS_NO_ENTRY_BANNER_TIP = 2987,
@ -1599,6 +1606,21 @@ enum {
STR_CHANGE_SIGN_TEXT_TIP = 2994,
STR_DEMOLISH_SIGN_TIP = 2995,
STR_TEXT_COLOR_BLACK = 2996,
STR_TEXT_COLOR_GREY = 2997,
STR_TEXT_COLOR_WHITE = 2998,
STR_TEXT_COLOR_RED = 2999,
STR_TEXT_COLOR_GREEN = 3000,
STR_TEXT_COLOR_YELLOW = 3001,
STR_TEXT_COLOR_TOPAZ = 3002,
STR_TEXT_COLOR_CELADON = 3003,
STR_TEXT_COLOR_BABYBLUE = 3004,
STR_TEXT_COLOR_PALELAVENDER = 3005,
STR_TEXT_COLOR_PALEGOLD = 3006,
STR_TEXT_COLOR_LIGHTPINK = 3007,
STR_TEXT_COLOR_PEARLAQUA = 3008,
STR_TEXT_COLOR_PALESILVER = 3009,
STR_COLOUR_SCHEME_TO_CHANGE_TIP = 2975,
STR_PAINT_INDIVIDUAL_AREA_TIP = 2976,
@ -1850,16 +1872,33 @@ enum {
STR_SCENARIO_OPTIONS_FINANCIAL_TIP = 3235,
STR_SCENARIO_OPTIONS_GUESTS_TIP = 3236,
STR_SCENARIO_OPTIONS_PARK_TIP = 3237,
STR_MAKE_PARK_NO_MONEY = 3238,
STR_MAKE_PARK_NO_MONEY_TIP = 3239,
STR_INIT_CASH_LABEL = 3240,
STR_INIT_LOAN_LABEL = 3241,
STR_MAX_LOAN_LABEL = 3242,
STR_INTEREST_RATE_LABEL = 3243,
STR_FORBID_MARKETING = 3244,
STR_FORBID_MARKETING_TIP = 3245,
STR_CURRENCY_FORMAT_LABEL = 3246,
STR_PERCENT_FORMAT_LABEL = 3247,
STR_CANT_INCREASE_CASH = 3248,
STR_CANT_REDUCE_CASH = 3249,
STR_CANT_INCREASE_INIT_LOAN = 3250,
STR_CANT_REDUCE_INIT_LOAN = 3251,
STR_CANT_INCREASE_MAX_LOAN = 3252,
STR_CANT_REDUCE_MAX_LOAN = 3253,
STR_CANT_INCREASE_INTEREST_RATE = 3254,
STR_CANT_REDUCE_INTEREST_RATE = 3255,
STR_GUESTS_PREFER_LESS_INTENSE_RIDES = 3256,
STR_GUESTS_PREFER_LESS_INTENSE_RIDES_TIP = 3257,
STR_GUESTS_PREFER_MORE_INTENSE_RIDES = 3258,
STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP = 3259,
STR_CASH_PER_GUEST_LABEL = 3260,
STR_GUEST_INIT_HAPPINESS = 3261,
STR_GUEST_INIT_HUNGER = 3262,
STR_GUEST_INIT_THIRST = 3263,
STR_CANT_INCREASE_FURTHER = 3264,
STR_CANT_REDUCE_FURTHER = 3265,
@ -1874,13 +1913,18 @@ enum {
STR_HARD_PARK_RATING_TIP = 3274,
STR_HARD_GUEST_GENERATION = 3275,
STR_HARD_GUEST_GENERATION_TIP = 3276,
STR_LAND_COST_LABEL = 3277,
STR_RIGHTS_COST_LABEL = 3278,
STR_FREE_PARK_ENTER = 3279,
STR_PAY_PARK_ENTER = 3280,
STR_ENTRY_PRICE_LABEL = 3281,
STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP = 3282,
STR_SELECT_RIDES_TO_BE_PRESERVED_TIP = 3283,
STR_OBJECTIVE_SELECTION = 3284,
STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP = 3286,
STR_OBJECTIVE_WINDOW = 3287,
STR_SELECT_CLIMATE_TIP = 3288,
STR_CLIMATE_LABEL = 3289,
STR_CLIMATE_COOL_AND_WET = 3290,
STR_CLIMATE_WARM = STR_CLIMATE_COOL_AND_WET + 1,
@ -1891,6 +1935,8 @@ enum {
STR_CHANGE_NAME_OF_PARK_TIP = 3295,
STR_CHANGE_NAME_OF_SCENARIO_TIP = 3296,
STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP = 3297,
STR_WINDOW_PARK_NAME = 3298,
STR_WINDOW_PARK_DETAILS = 3299,
STR_SCENARIO_NAME = 3313,
STR_ENTER_SCENARIO_NAME = 3314,
@ -1898,7 +1944,7 @@ enum {
STR_ENTER_SCENARIO_DESCRIPTION = 3316,
STR_NO_DETAILS_YET = 3317,
STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN = 3318,
STR_WINDOW_SCENARIO_GROUP = 3319,
STR_UNABLE_TO_SAVE_SCENARIO_FILE = 3320,
STR_OBJECTIVE = 3322,
@ -2083,6 +2129,7 @@ enum {
STR_CLOSE_PARK_TIP = 5296,
STR_OPEN_PARK_TIP = 5297,
STR_QUICK_FIRE_STAFF = 5300,
STR_CHEAT_CLEAR_LOAN_TIP = 5301,
STR_CHEAT_CLEAR_LOAN = 5302,
STR_CHEAT_BUILD_IN_PAUSE_MODE = 5303,

2
src/paint/map_element/banner.c
View File

@ -84,7 +84,7 @@ void banner_paint(uint8 direction, int height, rct_map_element* map_element)
if (!(gBanners[map_element->properties.banner.index].flags & BANNER_FLAG_NO_ENTRY))
{
set_format_arg(0, uint16, gBanners[map_element->properties.banner.index].string_idx);
string_id = STR_BANNER_TEXT;
string_id = STR_BANNER_TEXT_FORMAT;
}
if (gConfigGeneral.upper_case_banners) {
format_string_to_upper(RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char), string_id, gCommonFormatArgs);

9
src/windows/banner.c
View File

@ -194,7 +194,7 @@ static void window_banner_mouseup(rct_window *w, int widgetIndex)
game_do_command(x, 1, y, map_element->base_height | (map_element->properties.banner.position << 8), GAME_COMMAND_REMOVE_BANNER, 0, 0);
break;
case WIDX_BANNER_TEXT:
window_text_input_open(w, WIDX_BANNER_TEXT, 2982, 2983, gBanners[w->number].string_idx, 0, 32);
window_text_input_open(w, WIDX_BANNER_TEXT, STR_BANNER_TEXT, STR_ENTER_BANNER_TEXT, gBanners[w->number].string_idx, 0, 32);
break;
case WIDX_BANNER_NO_ENTRY:
textinput_cancel();
@ -218,9 +218,8 @@ static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* w
case WIDX_TEXT_COLOUR_DROPDOWN_BUTTON:
for( int i = 0; i < 13; ++i){
gDropdownItemsFormat[i] = 1142;
gDropdownItemsArgs[i] = 2997 + i;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_TEXT_COLOR_GREY + i;
}
//Switch to the dropdown box widget.
@ -311,7 +310,7 @@ static void window_banner_invalidate(rct_window *w)
colour_btn->image = (banner->colour << 19) + 0x600013C3;
rct_widget* drop_down_widget = &window_banner_widgets[WIDX_TEXT_COLOUR_DROPDOWN];
drop_down_widget->image = banner->text_colour + 2996;
drop_down_widget->image = banner->text_colour + STR_TEXT_COLOR_BLACK;
}
/* rct2: 0x006BA4C5 */

4
src/windows/editor_object_selection.c
View File

@ -1238,7 +1238,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
x = w->x + widget->left;
y = w->y + widget->top;
gfx_draw_sprite(dpi, 5458 + i, x, y, 0);
gfx_draw_sprite(dpi, STR_ROTATE_CLOCKWISE + i, x, y, 0);
}
const int ride_tabs[] = { 5458, 0x200015A1, 5542, 0x200015AA, 5557, 5551, 5530, 5327 };
@ -1391,7 +1391,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
if (type == OBJECT_TYPE_SCENARIO_TEXT) {
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, width, 3168, 0);
} else {
gfx_draw_string_left_wrapped(dpi, &stringId, x, y + 5, width, 1191, 0);
gfx_draw_string_left_wrapped(dpi, &stringId, x, y + 5, width, STR_BLACK_STRING, 0);
}
}

24
src/windows/editor_objective_options.c
View File

@ -709,7 +709,7 @@ static void window_editor_objective_options_main_dropdown(rct_window *w, int wid
switch (widgetIndex) {
case WIDX_OBJECTIVE_DROPDOWN:
newObjectiveType = (uint8)(gDropdownItemsArgs[dropdownIndex] - 2397);
newObjectiveType = (uint8)(gDropdownItemsArgs[dropdownIndex] - STR_OBJECTIVE_DROPDOWN_NONE);
if (gScenarioObjectiveType != newObjectiveType)
window_editor_objective_options_set_objective(w, newObjectiveType);
break;
@ -941,7 +941,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE:
case OBJECTIVE_MONTHLY_RIDE_INCOME:
case OBJECTIVE_MONTHLY_FOOD_INCOME:
stringId = 3246;
stringId = STR_CURRENCY_FORMAT_LABEL;
arg = gScenarioObjectiveCurrency;
break;
case OBJECTIVE_10_ROLLERCOASTERS_LENGTH:
@ -972,13 +972,13 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
// Climate label
x = w->x + 8;
y = w->y + w->widgets[WIDX_CLIMATE].top;
gfx_draw_string_left(dpi, 3289, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_CLIMATE_LABEL, NULL, 0, x, y);
// Climate value
x = w->x + w->widgets[WIDX_CLIMATE].left + 1;
y = w->y + w->widgets[WIDX_CLIMATE].top;
stringId = STR_CLIMATE_COOL_AND_WET + gClimate;
gfx_draw_string_left(dpi, 1193, &stringId, 0, x, y);
gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRING, &stringId, 0, x, y);
// Park name
x = w->x + 8;
@ -991,7 +991,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
set_format_arg(0, uint16, gParkName);
}
set_format_arg(2, uint32, gParkNameArgs);
gfx_draw_string_left_clipped(dpi, 3298, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_left_clipped(dpi, STR_CLIMATE_LABEL, gCommonFormatArgs, 0, x, y, width);
// Scenario name
x = w->x + 8;
@ -1010,7 +1010,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
// Scenario details label
x = w->x + 8;
y = w->y + w->widgets[WIDX_DETAILS].top;
gfx_draw_string_left(dpi, 3299, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_WINDOW_PARK_DETAILS, NULL, 0, x, y);
// Scenario details value
x = w->x + 16;
@ -1024,18 +1024,18 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
set_format_arg(0, uint16, STR_PLACEHOLDER);
}
set_format_arg(2, uint32, gParkNameArgs);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, 1191, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, 0);
// Scenario category label
x = w->x + 8;
y = w->y + w->widgets[WIDX_CATEGORY].top;
gfx_draw_string_left(dpi, 3319, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_WINDOW_SCENARIO_GROUP, NULL, 0, x, y);
// Scenario category value
x = w->x + w->widgets[WIDX_CATEGORY].left + 1;
y = w->y + w->widgets[WIDX_CATEGORY].top;
stringId = ScenarioCategoryStringIds[s6Info->category];
gfx_draw_string_left(dpi, 1193, &stringId, 0, x, y);
gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRING, &stringId, 0, x, y);
}
/**
@ -1197,16 +1197,16 @@ static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct
// Highlighted
if (i == w->selected_list_item) {
stringId = 1193;
stringId = STR_WINDOW_COLOUR_2_STRING;
gfx_fill_rect(dpi, 0, y, w->width, y + 11, 0x2000031);
} else {
stringId = 1191;
stringId = STR_BLACK_STRING;
}
// Checkbox mark
ride = get_ride(i);
if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE) {
gCurrentFontSpriteBase = stringId == 1193 ? -2 : -1;
gCurrentFontSpriteBase = stringId == STR_WINDOW_COLOUR_2_STRING ? -2 : -1;
gfx_draw_string(dpi, (char*)CheckBoxMarkString, w->colours[1] & 0x7F, 2, y);
}

106
src/windows/editor_scenario_options.c
View File

@ -99,7 +99,7 @@ static rct_widget window_editor_scenario_options_financial_widgets[] = {
{ WWT_TAB, 1, 34, 64, 17, 46, 0x2000144E, STR_SCENARIO_OPTIONS_GUESTS_TIP },
{ WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SCENARIO_OPTIONS_PARK_TIP },
{ WWT_CHECKBOX, 1, 8, 271, 48, 59, 3238, STR_MAKE_PARK_NO_MONEY_TIP },
{ WWT_CHECKBOX, 1, 8, 271, 48, 59, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP },
{ WWT_SPINNER, 1, 168, 267, 65, 76, STR_NONE, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 256, 266, 66, 70, STR_NUMERIC_UP, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 256, 266, 71, 75, STR_NUMERIC_DOWN, STR_NONE },
@ -112,7 +112,7 @@ static rct_widget window_editor_scenario_options_financial_widgets[] = {
{ WWT_SPINNER, 1, 168, 237, 116, 127, STR_NONE, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 226, 236, 117, 121, STR_NUMERIC_UP, STR_NONE },
{ WWT_DROPDOWN_BUTTON, 1, 226, 236, 122, 126, STR_NUMERIC_DOWN, STR_NONE },
{ WWT_CHECKBOX, 1, 8, 271, 133, 144, 3244, STR_FORBID_MARKETING_TIP },
{ WWT_CHECKBOX, 1, 8, 271, 133, 144, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP },
{ WIDGETS_END }
};
@ -483,7 +483,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gCashEncrypted = ENCRYPT_MONEY(gInitialCash);
finance_update_loan_hash();
} else {
window_error_open(3248, STR_NONE);
window_error_open(STR_CANT_INCREASE_CASH, STR_NONE);
}
window_invalidate(w);
break;
@ -493,7 +493,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gCashEncrypted = ENCRYPT_MONEY(gInitialCash);
finance_update_loan_hash();
} else {
window_error_open(3249, STR_NONE);
window_error_open(STR_CANT_REDUCE_CASH, STR_NONE);
}
window_invalidate(w);
break;
@ -503,7 +503,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gMaxBankLoan = max(gBankLoan, gMaxBankLoan);
finance_update_loan_hash();
} else {
window_error_open(3250, STR_NONE);
window_error_open(STR_CANT_INCREASE_INIT_LOAN, STR_NONE);
}
window_invalidate(w);
break;
@ -513,7 +513,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gMaxBankLoan = max(gBankLoan, gMaxBankLoan);
finance_update_loan_hash();
} else {
window_error_open(3251, STR_NONE);
window_error_open(STR_CANT_REDUCE_INIT_LOAN, STR_NONE);
}
window_invalidate(w);
break;
@ -523,7 +523,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gBankLoan = min(gBankLoan, gMaxBankLoan);
finance_update_loan_hash();
} else {
window_error_open(3252, STR_NONE);
window_error_open(STR_CANT_INCREASE_MAX_LOAN, STR_NONE);
}
window_invalidate(w);
break;
@ -533,7 +533,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gBankLoan = min(gBankLoan, gMaxBankLoan);
finance_update_loan_hash();
} else {
window_error_open(3253, STR_NONE);
window_error_open(STR_CANT_REDUCE_MAX_LOAN, STR_NONE);
}
window_invalidate(w);
break;
@ -545,7 +545,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gBankLoanInterestRate++;
}
} else {
window_error_open(3254, STR_NONE);
window_error_open(STR_CANT_INCREASE_INTEREST_RATE, STR_NONE);
}
window_invalidate(w);
break;
@ -557,7 +557,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex,
gBankLoanInterestRate--;
}
} else {
window_error_open(3255, STR_NONE);
window_error_open(STR_CANT_REDUCE_INTEREST_RATE, STR_NONE);
}
window_invalidate(w);
break;
@ -646,43 +646,43 @@ static void window_editor_scenario_options_financial_paint(rct_window *w, rct_dr
if (w->widgets[WIDX_INITIAL_CASH].type != WWT_EMPTY) {
x = w->x + 8;
y = w->y + w->widgets[WIDX_INITIAL_CASH].top;
gfx_draw_string_left(dpi, 3240, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_INIT_CASH_LABEL, NULL, 0, x, y);
x = w->x + w->widgets[WIDX_INITIAL_CASH].left + 1;
y = w->y + w->widgets[WIDX_INITIAL_CASH].top;
gfx_draw_string_left(dpi, 3246, &gInitialCash, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &gInitialCash, 0, x, y);
}
if (w->widgets[WIDX_INITIAL_LOAN].type != WWT_EMPTY) {
x = w->x + 8;
y = w->y + w->widgets[WIDX_INITIAL_LOAN].top;
gfx_draw_string_left(dpi, 3241, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_INIT_LOAN_LABEL, NULL, 0, x, y);
x = w->x + w->widgets[WIDX_INITIAL_LOAN].left + 1;
y = w->y + w->widgets[WIDX_INITIAL_LOAN].top;
gfx_draw_string_left(dpi, 3246, &gBankLoan, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &gBankLoan, 0, x, y);
}
if (w->widgets[WIDX_MAXIMUM_LOAN].type != WWT_EMPTY) {
x = w->x + 8;
y = w->y + w->widgets[WIDX_MAXIMUM_LOAN].top;
gfx_draw_string_left(dpi, 3242, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_MAX_LOAN_LABEL, NULL, 0, x, y);
x = w->x + w->widgets[WIDX_MAXIMUM_LOAN].left + 1;
y = w->y + w->widgets[WIDX_MAXIMUM_LOAN].top;
gfx_draw_string_left(dpi, 3246, &gMaxBankLoan, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &gMaxBankLoan, 0, x, y);
}
if (w->widgets[WIDX_INTEREST_RATE].type != WWT_EMPTY) {
x = w->x + 8;
y = w->y + w->widgets[WIDX_INTEREST_RATE].top;
gfx_draw_string_left(dpi, 3243, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_INTEREST_RATE_LABEL, NULL, 0, x, y);
x = w->x + w->widgets[WIDX_INTEREST_RATE].left + 1;
y = w->y + w->widgets[WIDX_INTEREST_RATE].top;
sint16 interestRate = clamp(INT16_MIN, (sint16)gBankLoanInterestRate, INT16_MAX);
gfx_draw_string_left(dpi, 3247, &interestRate, 0, x, y);
gfx_draw_string_left(dpi, STR_PERCENT_FORMAT_LABEL, &interestRate, 0, x, y);
}
}
@ -736,7 +736,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialCash < MONEY(1000, 00)) {
gGuestInitialCash += MONEY(1, 00);
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -744,7 +744,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialCash > MONEY(0, 00)) {
gGuestInitialCash -= MONEY(1, 00);
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -752,7 +752,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialHappiness < 250) {
gGuestInitialHappiness += 4;
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -760,7 +760,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialHappiness > 40) {
gGuestInitialHappiness -= 4;
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -768,7 +768,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialHunger > 40) {
gGuestInitialHunger -= 4;
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -776,7 +776,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialHunger < 250) {
gGuestInitialHunger += 4;
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -784,7 +784,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialThirst > 40) {
gGuestInitialThirst -= 4;
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -792,7 +792,7 @@ static void window_editor_scenario_options_guests_mousedown(int widgetIndex, rct
if (gGuestInitialThirst < 250) {
gGuestInitialThirst += 4;
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -872,47 +872,47 @@ static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawp
// Cash per guest label
x = w->x + 8;
y = w->y + w->widgets[WIDX_CASH_PER_GUEST].top;
gfx_draw_string_left(dpi, 3260, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_CASH_PER_GUEST_LABEL, NULL, 0, x, y);
// Cash per guest value
x = w->x + w->widgets[WIDX_CASH_PER_GUEST].left + 1;
y = w->y + w->widgets[WIDX_CASH_PER_GUEST].top;
arg = gGuestInitialCash;
gfx_draw_string_left(dpi, 3246, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &arg, 0, x, y);
}
// Guest initial happiness label
x = w->x + 8;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_HAPPINESS].top;
gfx_draw_string_left(dpi, 3261, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_GUEST_INIT_HAPPINESS, NULL, 0, x, y);
// Guest initial happiness value
x = w->x + w->widgets[WIDX_GUEST_INITIAL_HAPPINESS].left + 1;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_HAPPINESS].top;
arg = (gGuestInitialHappiness * 100) / 255;
gfx_draw_string_left(dpi, 3247, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_PERCENT_FORMAT_LABEL, &arg, 0, x, y);
// Guest initial hunger label
x = w->x + 8;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_HUNGER].top;
gfx_draw_string_left(dpi, 3262, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_GUEST_INIT_HUNGER, NULL, 0, x, y);
// Guest initial hunger value
x = w->x + w->widgets[WIDX_GUEST_INITIAL_HUNGER].left + 1;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_HUNGER].top;
arg = ((255 - gGuestInitialHunger) * 100) / 255;
gfx_draw_string_left(dpi, 3247, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_PERCENT_FORMAT_LABEL, &arg, 0, x, y);
// Guest initial thirst label
x = w->x + 8;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_THIRST].top;
gfx_draw_string_left(dpi, 3263, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_GUEST_INIT_THIRST, NULL, 0, x, y);
// Guest initial thirst value
x = w->x + w->widgets[WIDX_GUEST_INITIAL_THIRST].left + 1;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_THIRST].top;
arg = ((255 - gGuestInitialThirst) * 100) / 255;
gfx_draw_string_left(dpi, 3247, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_PERCENT_FORMAT_LABEL, &arg, 0, x, y);
}
#pragma endregion
@ -979,7 +979,7 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w
if (gLandPrice < MONEY(200,00)) {
gLandPrice += MONEY(1,00);
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -987,7 +987,7 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w
if (gLandPrice > MONEY(5,00)) {
gLandPrice -= MONEY(1,00);
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -995,7 +995,7 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w
if (gConstructionRightsPrice < MONEY(200,00)) {
gConstructionRightsPrice += MONEY(1,00);
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -1003,7 +1003,7 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w
if (gConstructionRightsPrice > MONEY(5,00)) {
gConstructionRightsPrice -= MONEY(1,00);
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -1011,7 +1011,7 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w
if (gParkEntranceFee < MONEY(100,00)) {
gParkEntranceFee += MONEY(1,00);
} else {
window_error_open(3264, STR_NONE);
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
@ -1019,17 +1019,17 @@ static void window_editor_scenario_options_park_mousedown(int widgetIndex, rct_w
if (gParkEntranceFee > MONEY(0,00)) {
gParkEntranceFee -= MONEY(1,00);
} else {
window_error_open(3265, STR_NONE);
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}
window_invalidate(w);
break;
case WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN:
dropdownWidget = widget - 1;
gDropdownItemsFormat[0] = 1142;
gDropdownItemsArgs[0] = 3279;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsArgs[1] = 3280;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_FREE_PARK_ENTER;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[1] = STR_PAY_PARK_ENTER;
window_dropdown_show_text_custom_width(
w->x + dropdownWidget->left,
@ -1182,50 +1182,50 @@ static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpix
// Cost to buy land label
x = w->x + 8;
y = w->y + w->widgets[WIDX_LAND_COST].top;
gfx_draw_string_left(dpi, 3277, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_LAND_COST_LABEL, NULL, 0, x, y);
// Cost to buy land value
x = w->x + w->widgets[WIDX_LAND_COST].left + 1;
y = w->y + w->widgets[WIDX_LAND_COST].top;
arg = gLandPrice;
gfx_draw_string_left(dpi, 3246, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &arg, 0, x, y);
}
if (w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].type != WWT_EMPTY) {
// Cost to buy construction rights label
x = w->x + 8;
y = w->y + w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].top;
gfx_draw_string_left(dpi, 3278, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_RIGHTS_COST_LABEL, NULL, 0, x, y);
// Cost to buy construction rights value
x = w->x + w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].left + 1;
y = w->y + w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].top;
arg = gConstructionRightsPrice;
gfx_draw_string_left(dpi, 3246, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &arg, 0, x, y);
}
if (w->widgets[WIDX_PAY_FOR_PARK_OR_RIDES].type != WWT_EMPTY) {
// Pay for park or rides label
x = w->x + w->widgets[WIDX_PAY_FOR_PARK_OR_RIDES].left + 1;
y = w->y + w->widgets[WIDX_PAY_FOR_PARK_OR_RIDES].top;
gfx_draw_string_left(dpi, 3279, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_FREE_PARK_ENTER, NULL, 0, x, y);
// Pay for park or rides value
stringId = gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY ? 3279 : 3280;
gfx_draw_string_left(dpi, 1193, &stringId, 0, x, y);
stringId = gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY ? STR_FREE_PARK_ENTER : STR_PAY_PARK_ENTER;
gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRING, &stringId, 0, x, y);
}
if (w->widgets[WIDX_ENTRY_PRICE].type != WWT_EMPTY) {
// Entry price label
x = w->x + w->widgets[WIDX_PAY_FOR_PARK_OR_RIDES].right + 8;
y = w->y + w->widgets[WIDX_ENTRY_PRICE].top;
gfx_draw_string_left(dpi, 3281, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_ENTRY_PRICE_LABEL, NULL, 0, x, y);
// Entry price value
x = w->x + w->widgets[WIDX_ENTRY_PRICE].left + 1;
y = w->y + w->widgets[WIDX_ENTRY_PRICE].top;
arg = gParkEntranceFee;
gfx_draw_string_left(dpi, 3246, &arg, 0, x, y);
gfx_draw_string_left(dpi, STR_CURRENCY_FORMAT_LABEL, &arg, 0, x, y);
}
}

4
src/windows/finances.c
View File

@ -682,7 +682,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
set_format_arg(2, uint16, monthyear);
draw_string_right_underline(
dpi,
monthyear == currentMonthYear ? 1193 : 1191,
monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRING : STR_BLACK_STRING,
gCommonFormatArgs,
0,
x + 80,
@ -1281,7 +1281,7 @@ static void window_finances_research_mousedown(int widgetIndex, rct_window *w, r
dropdownWidget = widget - 1;
for (i = 0; i < 4; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_NO_FUNDING + i;
}
window_dropdown_show_text_custom_width(

124
src/windows/guest.c
View File

@ -71,94 +71,94 @@ enum WINDOW_GUEST_WIDGET_IDX {
};
rct_widget window_guest_overview_widgets[] = {
{ WWT_FRAME, 0, 0, 191, 0, 156, 0x0FFFFFFFF, STR_NONE }, // Panel / Background
{ WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP }, // Title
{ WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP }, // Close x button
{ WWT_RESIZE, 1, 0, 191, 43, 156, 0x0FFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, 1938 }, // Tab 1
{ WWT_TAB, 1, 73, 64, 17, 43, 0x2000144E, 1940}, // Tab 2
{ WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, 1941}, // Tab 3
{ WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, 1942}, // Tab 4
{ WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, 1943}, // Tab 5
{ WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, 1944}, // Tab 6
{ WWT_12, 1, 3, 166, 45, 56, 0x0FFFFFFFF, STR_NONE}, // Label Thought marquee
{ WWT_VIEWPORT, 1, 3, 166, 57, 143, 0x0FFFFFFFF, STR_NONE }, // Viewport
{ WWT_12, 1, 3, 166, 144, 154, 0x0FFFFFFFF, STR_NONE}, // Label Action
{ WWT_FLATBTN, 1, 167, 190, 45, 68, 0x1436, 1706}, // Pickup Button
{ WWT_FLATBTN, 1, 167, 190, 69, 92, SPR_RENAME, 1055}, // Rename Button
{ WWT_FLATBTN, 1, 167, 190, 93, 116, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP},// Locate Button
{ WWT_FLATBTN, 1, 167, 190, 117, 140, SPR_TRACK_PEEP, 1930}, // Track Button
{ WWT_FRAME, 0, 0, 191, 0, 156, 0x0FFFFFFFF, STR_NONE }, // Panel / Background
{ WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP }, // Title
{ WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP }, // Close x button
{ WWT_RESIZE, 1, 0, 191, 43, 156, 0x0FFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_SHOW_GUEST_VIEW_TIP }, // Tab 1
{ WWT_TAB, 1, 73, 64, 17, 43, 0x2000144E, STR_SHOW_GUEST_NEEDS_TIP}, // Tab 2
{ WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SHOW_GUEST_VISITED_RIDES_TIP}, // Tab 3
{ WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, STR_SHOW_GUEST_FINANCE_TIP}, // Tab 4
{ WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, STR_SHOW_GUEST_THOUGHTS_TIP}, // Tab 5
{ WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, STR_SHOW_GUEST_ITEMS_TIP}, // Tab 6
{ WWT_12, 1, 3, 166, 45, 56, 0x0FFFFFFFF, STR_NONE}, // Label Thought marquee
{ WWT_VIEWPORT, 1, 3, 166, 57, 143, 0x0FFFFFFFF, STR_NONE }, // Viewport
{ WWT_12, 1, 3, 166, 144, 154, 0x0FFFFFFFF, STR_NONE}, // Label Action
{ WWT_FLATBTN, 1, 167, 190, 45, 68, SPR_PICKUP_BTN, STR_PICKUP_TIP}, // Pickup Button
{ WWT_FLATBTN, 1, 167, 190, 69, 92, SPR_RENAME, STR_NAME_GUEST_TIP}, // Rename Button
{ WWT_FLATBTN, 1, 167, 190, 93, 116, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP}, // Locate Button
{ WWT_FLATBTN, 1, 167, 190, 117, 140, SPR_TRACK_PEEP, STR_TOGGLE_GUEST_TRACKING_TIP}, // Track Button
{ WIDGETS_END },
};
rct_widget window_guest_stats_widgets[] = {
{WWT_FRAME, 0, 0, 191, 0, 156, -1, STR_NONE},
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, -1, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, 1938},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, 1940},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, 1941},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, 1942},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, 1943},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, 1944},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, STR_SHOW_GUEST_ITEMS_TIP},
{WIDGETS_END},
};
rct_widget window_guest_rides_widgets[] = {
{WWT_FRAME, 0, 0, 191, 0, 156, -1, STR_NONE},
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, -1, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, 1938},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, 1940},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, 1941},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, 1942},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, 1943},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, 1944},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, STR_SHOW_GUEST_ITEMS_TIP},
{WWT_SCROLL, 1, 3, 188, 57, 143, 2, STR_NONE},
{WIDGETS_END},
};
rct_widget window_guest_finance_widgets[] = {
{WWT_FRAME, 0, 0, 191, 0, 156, -1, STR_NONE},
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, -1, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, 1938},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, 1940},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, 1941},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, 1942},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, 1943},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, 1944},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, STR_SHOW_GUEST_ITEMS_TIP},
{WIDGETS_END},
};
rct_widget window_guest_thoughts_widgets[] = {
{WWT_FRAME, 0, 0, 191, 0, 156, -1, STR_NONE},
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, -1, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, 1938},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, 1940},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, 1941},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, 1942},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, 1943},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, 1944},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, STR_SHOW_GUEST_ITEMS_TIP},
{WIDGETS_END},
};
rct_widget window_guest_inventory_widgets[] = {
{WWT_FRAME, 0, 0, 191, 0, 156, -1, STR_NONE},
{WWT_FRAME, 0, 0, 191, 0, 156, STR_NONE, STR_NONE},
{WWT_CAPTION, 0, 1, 190, 1, 14, 865, STR_WINDOW_TITLE_TIP},
{WWT_CLOSEBOX, 0, 179, 189, 2, 13, 824, STR_CLOSE_WINDOW_TIP},
{WWT_RESIZE, 1, 0, 191, 43, 156, -1, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, 1938},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, 1940},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, 1941},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, 1942},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, 1943},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, 1944},
{WWT_RESIZE, 1, 0, 191, 43, 156, STR_NONE, STR_NONE},
{WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_SHOW_GUEST_VIEW_TIP},
{WWT_TAB, 1, 34, 64, 17, 43, 0x2000144E, STR_SHOW_GUEST_NEEDS_TIP},
{WWT_TAB, 1, 65, 95, 17, 43, 0x2000144E, STR_SHOW_GUEST_VISITED_RIDES_TIP},
{WWT_TAB, 1, 96, 126, 17, 43, 0x2000144E, STR_SHOW_GUEST_FINANCE_TIP},
{WWT_TAB, 1, 127, 157, 17, 43, 0x2000144E, STR_SHOW_GUEST_THOUGHTS_TIP},
{WWT_TAB, 1, 158, 188, 17, 43, 0x2000144E, STR_SHOW_GUEST_ITEMS_TIP},
{WIDGETS_END},
};
@ -1013,7 +1013,7 @@ void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = (widget->left + widget->right) / 2 + w->x;
int y = w->y + widget->top - 1;
int width = widget->right - widget->left;
gfx_draw_string_centred_clipped(dpi, 1191, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0, x, y, width);
// Draw the marquee thought
widget = &w->widgets[WIDX_MARQUEE];
@ -1048,7 +1048,7 @@ void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
set_format_arg(8, uint16, 0);
x = widget->right - widget->left - w->list_information_type;
gfx_draw_string_left(&dpi_marquee, 1193, gCommonFormatArgs, 0, x, 0);
gfx_draw_string_left(&dpi_marquee, STR_WINDOW_COLOUR_2_STRING, gCommonFormatArgs, 0, x, 0);
}
/**
@ -1770,10 +1770,10 @@ void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, int
for (int list_index = 0; list_index < w->no_list_items; list_index++){
int y = list_index * 10;
int string_format = 1191;
int string_format = STR_BLACK_STRING;
if (list_index == w->selected_list_item){
gfx_fill_rect(dpi, 0, y, 800, y + 9, 0x2000031);
string_format = 1193;
string_format = STR_WINDOW_COLOUR_2_STRING;
}
rct_ride* ride = get_ride(w->list_item_positions[list_index]);
@ -2016,7 +2016,7 @@ void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi)
- window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left
- 8;
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, 1191, 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, 0);
// If this is the last visable line end drawing.
if (y > w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].bottom - 32) return;

24
src/windows/guest_list.c
View File

@ -62,7 +62,7 @@ static rct_widget window_guest_list_widgets[] = {
{ WWT_DROPDOWN_BUTTON, 1, 73, 83, 60, 69, 876, STR_NONE }, // page dropdown button
{ WWT_DROPDOWN, 1, 120, 295, 59, 70, 0x0FFFFFFFF, STR_INFORMATION_TYPE_TIP }, // information type dropdown
{ WWT_DROPDOWN_BUTTON, 1, 284, 294, 60, 69, 876, STR_INFORMATION_TYPE_TIP }, // information type dropdown button
{ WWT_FLATBTN, 1, 297, 320, 46, 69, 5192, STR_SHOW_GUESTS_ON_MAP_TIP }, // map
{ WWT_FLATBTN, 1, 297, 320, 46, 69, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP }, // map
{ WWT_FLATBTN, 1, 321, 344, 46, 69, SPR_TRACK_PEEP, STR_TRACKED_GUESTS_ONLY_TIP }, // tracking
{ WWT_TAB, 1, 3, 33, 17, 43, 0x02000144E, STR_INDIVIDUAL_GUESTS_TIP }, // tab 1
{ WWT_TAB, 1, 34, 64, 17, 43, 0x02000144E, STR_SUMMARISED_GUESTS_TIP }, // tab 2
@ -345,7 +345,7 @@ static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widge
);
for (i = 0; i < 2; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_PAGE_1 + i;
}
dropdown_set_checked(_window_guest_list_selected_view, true);
@ -354,7 +354,7 @@ static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widge
widget = &w->widgets[widgetIndex - 1];
for (i = 0; i < 2; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_ACTIONS + i;
}
@ -627,7 +627,7 @@ static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
x = w->x + 4;
y = w->y + window_guest_list_widgets[WIDX_GUEST_LIST].bottom + 2;
set_format_arg(0, sint16, w->var_492);
gfx_draw_string_left(dpi, (w->var_492 == 1 ? 1755 : 1754), gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, (w->var_492 == 1 ? STR_FORMAT_NUM_GUESTS_SINGULAR : STR_FORMAT_NUM_GUESTS_PLURAL), gCommonFormatArgs, 0, x, y);
}
}
@ -671,10 +671,10 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
break;
// Highlight backcolour and text colour (format)
format = 1191;
format = STR_BLACK_STRING;
if (i == _window_guest_list_highlighted_index) {
gfx_fill_rect(dpi, 0, y, 800, y + 9, 0x02000031);
format = 1193;
format = STR_WINDOW_COLOUR_2_STRING;
}
// Guest name
@ -689,7 +689,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Tracking icon
if (peep->peep_flags & PEEP_FLAGS_TRACKING)
gfx_draw_sprite(dpi, 5129, 112, y, 0);
gfx_draw_sprite(dpi, STR_ENTER_SELECTION_SIZE, 112, y, 0);
// Action
@ -738,16 +738,16 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
break;
// Highlight backcolour and text colour (format)
format = 1191;
format = STR_BLACK_STRING;
if (i == _window_guest_list_highlighted_index) {
gfx_fill_rect(dpi, 0, y, 800, y + 20, 0x02000031);
format = 1193;
format = STR_WINDOW_COLOUR_2_STRING;
}
// Draw guest faces
numGuests = _window_guest_list_groups_num_guests[i];
for (j = 0; j < 56 && j < numGuests; j++)
gfx_draw_sprite(dpi, _window_guest_list_groups_guest_faces[i * 56 + j] + 5486, j * 8, y + 9, 0);
gfx_draw_sprite(dpi, _window_guest_list_groups_guest_faces[i * 56 + j] + SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY, j * 8, y + 9, 0);
// Draw action
set_format_arg(0, uint32, _window_guest_list_groups_argument_1[i]);
@ -860,7 +860,7 @@ static void window_guest_list_find_groups()
RCT2_ADDRESS(0x00F1AF26, uint8)[groupIndex] = groupIndex;
faceIndex = groupIndex * 56;
_window_guest_list_groups_guest_faces[faceIndex++] = get_peep_face_sprite_small(peep) - 5486;
_window_guest_list_groups_guest_faces[faceIndex++] = get_peep_face_sprite_small(peep) - SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY;
// Find more peeps that belong to same group
FOR_ALL_GUESTS(spriteIndex2, peep2) {
@ -880,7 +880,7 @@ static void window_guest_list_find_groups()
// Add face sprite, cap at 56 though
if (_window_guest_list_groups_num_guests[groupIndex] >= 56)
continue;
_window_guest_list_groups_guest_faces[faceIndex++] = get_peep_face_sprite_small(peep2) - 5486;
_window_guest_list_groups_guest_faces[faceIndex++] = get_peep_face_sprite_small(peep2) - SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY;
}
if (RCT2_GLOBAL(0x00F1EDF6, uint16) == 0) {

4
src/windows/multiplayer.c
View File

@ -432,7 +432,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli
if (action != -999) {
set_format_arg(0, uint16, network_get_action_name_string_id(action));
}
gfx_draw_string_left_clipped(dpi, 1191, gCommonFormatArgs, 0, 256, y - 1, 100);
gfx_draw_string_left_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0, 256, y - 1, 100);
// Draw ping
lineCh = buffer;
@ -681,7 +681,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelin
// Draw action name
set_format_arg(0, uint16, network_get_action_name_string_id(i));
gfx_draw_string_left(dpi, 1193, gCommonFormatArgs, 0, 10, y - 1);
gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRING, gCommonFormatArgs, 0, 10, y - 1);
}
y += 10;
}

4
src/windows/new_campaign.c
View File

@ -252,7 +252,7 @@ static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_wi
if (window_new_campaign_shop_items[i] == 255)
break;
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = ShopItemStringIds[window_new_campaign_shop_items[i]].plural;
numItems++;
}
@ -274,7 +274,7 @@ static void window_new_campaign_mousedown(int widgetIndex, rct_window *w, rct_wi
break;
rct_ride *ride = get_ride(window_new_campaign_rides[i]);
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = ((uint64)ride->name_arguments << 16ULL) | ride->name;
numItems++;
}

50
src/windows/options.c
View File

@ -824,7 +824,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
for (i = 0; i < gNumResolutions; i++) {
resolution *resolution = &gResolutions[i];
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
uint16 *args = (uint16*)&gDropdownItemsArgs[i];
args[0] = 839;
@ -844,9 +844,9 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
break;
case WIDX_FULLSCREEN_DROPDOWN:
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[2] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[2] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = 2773;
gDropdownItemsArgs[1] = 2774;
gDropdownItemsArgs[2] = 2775;
@ -869,9 +869,9 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
platform_trigger_resize();
break;
case WIDX_SCALE_QUALITY_DROPDOWN:
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[2] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[2] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_SCALING_QUALITY_NN;
gDropdownItemsArgs[1] = STR_SCALING_QUALITY_LINEAR;
gDropdownItemsArgs[2] = STR_SCALING_QUALITY_ANISOTROPIC;
@ -886,8 +886,8 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
case WINDOW_OPTIONS_PAGE_RENDERING:
switch (widgetIndex) {
case WIDX_CONSTRUCTION_MARKER_DROPDOWN:
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_WHITE;
gDropdownItemsArgs[1] = STR_TRANSLUCENT;
@ -901,8 +901,8 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
case WINDOW_OPTIONS_PAGE_CULTURE:
switch (widgetIndex) {
case WIDX_HEIGHT_LABELS_DROPDOWN:
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_UNITS;
gDropdownItemsArgs[1] = STR_REAL_VALUES;
@ -914,7 +914,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
num_items = CURRENCY_END;
for (i = 0; i < num_items; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = CurrencyDescriptors[i].stringId;
}
@ -923,9 +923,9 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
dropdown_set_checked(gConfigGeneral.currency_format, true);
break;
case WIDX_DISTANCE_DROPDOWN:
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[2] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[2] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_IMPERIAL;
gDropdownItemsArgs[1] = STR_METRIC;
gDropdownItemsArgs[2] = STR_SI;
@ -935,8 +935,8 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
dropdown_set_checked(gConfigGeneral.measurement_format, true);
break;
case WIDX_TEMPERATURE_DROPDOWN:
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_CELSIUS;
gDropdownItemsArgs[1] = STR_FAHRENHEIT;
@ -954,7 +954,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
break;
case WIDX_DATE_FORMAT_DROPDOWN:
for (i = 0; i < 4; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = DateFormatStringIds[i];
}
window_options_show_dropdown(w, widget, 4);
@ -970,7 +970,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
// populate the list with the sound devices
for (i = 0; i < gAudioDeviceCount; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = 1170 | ((uint64)(intptr_t)gAudioDevices[i].name << 16);
}
@ -982,11 +982,11 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
num_items = 4;
for (i = 0; i < num_items - 1; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = 2739 + i;
}
// Random title music
gDropdownItemsFormat[3] = 1142;
gDropdownItemsFormat[3] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[3] = 5126;
window_options_show_dropdown(w, widget, num_items);
@ -1023,9 +1023,9 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
case WIDX_SCENARIO_GROUPING_DROPDOWN:
num_items = 2;
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_OPTIONS_SCENARIO_DIFFICULTY;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[1] = STR_OPTIONS_SCENARIO_ORIGIN;
window_dropdown_show_text_custom_width(
@ -1047,7 +1047,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
switch (widgetIndex) {
case WIDX_AUTOSAVE_DROPDOWN:
for (i = AUTOSAVE_EVERY_MINUTE; i <= AUTOSAVE_NEVER; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_SAVE_EVERY_MINUTE + i;
}
@ -1075,7 +1075,7 @@ static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget*
break;
case WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN:
for (i = 0; i < 7; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_EVERY_10_MINUTES + i;
}

8
src/windows/park.c
View File

@ -672,8 +672,8 @@ static void window_park_entrance_resize(rct_window *w)
static void window_park_entrance_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
{
if (widgetIndex == WIDX_OPEN_OR_CLOSE) {
gDropdownItemsFormat[0] = 1142;
gDropdownItemsFormat[1] = 1142;
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_CLOSE_PARK;
gDropdownItemsArgs[1] = STR_OPEN_PARK;
window_dropdown_show_text(
@ -1035,7 +1035,7 @@ static void window_park_entrance_paint(rct_window *w, rct_drawpixelinfo *dpi)
labelWidget = &window_park_entrance_widgets[WIDX_STATUS];
gfx_draw_string_centred_clipped(
dpi,
1191,
STR_BLACK_STRING,
gCommonFormatArgs,
0,
w->x + (labelWidget->left + labelWidget->right) / 2,
@ -1746,7 +1746,7 @@ static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + window_park_objective_widgets[WIDX_PAGE_BACKGROUND].top + 7;
safe_strcpy((char*)0x009BC677, gScenarioDetails, 256);
set_format_arg(0, short, STR_PLACEHOLDER);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, 1191, 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_BLACK_STRING, 0);
y += 5;
// Your objective:

2
src/windows/research.c
View File

@ -447,7 +447,7 @@ static void window_research_funding_mousedown(int widgetIndex, rct_window *w, rc
dropdownWidget = widget - 1;
for (i = 0; i < 4; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = STR_NO_FUNDING + i;
}
window_dropdown_show_text_custom_width(

4
src/windows/ride_list.c
View File

@ -518,12 +518,12 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
y = 0;
for (i = 0; i < w->no_list_items; i++) {
format = 1191;
format = STR_BLACK_STRING;
// Background highlight
if (i == w->selected_list_item) {
gfx_fill_rect(dpi, 0, y, 800, y + 9, 0x02000031);
format = 1193;
format = STR_WINDOW_COLOUR_2_STRING;
}
// Get ride

4
src/windows/staff.c
View File

@ -908,7 +908,7 @@ void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = (widget->left + widget->right) / 2 + w->x;
int y = w->y + widget->top;
int width = widget->right - widget->left;
gfx_draw_string_centred_clipped(dpi, 1191, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0, x, y, width);
}
/**
@ -1357,7 +1357,7 @@ void window_staff_options_mousedown(int widgetIndex, rct_window* w, rct_widget*
item_checked = 1 << i;
}
gDropdownItemsArgs[i] = eax + 1775;
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
}
//Get the dropdown box widget instead of button.

14
src/windows/staff_list.c
View File

@ -122,9 +122,9 @@ static rct_widget window_staff_list_widgets[] = {
{ WWT_SCROLL, 1, 3, 316, 72, 266, 3, STR_NONE }, // staff list
{ WWT_COLOURBTN, 1, 130, 141, 58, 69, STR_NONE, STR_UNIFORM_COLOUR_TIP }, // uniform colour picker
{ WWT_DROPDOWN_BUTTON, 0, WW - 155, WW - 11, 17, 29, STR_NONE, STR_HIRE_STAFF_TIP }, // hire button
{ WWT_FLATBTN, 1, WW - 77, WW - 54, 46, 69, SPR_DEMOLISH, 5300 }, // quick fire staff
{ WWT_FLATBTN, 1, WW - 53, WW - 30, 46, 69, 5175, STR_SHOW_PATROL_AREA_TIP }, // show staff patrol area tool
{ WWT_FLATBTN, 1, WW - 29, WW - 6, 46, 69, 5192, STR_SHOW_STAFF_ON_MAP_TIP }, // show staff on map button
{ WWT_FLATBTN, 1, WW - 77, WW - 54, 46, 69, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF }, // quick fire staff
{ WWT_FLATBTN, 1, WW - 53, WW - 30, 46, 69, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP }, // show staff patrol area tool
{ WWT_FLATBTN, 1, WW - 29, WW - 6, 46, 69, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP }, // show staff on map button
{ WIDGETS_END },
};
@ -584,14 +584,14 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) {
set_format_arg(0, uint32, RCT2_ADDRESS(0x00992A00, uint16)[selectedTab]);
gfx_draw_string_left(dpi, 1858, gCommonFormatArgs, 0, w->x + w->width - 155, w->y + 0x20);
gfx_draw_string_left(dpi, STR_COST_PER_MONTH, gCommonFormatArgs, 0, w->x + w->width - 155, w->y + 0x20);
}
if (selectedTab < 3) {
gfx_draw_string_left(dpi, STR_UNIFORM_COLOUR, w, 0, w->x + 6, window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].top + w->y + 1);
}
int staffTypeStringId = 1859 + selectedTab;
int staffTypeStringId = STR_HANDYMAN_PLURAL + selectedTab;
// If the number of staff for a given type is 1, we use the singular forms of the names
if (_window_staff_list_selected_type_count == 1) {
staffTypeStringId += 4;
@ -626,11 +626,11 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
}
if (y + 11 >= dpi->y) {
int format = (_quick_fire_mode ? 5298 : 1191);
int format = (_quick_fire_mode ? 5298 : STR_BLACK_STRING);
if (i == _windowStaffListHighlightedIndex) {
gfx_fill_rect(dpi, 0, y, 800, y + 9, 0x2000031);
format = (_quick_fire_mode ? 5299 : 1193);
format = (_quick_fire_mode ? 5299 : STR_WINDOW_COLOUR_2_STRING);
}
set_format_arg(0, uint16, peep->name_string_idx);

4
src/windows/title_command_editor.c
View File

@ -307,7 +307,7 @@ static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w
case WIDX_COMMAND_DROPDOWN:
num_items = NUM_COMMANDS;
for (i = 0; i < num_items; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = window_title_command_editor_orders[i].nameStringId;
}
@ -327,7 +327,7 @@ static void window_title_command_editor_mousedown(int widgetIndex, rct_window* w
if (command.command == TITLE_SCRIPT_SPEED) {
num_items = 4;
for (i = 0; i < num_items; i++) {
gDropdownItemsFormat[i] = 1142;
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[i] = 5142 + i;
}

12
src/windows/title_scenarioselect.c
View File

@ -358,7 +358,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
window_draw_widgets(w, dpi);
format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? 5138 : 1193;
format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? 5138 : STR_WINDOW_COLOUR_2_STRING;
// Text for each tab
for (i = 0; i < 8; i++) {
@ -399,7 +399,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
shorten_path(path, sizeof(path), scenario->path, w->width - 6);
const utf8 *pathPtr = path;
gfx_draw_string_left(dpi, 1170, (void*)&pathPtr, w->colours[1], w->x + 3, w->y + w->height - 3 - 11);
gfx_draw_string_left(dpi, STR_STRING, (void*)&pathPtr, w->colours[1], w->x + 3, w->y + w->height - 3 - 11);
}
// Scenario name
@ -407,13 +407,13 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5;
safe_strcpy((char*)0x009BC677, scenario->name, 64);
set_format_arg(0, short, STR_PLACEHOLDER); // empty string
gfx_draw_string_centred_clipped(dpi, 1193, gCommonFormatArgs, 0, x + 85, y, 170);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRING, gCommonFormatArgs, 0, x + 85, y, 170);
y += 15;
// Scenario details
safe_strcpy((char*)0x009BC677, scenario->details, 256);
set_format_arg(0, short, STR_PLACEHOLDER); // empty string
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, 1191, 0) + 5;
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_BLACK_STRING, 0) + 5;
// Scenario objective
set_format_arg(0, short, scenario->objective_type + STR_OBJECTIVE_NONE);
@ -441,8 +441,8 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *
colour = (colour << 24) | (colour << 16) | (colour << 8) | colour;
gfx_clear(dpi, colour);
int highlighted_format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? 5139 : 1193;
int unhighlighted_format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? 5139 : 1191;
int highlighted_format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? 5139 : STR_WINDOW_COLOUR_2_STRING;
int unhighlighted_format = (theme_get_flags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT) ? 5139 : STR_BLACK_STRING;
bool wide = gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN;

12
src/windows/track_list.c
View File

@ -45,7 +45,7 @@ static rct_widget window_track_list_widgets[] = {
{ WWT_CLOSEBOX, 0, 587, 597, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
{ WWT_SCROLL, 0, 4, 221, 33, 395, 2, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP },
{ WWT_FLATBTN, 0, 224, 595, 18, 236, 0xFFFFFFFF, STR_NONE },
{ WWT_FLATBTN, 0, 574, 597, 374, 397, 5169, STR_ROTATE_90_TIP },
{ WWT_FLATBTN, 0, 574, 597, 374, 397, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP },
{ WWT_FLATBTN, 0, 574, 597, 350, 373, 5171, STR_TOGGLE_SCENERY_TIP },
{ WWT_13, 0, 4, 221, 18, 29, STR_SELECT_OTHER_RIDE, STR_NONE },
{ WIDGETS_END },
@ -478,7 +478,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
// Ride length
set_format_arg(0, uint16, 1345);
set_format_arg(0, uint16, STR_RIDE_LENGTH_ENTRY);
set_format_arg(2, uint16, td6->ride_length);
gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, 0, x, y, 214);
y += 10;
@ -571,9 +571,9 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
if (listIndex == w->selected_list_item) {
// Highlight
gfx_fill_rect(dpi, x, y, w->width, y + 9, 0x2000000 | 49);
stringId = 1193;
stringId = STR_WINDOW_COLOUR_2_STRING;
} else {
stringId = 1191;
stringId = STR_BLACK_STRING;
}
rct_string_id stringId2 = STR_BUILD_CUSTOM_DESIGN;
@ -588,9 +588,9 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
if (listIndex == w->selected_list_item) {
// Highlight
gfx_fill_rect(dpi, x, y, w->width, y + 9, 0x2000000 | 49);
stringId = 1193;
stringId = STR_WINDOW_COLOUR_2_STRING;
} else {
stringId = 1191;
stringId = STR_BLACK_STRING;
}
// Draw track name