diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 802d50c6fb..d9effcd08f 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4205,7 +4205,7 @@ STR_5893 :Exchange Rate STR_5894 :Enter the exchange rate STR_5895 :Save Track STR_5896 :Track save failed! -STR_5897 :Window limit: +STR_5897 : STR_5898 :{BLACK}Can't load the track, the file might be {newline}corrupted, broken or missing! STR_5899 :Toggle paint debug window STR_5900 :Use original drawing code diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 0dbd4774ea..fff52e76c8 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -168,9 +168,6 @@ enum WINDOW_OPTIONS_WIDGET_IDX { WIDX_AUTO_OPEN_SHOPS, WIDX_DEFAULT_INSPECTION_INTERVAL, WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN, - WIDX_WINDOW_LIMIT, - WIDX_WINDOW_LIMIT_UP, - WIDX_WINDOW_LIMIT_DOWN, WIDX_PATH_TO_RCT1_TEXT, WIDX_PATH_TO_RCT1_BUTTON, WIDX_PATH_TO_RCT1_CLEAR, @@ -327,12 +324,9 @@ static rct_widget window_options_misc_widgets[] = { { WWT_CHECKBOX, 2, 10, 299, 209, 210, STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP }, // Automatically open shops & stalls { WWT_DROPDOWN, 1, 155, 299, 224, 235, STR_NONE, STR_NONE }, // Default inspection time dropdown { WWT_DROPDOWN_BUTTON, 1, 288, 298, 225, 234, STR_DROPDOWN_GLYPH, STR_DEFAULT_INSPECTION_INTERVAL_TIP }, // Default inspection time dropdown button - { WWT_SPINNER, 1, 155, 299, 239, 250, STR_NONE, STR_NONE }, // Window limit - { WWT_DROPDOWN_BUTTON, 1, 288, 298, 240, 244, STR_NUMERIC_UP, STR_NONE }, // Window limit up - { WWT_DROPDOWN_BUTTON, 1, 288, 298, 245, 249, STR_NUMERIC_DOWN, STR_NONE }, // Window limit down - { WWT_12, 1, 10, 298, 254, 265, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP }, // RCT 1 path text - { WWT_DROPDOWN_BUTTON, 1, 10, 289, 268, 279, STR_NONE, STR_STRING_TOOLTIP }, // RCT 1 path button - { WWT_DROPDOWN_BUTTON, 1, 289, 299, 268, 279, STR_CLOSE_X, STR_PATH_TO_RCT1_CLEAR_TIP }, // RCT 1 path clear button + { WWT_12, 1, 10, 298, 239, 250, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP }, // RCT 1 path text + { WWT_DROPDOWN_BUTTON, 1, 10, 289, 254, 265, STR_NONE, STR_STRING_TOOLTIP }, // RCT 1 path button + { WWT_DROPDOWN_BUTTON, 1, 289, 299, 254, 265, STR_CLOSE_X, STR_PATH_TO_RCT1_CLEAR_TIP }, // RCT 1 path clear button { WIDGETS_END }, }; @@ -542,9 +536,6 @@ static uint64 window_options_page_enabled_widgets[] = { (1 << WIDX_AUTO_OPEN_SHOPS) | (1 << WIDX_DEFAULT_INSPECTION_INTERVAL) | (1 << WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN) | - (1 << WIDX_WINDOW_LIMIT) | - (1 << WIDX_WINDOW_LIMIT_UP) | - (1 << WIDX_WINDOW_LIMIT_DOWN) | (1 << WIDX_PATH_TO_RCT1_BUTTON) | (1ULL << WIDX_PATH_TO_RCT1_CLEAR), @@ -1205,24 +1196,6 @@ static void window_options_mousedown(rct_window *w, rct_widgetindex widgetIndex, window_options_show_dropdown(w, widget, 7); dropdown_set_checked(gConfigGeneral.default_inspection_interval, true); break; - case WIDX_WINDOW_LIMIT_UP: - { - sint32 i = gConfigGeneral.window_limit; - if (i < WINDOW_LIMIT_MAX) { - window_set_window_limit(++i); - } - window_invalidate(w); - break; - } - case WIDX_WINDOW_LIMIT_DOWN: - { - sint32 i = gConfigGeneral.window_limit; - if (i > WINDOW_LIMIT_MIN) { - window_set_window_limit(--i); - } - window_invalidate(w); - break; - } } break; @@ -1674,8 +1647,6 @@ static void window_options_invalidate(rct_window *w) window_options_misc_widgets[WIDX_REAL_NAME_CHECKBOX].tooltip = STR_OPTION_DISABLED_DURING_NETWORK_PLAY; } - w->hold_down_widgets |= (1 << WIDX_WINDOW_LIMIT_UP) | (1 << WIDX_WINDOW_LIMIT_DOWN); - // save plugin data checkbox: visible or not window_options_misc_widgets[WIDX_SAVE_PLUGIN_DATA_CHECKBOX].type = WWT_CHECKBOX; @@ -1703,9 +1674,6 @@ static void window_options_invalidate(rct_window *w) window_options_misc_widgets[WIDX_AUTO_OPEN_SHOPS].type = WWT_CHECKBOX; window_options_misc_widgets[WIDX_DEFAULT_INSPECTION_INTERVAL].type = WWT_DROPDOWN; window_options_misc_widgets[WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN].type = WWT_DROPDOWN_BUTTON; - window_options_misc_widgets[WIDX_WINDOW_LIMIT].type = WWT_SPINNER; - window_options_misc_widgets[WIDX_WINDOW_LIMIT_UP].type = WWT_DROPDOWN_BUTTON; - window_options_misc_widgets[WIDX_WINDOW_LIMIT_DOWN].type = WWT_DROPDOWN_BUTTON; window_options_misc_widgets[WIDX_PATH_TO_RCT1_BUTTON].type = WWT_DROPDOWN_BUTTON; window_options_misc_widgets[WIDX_PATH_TO_RCT1_CLEAR].type = WWT_DROPDOWN_BUTTON; break; @@ -1937,16 +1905,6 @@ static void window_options_paint(rct_window *w, rct_drawpixelinfo *dpi) w->x + window_options_misc_widgets[WIDX_DEFAULT_INSPECTION_INTERVAL].left + 1, w->y + window_options_misc_widgets[WIDX_DEFAULT_INSPECTION_INTERVAL].top ); - gfx_draw_string_left(dpi, STR_WINDOW_LIMIT, w, w->colours[1], w->x + 10, w->y + window_options_misc_widgets[WIDX_WINDOW_LIMIT].top + 1); - set_format_arg(0, sint16, gConfigGeneral.window_limit); - gfx_draw_string_left( - dpi, - STR_COMMA16, - gCommonFormatArgs, - w->colours[1], - w->x + window_options_misc_widgets[WIDX_WINDOW_LIMIT].left + 1, - w->y + window_options_misc_widgets[WIDX_WINDOW_LIMIT].top - ); #ifdef __APPLE__ set_format_arg(0, uintptr_t, (uintptr_t)macos_str_decomp_to_precomp(gConfigGeneral.rct1_path)); #else diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index bd14d937ec..91872b985c 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -3507,7 +3507,6 @@ enum { STR_RATE_INPUT_DESC = 5894, STR_FILE_DIALOG_TITLE_SAVE_TRACK = 5895, STR_TRACK_SAVE_FAILED = 5896, - STR_WINDOW_LIMIT = 5897, STR_TRACK_LOAD_FAILED_ERROR = 5898, STR_SHORTCUT_DEBUG_PAINT_TOGGLE = 5899, STR_DEBUG_PAINT_USE_OLD_DRAWING = 5900,