From 3bdc06dc25ceaa038410c5e90b198dff6ab8bf57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20=C4=8Cern=C3=A1=C4=8D?= Date: Wed, 18 May 2016 22:51:37 +0200 Subject: [PATCH] Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) --- src/interface/screenshot.c | 2 +- src/interface/viewport_interaction.c | 4 +- src/localisation/string_ids.h | 76 ++++++++++++- src/object_list.c | 4 +- src/sprites.h | 1 + src/windows/cheats.c | 6 +- src/windows/dropdown.c | 2 +- src/windows/editor_inventions_list.c | 21 ++-- src/windows/editor_object_selection.c | 8 +- src/windows/editor_objective_options.c | 65 +++++------ src/windows/loadsave.c | 6 +- src/windows/map.c | 8 +- src/windows/mapgen.c | 14 +-- src/windows/park.c | 2 +- src/windows/ride.c | 142 ++++++++++++------------- src/windows/title_editor.c | 2 +- src/windows/title_scenarioselect.c | 8 +- 17 files changed, 220 insertions(+), 151 deletions(-) diff --git a/src/interface/screenshot.c b/src/interface/screenshot.c index 0b0e4555ac..8562403a6c 100644 --- a/src/interface/screenshot.c +++ b/src/interface/screenshot.c @@ -247,7 +247,7 @@ void screenshot_giant() free(dpi.bits); // Show user that screenshot saved successfully - rct_string_id stringId = 3165; + rct_string_id stringId = STR_PLACEHOLDER; strcpy((char*)language_get_string(stringId), path_get_filename(path)); set_format_arg(0, uint16, stringId); window_error_open(STR_SCREENSHOT_SAVED_AS, -1); diff --git a/src/interface/viewport_interaction.c b/src/interface/viewport_interaction.c index dd7daef1ae..e52c8d4e38 100644 --- a/src/interface/viewport_interaction.c +++ b/src/interface/viewport_interaction.c @@ -310,7 +310,7 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(mapElement)); set_map_tooltip_format_arg(0, uint16, 1164); if (mapElement->flags & 0x20) { - set_map_tooltip_format_arg(2, uint16, 3124); + set_map_tooltip_format_arg(2, uint16, STR_BROKEN); set_map_tooltip_format_arg(4, uint16, sceneryEntry->name); } else { set_map_tooltip_format_arg(2, uint16, sceneryEntry->name); @@ -325,7 +325,7 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info break; set_map_tooltip_format_arg(0, uint16, 1164); - set_map_tooltip_format_arg(2, uint16, 3192); + set_map_tooltip_format_arg(2, uint16, STR_OBJECT_SELECTION_PARK_ENTRANCE); return info->type; case VIEWPORT_INTERACTION_ITEM_WALL: diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index a2057fc175..9100db78b8 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -470,7 +470,7 @@ enum { STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP = 1214, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS = 1215, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP = 1216, - + STR_FORMAT_SECONDS = 1217, STR_NUMERIC_UP = 1218, STR_NUMERIC_DOWN = 1219, STR_EXIT_ONLY = 1220, @@ -483,6 +483,8 @@ enum { STR_WATER_RIDES_TIP = 1227, STR_SHOPS_STALLS_TIP = 1228, + STR_VEHICLE_LOWERCASE_BOAT = 1236, + STR_PLAYER_DEFAULT_NAME = 1315, STR_X_PLAYER = 1317, STR_X_PLAYERS = 1318, @@ -516,6 +518,9 @@ enum { STR_QUEUE_TIME_MINUTE = 1359, STR_QUEUE_TIME_MINUTES = 1360, + STR_CANT_CHANGE_SPEED = 1361, + STR_CANT_CHANGE_LAUNCH_SPEED = 1362, + STR_TOO_HIGH_FOR_SUPPORTS = 1363, STR_SUPPORTS_CANT_BE_EXTENDED = 1364, @@ -570,6 +575,16 @@ enum { STR_DATA_LOGGING_NOT_AVAILABLE_FOR_THIS_TYPE_OF_RIDE = 1412, STR_DATA_LOGGING_WILL_START_WHEN_NEXT_LEAVES = 1413, + + STR_RIDE_STATS_TIME = 1414, + STR_RIDE_STATS_VELOCITY = 1415, + STR_RIDE_STATS_ALTITUDE = 1416, + STR_RIDE_STATS_VERT_G = 1417, + STR_RIDE_STATS_LAT_G = 1418, + STR_RIDE_STATS_VELOCITY_FORMAT = 1419, + STR_RIDE_STATS_ALTITUDE_FORMAT = 1420, + STR_RIDE_STATS_G_FORCE_FORMAT = 1421, + STR_LOGGING_DATA_FROM_TIP = 1422, STR_QUEUE_LINE_PATH_TIP = 1423, STR_FOOTPATH_TIP = 1424, @@ -705,6 +720,7 @@ enum { STR_NUMBER_OF_LAPS = 1734, STR_NUMBER_OF_LAPS_TIP = 1735, + STR_CANT_CHANGE_NUMBER_OF_LAPS = 1738, STR_RACE_WON_BY_GUEST = 1739, STR_RACE_WON_BY = 1740, @@ -713,9 +729,11 @@ enum { STR_MAX_PEOPLE_ON_RIDE = 1742, STR_MAX_PEOPLE_ON_RIDE_TIP = 1743, + STR_CANT_CHANGE_THIS = 1746, STR_TIME_LIMIT = 1747, STR_TIME_LIMIT_TIP = 1748, + STR_CANT_CHANGE_TIME_LIMIT = 1751, STR_INDIVIDUAL_GUESTS_TIP = 1752, STR_SUMMARISED_GUESTS_TIP = 1753, STR_ADMISSION_PRICE = 1756, @@ -732,7 +750,7 @@ enum { STR_ON_RIDE_PHOTO_SECTION = 1765, STR_REVERSER_TURNTABLE = 1766, STR_SPINNING_TUNNEL = 1767, - + STR_CANT_CHANGE_NUMBER_OF_SWINGS = 1768, STR_NUMBER_OF_SWINGS = 1769, STR_NUMBER_OF_SWINGS_TIP = 1770, @@ -828,7 +846,7 @@ enum { STR_SECURITY_GUARD_SINGULAR = 1865, STR_ENTERTAINER_SINGULAR = 1866, STR_STAFF_LIST_COUNTER = 1867, - + STR_CANT_CHANGE_NUMBER_OF_ROTATIONS = 1868, STR_NUMBER_OF_ROTATIONS = 1869, STR_NUMBER_OF_ROTATIONS_TIP = 1870, @@ -1433,6 +1451,10 @@ enum { STR_CHEAT_5K_MONEY_TIP = 2681, + STR_BASE_HEIGHT_LABEL = 2691, + STR_WATER_LEVEL_LABEL = 2692, + STR_TERRAIN_LABEL = 2693, + STR_CHEAT_LARGE_TRAM_GUESTS_TIP = 2684, STR_SAVE_EVERY_MINUTE = 2701, @@ -1452,6 +1474,9 @@ enum { STR_ROLLERCOASTER_TYCOON_1_DROPDOWN = 2740, STR_ROLLERCOASTER_TYCOON_2_DROPDOWN = 2741, + + STR_MOVE_ALL_TOP = 2750, + STR_MOVE_ALL_BOTTOM = 2751, STR_CHEAT_CLEAR_GRASS = 2752, STR_CHEAT_MOWED_GRASS = 2753, STR_CHEAT_WATER_PLANTS = 2754, @@ -1489,7 +1514,7 @@ enum { STR_TOTAL_ADMISSIONS = 2800, STR_INCOME_FROM_ADMISSIONS = 2801, - STR_MAP = 2802, + STR_MAP_LABEL = 2802, STR_SHOW_GUESTS_ON_MAP_TIP = 2803, STR_SHOW_STAFF_ON_MAP_TIP = 2804, STR_SHOW_MAP_TIP = 2805, @@ -1674,6 +1699,8 @@ enum { STR_YOU_ARE_NOT_ALLOWED_TO_REMOVE_THIS_SECTION = 3091, STR_NOT_ALLOWED_TO_MODIFY_STATION = 3092, + STR_LIFT_HILL_CHAIN_SPEED = 3095, + STR_SELECT_LIFT_HILL_CHAIN_SPEED_TIP = 3097, STR_SELECT_COLOUR = 3099, @@ -1706,6 +1733,12 @@ enum { STR_FAVOURITE_RIDE_OF_GUEST = 3122, STR_FAVOURITE_RIDE_OF_GUESTS = 3123, + STR_BROKEN = 3124, + STR_EXCITEMENT_FACTOR = 3125, + STR_INTENSITY_FACTOR = 3126, + STR_NAUSEA_FACTOR = 3127, + + STR_SAVE_TRACK_DESIGN_ITEM = 3128, STR_SAVE_TRACK_DESIGN_WITH_SCENERY_ITEM = 3129, STR_DESIGN_SAVE = 3130, @@ -1720,6 +1753,7 @@ enum { STR_CABLE_LIFT_UNABLE_TO_WORK_IN_THIS_OPERATING_MODE = 3139, STR_CABLE_LIFT_HILL_MUST_START_IMMEDIATELY_AFTER_STATION = 3140, STR_MULTICIRCUIT_NOT_POSSIBLE_WITH_CABLE_LIFT_HILL = 3141, + STR_CAPACITY = 3142, STR_SHOW_PEOPLE_ON_MAP_TIP = 3143, STR_SHOW_RIDES_STALLS_ON_MAP_TIP = 3144, @@ -1735,10 +1769,14 @@ enum { STR_SCROLL_DOWN_FAST_TIP = STR_SCROLL_LEFT_TIP + 8, STR_SCROLL_UP_DOWN_TIP = STR_SCROLL_LEFT_TIP + 9, + STR_MAP = 3157, + STR_GRAPH = 3158, STR_LIST = 3159, STR_SELECT_NUMBER_OF_CIRCUITS_TIP = 3160, + STR_PLACEHOLDER = 3165, + STR_UNABLE_TO_SELECT_THIS_OBJECT = 3176, STR_UNABLE_TO_DE_SELECT_THIS_OBJECT = 3177, STR_AT_LEAST_ONE_PATH_OBJECT_MUST_BE_SELECTED = 3178, @@ -1761,6 +1799,9 @@ enum { STR_OBJECT_SELECTION_SCENARIO_DESCRIPTION = 3194, STR_INVENTION_LIST = 3195, + STR_INVENTION_RESEARCH_GROUP = 3196, + STR_INVENTION_PREINVENTED_ITEMS = 3197, + STR_INVENTION_TO_BE_INVENTED_ITEMS = 3198, STR_RANDOM_SHUFFLE = 3199, STR_RANDOM_SHUFFLE_TIP = 3200, @@ -1818,6 +1859,9 @@ enum { STR_GUESTS_PREFER_MORE_INTENSE_RIDES = 3258, STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP = 3259, + STR_CANT_INCREASE_FURTHER = 3264, + STR_CANT_REDUCE_FURTHER = 3265, + STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP = 3266, STR_FORBID_TREE_REMOVAL = 3267, STR_FORBID_TREE_REMOVAL_TIP = 3268, @@ -1834,6 +1878,7 @@ enum { 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_COOL_AND_WET = 3290, @@ -1848,7 +1893,8 @@ enum { STR_SCENARIO_NAME = 3313, STR_ENTER_SCENARIO_NAME = 3314, - + STR_PARK_SCENARIO_DETAILS = 3315, + STR_ENTER_SCENARIO_DESCRIPTION = 3316, STR_NO_DETAILS_YET = 3317, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN = 3318, @@ -1942,6 +1988,8 @@ enum { STR_DISABLE_ELEVATION = 5127, STR_SELECTION_SIZE = 5128, STR_ENTER_SELECTION_SIZE = 5129, + STR_MAP_SIZE_2 = 5130, + STR_ENTER_MAP_SIZE = 5131, STR_CHEAT_FIX_ALL_RIDES = 5132, STR_CHEAT_UNLOCK_OPERATING_LIMITS = 5137, STR_CHEAT_DISABLE_BRAKES_FAILURE = 5140, @@ -1985,6 +2033,12 @@ enum { STR_PARK_CHEATS_TIP = 5180, STR_RIDE_CHEATS_TIP = 5181, + STR_BASE_HEIGHT = 5183, + STR_ENTER_BASE_HEIGHT = 5184, + + STR_WATER_LEVEL = 5185, + STR_ENTER_WATER_LEVEL = 5186, + STR_CHEAT_TITLE = 5217, STR_GIANT_SCREENSHOT = 5260, @@ -2013,9 +2067,21 @@ enum { STR_CHEAT_EXPLODE = 5285, STR_CHEAT_EXPLODE_TIP = 5286, + STR_DEBUG_RIDE_ALREADY_BROKEN = 5287, + STR_DEBUG_RIDE_IS_CLOSED = 5288, STR_DEBUG_NO_BREAKDOWNS_AVAILABLE = 5289, STR_DEBUG_FIX_RIDE = 5290, + STR_DEBUG_CANT_FORCE_BREAKDOWN = 5291, + + STR_DEBUG_FORCE_BREAKDOWN_TIP = 5292, + STR_CLOSE_RIDE_TIP = 5293, + STR_TEST_RIDE_TIP = 5294, + STR_OPEN_RIDE_TIP = 5295, + + STR_CLOSE_PARK_TIP = 5296, + STR_OPEN_PARK_TIP = 5297, + STR_CHEAT_CLEAR_LOAN_TIP = 5301, STR_CHEAT_CLEAR_LOAN = 5302, STR_CHEAT_BUILD_IN_PAUSE_MODE = 5303, diff --git a/src/object_list.c b/src/object_list.c index a7975cf8c3..941af926b7 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -509,7 +509,7 @@ void set_load_objects_fail_reason() object_create_identifier_name(string_buffer, object); gErrorType = ERROR_TYPE_FILE_LOAD; - gErrorStringId = 3165; + gErrorStringId = STR_PLACEHOLDER; return; } @@ -532,7 +532,7 @@ void set_load_objects_fail_reason() format_string(string_buffer, STR_REQUIRES_THE_FOLLOWING_ADDON_PACK, &expansionNameId); gErrorType = ERROR_TYPE_FILE_LOAD; - gErrorStringId = 3165; + gErrorStringId = STR_PLACEHOLDER; } /** diff --git a/src/sprites.h b/src/sprites.h index 8b2ae016d4..782c9c998c 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -80,6 +80,7 @@ enum { SPR_OPEN = 5180, SPR_TESTING = 5181, SPR_TOGGLE_OPEN_CLOSE = 5182, + SPR_FLOPPY = 5183, SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION = 5184, SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION = 5185, diff --git a/src/windows/cheats.c b/src/windows/cheats.c index ac01305632..aee4b37898 100644 --- a/src/windows/cheats.c +++ b/src/windows/cheats.c @@ -459,7 +459,7 @@ static void window_cheats_misc_mousedown(int widgetIndex, rct_window *w, rct_wid dropdownWidget = widget - 1; for (i = 0; i < 6; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_SUNNY + i; } window_dropdown_show_text_custom_width( @@ -856,7 +856,7 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) // Money tab if (!(w->disabled_widgets & (1 << WIDX_TAB_1))) { - sprite_idx = 5261; + sprite_idx = SPR_TAB_FINANCES_SUMMARY_0; if (w->page == WINDOW_CHEATS_PAGE_MONEY) sprite_idx += (w->frame_no / 2) % 8; gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_TAB_1].left, w->y + w->widgets[WIDX_TAB_1].top, 0); @@ -864,7 +864,7 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) // Guests tab if (!(w->disabled_widgets & (1 << WIDX_TAB_2))) { - sprite_idx = 5568; + sprite_idx = SPR_TAB_GUESTS_0; if (w->page == WINDOW_CHEATS_PAGE_GUESTS) sprite_idx += (w->frame_no / 3) % 8; gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_TAB_2].left, w->y + w->widgets[WIDX_TAB_2].top, 0); diff --git a/src/windows/dropdown.c b/src/windows/dropdown.c index d6f117f8b3..323c94958d 100644 --- a/src/windows/dropdown.c +++ b/src/windows/dropdown.c @@ -35,7 +35,7 @@ enum { }; static rct_widget window_dropdown_widgets[] = { - { WWT_IMGBTN, 0, 0, 0, 0, 0, -1, STR_NONE }, + { WWT_IMGBTN, 0, 0, 0, 0, 0, STR_NONE, STR_NONE }, { WIDGETS_END }, }; diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index 1e4f46a743..fd0fe38ddd 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -26,6 +26,7 @@ #include "../interface/themes.h" #include "../rct1.h" #include "../util/util.h" +#include "../sprites.h" #pragma region Widgets @@ -53,8 +54,8 @@ static rct_widget window_editor_inventions_list_widgets[] = { { WWT_SCROLL, 1, 4, 371, 189, 396, 2, STR_NONE }, { WWT_FLATBTN, 1, 431, 544, 106, 219, 0xFFFFFFFF, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 375, 594, 385, 396, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP }, - { WWT_DROPDOWN_BUTTON, 1, 375, 594, 372, 383, 2751, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 375, 594, 359, 370, 2750, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 375, 594, 372, 383, STR_MOVE_ALL_BOTTOM, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 375, 594, 359, 370, STR_MOVE_ALL_TOP, STR_NONE }, { WIDGETS_END } }; @@ -675,7 +676,7 @@ static void window_editor_inventions_list_scrollmouseover(rct_window *w, int scr */ static void window_editor_inventions_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) { - set_format_arg(0, uint16, 3159); + set_format_arg(0, uint16, STR_LIST); } /** @@ -740,17 +741,17 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo // Tab image x = w->x + w->widgets[WIDX_TAB_1].left; y = w->y + w->widgets[WIDX_TAB_1].top; - gfx_draw_sprite(dpi, 5327 + (w->frame_no / 2) % 8, x, y, 0); + gfx_draw_sprite(dpi, SPR_TAB_FINANCES_RESEARCH_0 + (w->frame_no / 2) % 8, x, y, 0); // Pre-researched items label x = w->x + w->widgets[WIDX_PRE_RESEARCHED_SCROLL].left; y = w->y + w->widgets[WIDX_PRE_RESEARCHED_SCROLL].top - 11; - gfx_draw_string_left(dpi, 3197, NULL, 0, x, y - 1); + gfx_draw_string_left(dpi, STR_INVENTION_PREINVENTED_ITEMS, NULL, 0, x, y - 1); // Research order label x = w->x + w->widgets[WIDX_RESEARCH_ORDER_SCROLL].left; y = w->y + w->widgets[WIDX_RESEARCH_ORDER_SCROLL].top - 11; - gfx_draw_string_left(dpi, 3198, NULL, 0, x, y - 1); + gfx_draw_string_left(dpi, STR_INVENTION_TO_BE_INVENTED_ITEMS, NULL, 0, x, y - 1); // Preview background widget = &w->widgets[WIDX_PREVIEW]; @@ -791,13 +792,13 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo y = w->y + widget->bottom + 3; width = w->width - w->widgets[WIDX_RESEARCH_ORDER_SCROLL].right - 6; stringId = research_item_get_name(eax); - gfx_draw_string_centred_clipped(dpi, 1193, &stringId, 0, x, y, width); + gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRING, &stringId, 0, x, y, width); y += 15; // Item category x = w->x + w->widgets[WIDX_RESEARCH_ORDER_SCROLL].right + 4; - stringId = 2253 + researchItem->category; - gfx_draw_string_left(dpi, 3196, &stringId, 0, x, y); + stringId = STR_RESEARCH_TRANSPORT_RIDES + researchItem->category; + gfx_draw_string_left(dpi, STR_INVENTION_RESEARCH_GROUP, &stringId, 0, x, y); } /** @@ -971,7 +972,7 @@ static void window_editor_inventions_list_drag_paint(rct_window *w, rct_drawpixe x = w->x; y = w->y + 2; stringId = research_item_get_name(_editorInventionsListDraggedItem->entryIndex & 0xFFFFFF); - gfx_draw_string_left(dpi, 1193, &stringId, 32, x, y); + gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRING, &stringId, 32, x, y); } #pragma endregion diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 064d0751e4..b51f91f7a4 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -867,7 +867,7 @@ static void window_editor_object_selection_mouseup(rct_window *w, int widgetInde break; case WIDX_FILTER_STRING_BUTTON: //window_text_input_open(w, widgetIndex, 5275, 5276, 1170, (uint32)_filter_string, 40); - window_start_textbox(w, widgetIndex, 1170, (uint32)_filter_string, 40); + window_start_textbox(w, widgetIndex, STR_STRING, (uint32)_filter_string, 40); break; case WIDX_FILTER_CLEAR_BUTTON: memset(_filter_string, 0, sizeof(_filter_string)); @@ -1355,8 +1355,8 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf RCT2_GLOBAL(0x009BC677, uint8) = 14; - stringId = 3165; - stringBuffer = (char*)language_get_string(3165) + 1; + stringId = STR_PLACEHOLDER; + stringBuffer = (char*)language_get_string(STR_PLACEHOLDER) + 1; if (gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { // Skip name do { @@ -1424,7 +1424,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf // gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14); // Draw object dat name - stringId = 3165; + stringId = STR_PLACEHOLDER; strcpy(stringBuffer, datName); gfx_draw_string_right(dpi, stringId, NULL, 0, w->x + w->width - 5, w->y + w->height - 3 - 12); } diff --git a/src/windows/editor_objective_options.c b/src/windows/editor_objective_options.c index 478d743f5d..d10894aafc 100644 --- a/src/windows/editor_objective_options.c +++ b/src/windows/editor_objective_options.c @@ -27,6 +27,7 @@ #include "../world/park.h" #include "dropdown.h" #include "error.h" +#include "../sprites.h" #pragma region Widgets @@ -294,7 +295,7 @@ static void window_editor_objective_options_draw_tab_images(rct_window *w, rct_d // Tab 1 widget = &w->widgets[WIDX_TAB_1]; - spriteIndex = 5511; + spriteIndex = SPR_TAB_OBJECTIVE_0; if (w->page == WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN) spriteIndex += (w->frame_no / 4) % 16; @@ -303,7 +304,7 @@ static void window_editor_objective_options_draw_tab_images(rct_window *w, rct_d // Tab 2 if (!(w->disabled_widgets & (1 << WIDX_TAB_2))) { widget = &w->widgets[WIDX_TAB_2]; - spriteIndex = 5442; + spriteIndex = SPR_TAB_RIDE_0; if (w->page == WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_RIDES) spriteIndex += (w->frame_no / 4) % 16; @@ -404,11 +405,11 @@ static void window_editor_objective_options_main_mouseup(rct_window *w, int widg break; case WIDX_SCENARIO_NAME: safe_strcpy((char*)0x009BC677, s6Info->name, 64); - window_text_input_open(w, WIDX_SCENARIO_NAME, STR_SCENARIO_NAME, STR_ENTER_SCENARIO_NAME, 3165, 0, 64); + window_text_input_open(w, WIDX_SCENARIO_NAME, STR_SCENARIO_NAME, STR_ENTER_SCENARIO_NAME, STR_PLACEHOLDER, 0, 64); break; case WIDX_DETAILS: safe_strcpy((char*)0x009BC677, s6Info->details, 256); - window_text_input_open(w, WIDX_DETAILS, 3315, 3316, 3165, 0, 256); + window_text_input_open(w, WIDX_DETAILS, STR_PARK_SCENARIO_DETAILS, STR_ENTER_SCENARIO_DESCRIPTION, STR_PLACEHOLDER, 0, 256); break; } } @@ -441,43 +442,43 @@ static void window_editor_objective_options_show_objective_dropdown(rct_window * numItems += 5; i = 0; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_HAVE_FUN; i++; if (!(parkFlags & PARK_FLAGS_NO_MONEY_SCENARIO)) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_NUMBER_OF_GUESTS_AT_A_GIVEN_DATE; i++; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_MONTHLY_PROFIT_FROM_FOOD_MERCHANDISE; i++; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_REPAY_LOAN_AND_ACHIEVE_A_GIVEN_PARK_VALUE; i++; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_PARK_VALUE_AT_A_GIVEN_DATE; i++; if (parkFlags & PARK_FLAGS_PARK_FREE_ENTRY) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_MONTHLY_INCOME_FROM_RIDE_TICKETS; i++; } } - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_NUMBER_OF_GUESTS_IN_PARK; i++; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_BUILD_10_ROLLER_COASTERS; i++; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_BUILD_10_ROLLER_COASTERS_OF_A_GIVEN_LENGTH; i++; - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_OBJECTIVE_DROPDOWN_FINISH_BUILDING_5_ROLLER_COASTERS; i++; @@ -508,7 +509,7 @@ static void window_editor_objective_options_show_climate_dropdown(rct_window *w) dropdownWidget = &w->widgets[WIDX_CLIMATE]; for (i = 0; i < 4; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_CLIMATE_COOL_AND_WET + i; } window_dropdown_show_text_custom_width( @@ -532,7 +533,7 @@ static void window_editor_objective_options_show_category_dropdown(rct_window *w dropdownWidget = &w->widgets[WIDX_CATEGORY]; for (i = SCENARIO_CATEGORY_BEGINNER; i <= SCENARIO_CATEGORY_OTHER; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = ScenarioCategoryStringIds[i]; } window_dropdown_show_text_custom_width( @@ -554,7 +555,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window *w) case OBJECTIVE_MONTHLY_RIDE_INCOME: case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: if (gScenarioObjectiveCurrency >= MONEY(2000000,00)) { - window_error_open(3264, STR_NONE); + window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE); } else { gScenarioObjectiveCurrency += MONEY(1000,0); window_invalidate(w); @@ -562,7 +563,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window *w) break; case OBJECTIVE_MONTHLY_FOOD_INCOME: if (gScenarioObjectiveCurrency >= MONEY(2000000,00)) { - window_error_open(3264, STR_NONE); + window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE); } else { gScenarioObjectiveCurrency += MONEY(100,0); window_invalidate(w); @@ -570,7 +571,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window *w) break; case OBJECTIVE_10_ROLLERCOASTERS_LENGTH: if (gScenarioObjectiveNumGuests >= 5000) { - window_error_open(3264, STR_NONE); + window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE); } else { gScenarioObjectiveNumGuests += 100; window_invalidate(w); @@ -578,7 +579,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window *w) break; case OBJECTIVE_FINISH_5_ROLLERCOASTERS: if (gScenarioObjectiveCurrency >= FIXED_2DP(9,90)) { - window_error_open(3264, STR_NONE); + window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE); } else { gScenarioObjectiveCurrency += FIXED_2DP(0,10); window_invalidate(w); @@ -586,7 +587,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window *w) break; default: if (gScenarioObjectiveNumGuests >= 5000) { - window_error_open(3264, STR_NONE); + window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE); } else { gScenarioObjectiveNumGuests += 50; window_invalidate(w); @@ -602,7 +603,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window *w) case OBJECTIVE_MONTHLY_RIDE_INCOME: case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: if (gScenarioObjectiveCurrency <= MONEY(1000,00)) { - window_error_open(3265, STR_NONE); + window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE); } else { gScenarioObjectiveCurrency -= MONEY(1000,0); window_invalidate(w); @@ -610,7 +611,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window *w) break; case OBJECTIVE_MONTHLY_FOOD_INCOME: if (gScenarioObjectiveCurrency <= MONEY(1000,00)) { - window_error_open(3265, STR_NONE); + window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE); } else { gScenarioObjectiveCurrency -= MONEY(100,0); window_invalidate(w); @@ -618,7 +619,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window *w) break; case OBJECTIVE_10_ROLLERCOASTERS_LENGTH: if (gScenarioObjectiveNumGuests <= 1000) { - window_error_open(3265, STR_NONE); + window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE); } else { gScenarioObjectiveNumGuests -= 100; window_invalidate(w); @@ -626,7 +627,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window *w) break; case OBJECTIVE_FINISH_5_ROLLERCOASTERS: if (gScenarioObjectiveCurrency <= FIXED_2DP(4,00)) { - window_error_open(3265, STR_NONE); + window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE); } else { gScenarioObjectiveCurrency -= FIXED_2DP(0,10); window_invalidate(w); @@ -634,7 +635,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window *w) break; default: if (gScenarioObjectiveNumGuests <= 250) { - window_error_open(3265, STR_NONE); + window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE); } else { gScenarioObjectiveNumGuests -= 50; window_invalidate(w); @@ -646,7 +647,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window *w) static void window_editor_objective_options_arg_2_increase(rct_window *w) { if (gScenarioObjectiveYear >= 25) { - window_error_open(3264, STR_NONE); + window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE); } else { gScenarioObjectiveYear++; window_invalidate(w); @@ -656,7 +657,7 @@ static void window_editor_objective_options_arg_2_increase(rct_window *w) static void window_editor_objective_options_arg_2_decrease(rct_window *w) { if (gScenarioObjectiveYear <= 1) { - window_error_open(3265, STR_NONE); + window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE); } else { gScenarioObjectiveYear--; window_invalidate(w); @@ -891,13 +892,13 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi // Objective label x = w->x + 8; y = w->y + w->widgets[WIDX_OBJECTIVE].top; - gfx_draw_string_left(dpi, 3287, NULL, 0, x, y); + gfx_draw_string_left(dpi, STR_OBJECTIVE_WINDOW, NULL, 0, x, y); // Objective value x = w->x + w->widgets[WIDX_OBJECTIVE].left + 1; y = w->y + w->widgets[WIDX_OBJECTIVE].top; stringId = STR_OBJECTIVE_DROPDOWN_NONE + gScenarioObjectiveType; - gfx_draw_string_left(dpi, 1193, &stringId, 0, x, y); + gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRING, &stringId, 0, x, y); if (w->widgets[WIDX_OBJECTIVE_ARG_1].type != WWT_EMPTY) { // Objective argument 1 label @@ -1001,7 +1002,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi set_format_arg(0, uint16, stex->scenario_name); } else { safe_strcpy((char*)0x009BC677, s6Info->name, 64); - set_format_arg(0, uint16, 3165); + set_format_arg(0, uint16, STR_PLACEHOLDER); } set_format_arg(2, uint32, gParkNameArgs); gfx_draw_string_left_clipped(dpi, 3300, gCommonFormatArgs, 0, x, y, width); @@ -1020,7 +1021,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi set_format_arg(0, uint16, stex->details); } else { safe_strcpy((char*)0x009BC677, s6Info->details, 256); - set_format_arg(0, uint16, 3165); + 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); diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c index cde92e1877..11d925aee6 100644 --- a/src/windows/loadsave.c +++ b/src/windows/loadsave.c @@ -282,7 +282,7 @@ static void window_loadsave_mouseup(rct_window *w, int widgetIndex) } case WIDX_NEW: { - rct_string_id templateStringId = 3165; + rct_string_id templateStringId = STR_PLACEHOLDER; char *templateString; templateString = (char *)language_get_string(templateStringId); @@ -524,7 +524,7 @@ static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi) static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) { int i, y; - rct_string_id stringId, templateStringId = 3165; + rct_string_id stringId, templateStringId = STR_PLACEHOLDER; char *templateString; gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light); @@ -931,7 +931,7 @@ static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); - rct_string_id templateStringId = 3165; + rct_string_id templateStringId = STR_PLACEHOLDER; char *templateString; templateString = (char*)language_get_string(templateStringId); diff --git a/src/windows/map.c b/src/windows/map.c index 27748edf1d..d832159120 100644 --- a/src/windows/map.c +++ b/src/windows/map.c @@ -68,7 +68,7 @@ enum WINDOW_MAP_WIDGET_IDX { static rct_widget window_map_widgets[] = { { WWT_FRAME, 0, 0, 244, 0, 258, STR_NONE, STR_NONE }, - { WWT_CAPTION, 0, 1, 243, 1, 14, STR_MAP, STR_WINDOW_TITLE_TIP }, + { WWT_CAPTION, 0, 1, 243, 1, 14, STR_MAP_LABEL, STR_WINDOW_TITLE_TIP }, { WWT_CLOSEBOX, 0, 232, 242, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, { WWT_RESIZE, 1, 0, 244, 43, 257, STR_NONE, STR_NONE }, { WWT_COLOURBTN, 1, 3, 33, 17, 43, 0x02000144E, STR_SHOW_PEOPLE_ON_MAP_TIP }, @@ -639,7 +639,7 @@ static void window_map_textinput(rct_window *w, int widgetIndex, char *text) */ static void window_map_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId) { - set_format_arg(0, short, 3157); + set_format_arg(0, short, STR_MAP); } /** @@ -934,14 +934,14 @@ static void window_map_inputsize_land(rct_window *w) { TextInputDescriptionArgs[0] = MINIMUM_TOOL_SIZE; TextInputDescriptionArgs[1] = MAXIMUM_TOOL_SIZE; - window_text_input_open(w, WIDX_LAND_TOOL, 5128, 5129, STR_NONE, STR_NONE, 3); + window_text_input_open(w, WIDX_LAND_TOOL, STR_SELECTION_SIZE, STR_ENTER_SELECTION_SIZE, STR_NONE, STR_NONE, 3); } static void window_map_inputsize_map(rct_window *w) { TextInputDescriptionArgs[0] = MINIMUM_MAP_SIZE_PRACTICAL; TextInputDescriptionArgs[1] = MAXIMUM_MAP_SIZE_PRACTICAL; - window_text_input_open(w, WIDX_MAP_SIZE_SPINNER, 5130, 5131, STR_NONE, STR_NONE, 4); + window_text_input_open(w, WIDX_MAP_SIZE_SPINNER, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, STR_NONE, STR_NONE, 4); } static void window_map_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi) diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c index ee22447475..a92181b6ec 100644 --- a/src/windows/mapgen.c +++ b/src/windows/mapgen.c @@ -487,17 +487,17 @@ static void window_mapgen_base_mouseup(rct_window *w, int widgetIndex) TextInputDescriptionArgs[0] = MINIMUM_MAP_SIZE_PRACTICAL; TextInputDescriptionArgs[1] = MAXIMUM_MAP_SIZE_PRACTICAL; // Practical map size is 2 lower than the technical map size - window_text_input_open(w, WIDX_MAP_SIZE, 5130, 5131, 5182, _mapSize - 2, 4); + window_text_input_open(w, WIDX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, 5182, _mapSize - 2, 4); break; case WIDX_BASE_HEIGHT: TextInputDescriptionArgs[0] = (BASESIZE_MIN - 12) / 2; TextInputDescriptionArgs[1] = (BASESIZE_MAX - 12) / 2; - window_text_input_open(w, WIDX_BASE_HEIGHT, 5183, 5184, 5182, (_baseHeight - 12) / 2, 3); + window_text_input_open(w, WIDX_BASE_HEIGHT, STR_BASE_HEIGHT, STR_ENTER_BASE_HEIGHT, 5182, (_baseHeight - 12) / 2, 3); break; case WIDX_WATER_LEVEL: TextInputDescriptionArgs[0] = (WATERLEVEL_MIN - 12) / 2; TextInputDescriptionArgs[1] = (WATERLEVEL_MAX - 12) / 2; - window_text_input_open(w, WIDX_WATER_LEVEL, 5185, 5186, 5182, (_waterLevel - 12) / 2, 3); + window_text_input_open(w, WIDX_WATER_LEVEL, STR_WATER_LEVEL, STR_ENTER_WATER_LEVEL, 5182, (_waterLevel - 12) / 2, 3); break; } } @@ -675,9 +675,9 @@ static void window_mapgen_base_paint(rct_window *w, rct_drawpixelinfo *dpi) window_mapgen_draw_tab_images(dpi, w); gfx_draw_string_left(dpi, STR_MAP_SIZE, 0, 0, w->x + 4, w->y + w->widgets[WIDX_MAP_SIZE].top + 1); - gfx_draw_string_left(dpi, 2691, 0, 0, w->x + 4, w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1); - gfx_draw_string_left(dpi, 2692, 0, 0, w->x + 4, w->y + w->widgets[WIDX_WATER_LEVEL].top + 1); - gfx_draw_string_left(dpi, 2693, 0, 0, w->x + 4, w->y + w->widgets[WIDX_FLOOR_TEXTURE].top + 1); + gfx_draw_string_left(dpi, STR_BASE_HEIGHT_LABEL, 0, 0, w->x + 4, w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1); + gfx_draw_string_left(dpi, STR_WATER_LEVEL_LABEL, 0, 0, w->x + 4, w->y + w->widgets[WIDX_WATER_LEVEL].top + 1); + gfx_draw_string_left(dpi, STR_TERRAIN_LABEL, 0, 0, w->x + 4, w->y + w->widgets[WIDX_FLOOR_TEXTURE].top + 1); // The practical map size is 2 lower than the technical map size uint16 mapSizeArgs[2] = { _mapSize - 2, _mapSize -2 }; @@ -791,7 +791,7 @@ static void window_mapgen_simplex_mouseup(rct_window *w, int widgetIndex) TextInputDescriptionArgs[0] = MINIMUM_MAP_SIZE_PRACTICAL; TextInputDescriptionArgs[1] = MAXIMUM_MAP_SIZE_PRACTICAL; // Practical map size is 2 lower than the technical map size - window_text_input_open(w, WIDX_SIMPLEX_MAP_SIZE, 5130, 5131, 5182, _mapSize - 2, 4); + window_text_input_open(w, WIDX_SIMPLEX_MAP_SIZE, STR_MAP_SIZE_2, STR_ENTER_MAP_SIZE, 5182, _mapSize - 2, 4); break; case WIDX_GENERATE: mapgenSettings.mapSize = _mapSize; diff --git a/src/windows/park.c b/src/windows/park.c index 96ed6b8dc4..c251dab4c5 100644 --- a/src/windows/park.c +++ b/src/windows/park.c @@ -1745,7 +1745,7 @@ static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi) x = w->x + window_park_objective_widgets[WIDX_PAGE_BACKGROUND].left + 4; y = w->y + window_park_objective_widgets[WIDX_PAGE_BACKGROUND].top + 7; safe_strcpy((char*)0x009BC677, gScenarioDetails, 256); - set_format_arg(0, short, 3165); + set_format_arg(0, short, STR_PLACEHOLDER); y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, 1191, 0); y += 5; diff --git a/src/windows/ride.c b/src/windows/ride.c index 05d6704f6a..719d3078e5 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -202,16 +202,16 @@ static rct_widget window_ride_main_widgets[] = { { WWT_VIEWPORT, 1, 3, 290, 60, 166, 0x0FFFFFFFE, STR_NONE }, { WWT_DROPDOWN, 1, 35, 256, 46, 57, 0x0FFFFFFFF, STR_VIEW_SELECTION }, - { WWT_DROPDOWN_BUTTON, 1, 245, 255, 47, 56, 876, STR_VIEW_SELECTION }, + { WWT_DROPDOWN_BUTTON, 1, 245, 255, 47, 56, STR_DROPDOWN_GLYPH, STR_VIEW_SELECTION }, { WWT_12, 1, 3, 290, 167, 177, 0x0FFFFFFFF, STR_NONE }, { WWT_FLATBTN, 1, 291, 314, 46, 69, 0x0FFFFFFFF, STR_OPEN_CLOSE_OR_TEST_RIDE }, { WWT_FLATBTN, 1, 291, 314, 70, 93, SPR_CONSTRUCTION, STR_CONSTRUCTION }, { WWT_FLATBTN, 1, 291, 314, 94, 117, SPR_RENAME, STR_NAME_RIDE_TIP }, { WWT_FLATBTN, 1, 291, 314, 118, 141, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, { WWT_FLATBTN, 1, 291, 314, 142, 165, SPR_DEMOLISH, STR_DEMOLISH_RIDE_TIP }, - { WWT_IMGBTN, 1, 296, 309, 48, 61, SPR_G2_RCT1_CLOSE_BUTTON_0, 5293 }, - { WWT_IMGBTN, 1, 296, 309, 62, 75, SPR_G2_RCT1_TEST_BUTTON_0, 5294 }, - { WWT_IMGBTN, 1, 296, 309, 76, 89, SPR_G2_RCT1_OPEN_BUTTON_0, 5295 }, + { WWT_IMGBTN, 1, 296, 309, 48, 61, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_RIDE_TIP }, + { WWT_IMGBTN, 1, 296, 309, 62, 75, SPR_G2_RCT1_TEST_BUTTON_0, STR_TEST_RIDE_TIP }, + { WWT_IMGBTN, 1, 296, 309, 76, 89, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_RIDE_TIP }, { WIDGETS_END }, }; @@ -233,12 +233,12 @@ static rct_widget window_ride_vehicle_widgets[] = { { WWT_TAB, 1, 282, 312, 17, 43, 0x2000144E, STR_CUSTOMER_INFORMATION_TIP }, { WWT_DROPDOWN, 1, 7, 308, 50, 61, 0xFFFFFFFF, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 297, 307, 51, 60, 876, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 297, 307, 51, 60, STR_DROPDOWN_GLYPH, STR_NONE }, { WWT_SCROLL, 1, 7, 308, 141, 183, 0, STR_NONE }, { WWT_SPINNER, 1, 7, 151, 190, 201, 1021, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 140, 150, 191, 195, STR_NUMERIC_UP, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 140, 150, 196, 200, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_SPINNER, 1, 164, 308, 190, 201, STR_1_CAR_PER_TRAIN, STR_NONE }, + { WWT_SPINNER, 1, 164, 308, 190, 201, STR_1_CAR_PER_TRAIN, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 297, 307, 191, 195, STR_NUMERIC_UP, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 297, 307, 196, 200, STR_NUMERIC_DOWN, STR_NONE }, { WIDGETS_END }, @@ -279,11 +279,11 @@ static rct_widget window_ride_operating_widgets[] = { { WWT_DROPDOWN_BUTTON, 1, 297, 307, 160, 164, STR_NUMERIC_DOWN, STR_NONE }, { WWT_CHECKBOX, 1, 7, 308, 169, 180, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP }, { WWT_24, 1, 7, 149, 61, 72, 0xFFFFFFFF, STR_NONE }, - { WWT_24, 1, 7, 149, 75, 86, 3095, STR_NONE }, + { WWT_24, 1, 7, 149, 75, 86, STR_LIFT_HILL_CHAIN_SPEED, STR_NONE }, { WWT_DROPDOWN, 1, 7, 308, 47, 58, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE }, - { WWT_DROPDOWN_BUTTON, 1, 297, 307, 48, 57, 876, STR_SELECT_OPERATING_MODE }, + { WWT_DROPDOWN_BUTTON, 1, 297, 307, 48, 57, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE }, { WWT_DROPDOWN, 1, 87, 308, 109, 120, 0xFFFFFFFF, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 297, 307, 110, 119, 876, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, 297, 307, 110, 119, STR_DROPDOWN_GLYPH, STR_NONE }, { WWT_24, 1, 7, 149, 89, 100, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP }, { WWT_SPINNER, 1, 157, 308, 89, 100, 1957, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 297, 307, 90, 94, STR_NUMERIC_UP, STR_SELECT_NUMBER_OF_CIRCUITS_TIP }, @@ -309,9 +309,9 @@ static rct_widget window_ride_maintenance_widgets[] = { { WWT_TAB, 1, 282, 312, 17, 43, 0x2000144E, STR_CUSTOMER_INFORMATION_TIP }, { WWT_DROPDOWN, 1, 107, 308, 71, 82, 0, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE }, - { WWT_DROPDOWN_BUTTON, 1, 297, 307, 72, 81, 876, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE }, + { WWT_DROPDOWN_BUTTON, 1, 297, 307, 72, 81, STR_DROPDOWN_GLYPH, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE }, { WWT_FLATBTN, 1, 289, 312, 108, 131, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP }, - { WWT_FLATBTN, 1, 265, 288, 108, 131, SPR_NO_ENTRY, 5292 }, + { WWT_FLATBTN, 1, 265, 288, 108, 131, SPR_NO_ENTRY, STR_DEBUG_FORCE_BREAKDOWN_TIP }, { WIDGETS_END }, }; @@ -334,21 +334,21 @@ static rct_widget window_ride_colour_widgets[] = { { WWT_SPINNER, 1, 3, 70, 47, 93, 0xFFFFFFFF, STR_NONE }, { WWT_DROPDOWN, 1, 74, 312, 49, 60, 872, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 301, 311, 50, 59, 876, STR_COLOUR_SCHEME_TO_CHANGE_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 301, 311, 50, 59, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP }, { WWT_COLOURBTN, 1, 79, 90, 74, 85, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP }, { WWT_COLOURBTN, 1, 99, 110, 74, 85, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP }, { WWT_COLOURBTN, 1, 119, 130, 74, 85, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP }, { WWT_DROPDOWN, 1, 74, 312, 49, 60, 0xFFFFFFFF, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 301, 311, 50, 59, 876, STR_NONE }, - { WWT_FLATBTN, 1, 289, 312, 68, 91, 5173, STR_PAINT_INDIVIDUAL_AREA_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 301, 311, 50, 59, STR_DROPDOWN_GLYPH, STR_NONE }, + { WWT_FLATBTN, 1, 289, 312, 68, 91, SPR_PAINTBRUSH, STR_PAINT_INDIVIDUAL_AREA_TIP }, { WWT_SPINNER, 1, 245, 312, 101, 147, 0xFFFFFFFF, STR_NONE }, { WWT_DROPDOWN, 1, 3, 241, 103, 114, 0, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 230, 240, 104, 113, 876, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 230, 240, 104, 113, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP }, { WWT_SCROLL, 1, 3, 70, 157, 203, 0, STR_NONE }, { WWT_DROPDOWN, 1, 74, 312, 157, 168, 868, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 301, 311, 158, 167, 876, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 301, 311, 158, 167, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP }, { WWT_DROPDOWN, 1, 74, 312, 173, 184, 0xFFFFFFFF, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 301, 311, 174, 183, 876, STR_SELECT_VEHICLE_TO_MODIFY_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 301, 311, 174, 183, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_TO_MODIFY_TIP }, { WWT_COLOURBTN, 1, 79, 90, 190, 201, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP }, { WWT_COLOURBTN, 1, 99, 110, 190, 201, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP }, { WWT_COLOURBTN, 1, 119, 130, 190, 201, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP }, @@ -374,7 +374,7 @@ static rct_widget window_ride_music_widgets[] = { { WWT_CHECKBOX, 1, 7, 308, 47, 58, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP }, { WWT_DROPDOWN, 1, 7, 308, 62, 73, 0, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, 297, 307, 63, 72, 876, STR_SELECT_MUSIC_STYLE_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 297, 307, 63, 72, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP }, { WIDGETS_END }, }; @@ -395,7 +395,7 @@ static rct_widget window_ride_measurements_widgets[] = { { WWT_TAB, 1, 251, 281, 17, 43, 0x2000144E, STR_INCOME_AND_COSTS_TIP }, { WWT_TAB, 1, 282, 312, 17, 43, 0x2000144E, STR_CUSTOMER_INFORMATION_TIP }, - { WWT_FLATBTN, 1, 288, 311, 164, 187, 5183, STR_SAVE_TRACK_DESIGN }, + { WWT_FLATBTN, 1, 288, 311, 164, 187, SPR_FLOPPY, STR_SAVE_TRACK_DESIGN }, { WWT_DROPDOWN_BUTTON, 1, 4, 157, 128, 139, STR_SELECT_NEARBY_SCENERY, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 158, 311, 128, 139, STR_RESET_SELECTION, STR_NONE }, { WWT_DROPDOWN_BUTTON, 1, 4, 157, 178, 189, STR_DESIGN_SAVE, STR_NONE }, @@ -421,10 +421,10 @@ static rct_widget window_ride_graphs_widgets[] = { { WWT_TAB, 1, 282, 312, 17, 43, 0x2000144E, STR_CUSTOMER_INFORMATION_TIP }, { WWT_SCROLL, 1, 3, 308, 46, 157, 1, STR_LOGGING_DATA_FROM_TIP }, - { WWT_DROPDOWN_BUTTON, 1, 3, 75, 163, 176, 1415, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP }, - { WWT_DROPDOWN_BUTTON, 1, 76, 148, 163, 176, 1416, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP }, - { WWT_DROPDOWN_BUTTON, 1, 149, 221, 163, 176, 1417, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP }, - { WWT_DROPDOWN_BUTTON, 1, 222, 294, 163, 176, 1418, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 3, 75, 163, 176, STR_RIDE_STATS_VELOCITY, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 76, 148, 163, 176, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 149, 221, 163, 176, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP }, + { WWT_DROPDOWN_BUTTON, 1, 222, 294, 163, 176, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP }, { WIDGETS_END }, }; @@ -993,17 +993,17 @@ static void window_ride_draw_tab_main(rct_drawpixelinfo *dpi, rct_window *w) switch (gRideClassifications[rideType]) { case RIDE_CLASS_RIDE: - spriteIndex = 5442; + spriteIndex = SPR_TAB_RIDE_0; if (w->page == WINDOW_RIDE_PAGE_MAIN) spriteIndex += (w->frame_no / 4) % 16; break; case RIDE_CLASS_SHOP_OR_STALL: - spriteIndex = 5351; + spriteIndex = SPR_TAB_SHOPS_AND_STALLS_0; if (w->page == WINDOW_RIDE_PAGE_MAIN) spriteIndex += (w->frame_no / 4) % 16; break; case RIDE_CLASS_KIOSK_OR_FACILITY: - spriteIndex = 5367; + spriteIndex = SPR_TAB_KIOSKS_AND_FACILITIES_0; if (w->page == WINDOW_RIDE_PAGE_MAIN) spriteIndex += (w->frame_no / 4) % 8; break; @@ -1112,7 +1112,7 @@ static void window_ride_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w) window_ride_draw_tab_vehicle(dpi, w); window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_OPERATING, 5201); window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_MAINTENANCE, 5205); - window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_INCOME, 5253); + window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_INCOME, SPR_TAB_ADMISSION_0); window_ride_draw_tab_main(dpi, w); window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_MEASUREMENTS, 5229); window_ride_draw_tab_image(dpi, w, WINDOW_RIDE_PAGE_COLOUR, 5221); @@ -1800,14 +1800,14 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) ); // First item - gDropdownItemsFormat[0] = 1142; + gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[0] = STR_OVERALL_VIEW; currentItem = 1; // Vehicles name = RideNameConvention[ride->type].vehicle_name + 6; for (i = 1; i <= ride->num_vehicles; i++) { - gDropdownItemsFormat[currentItem] = 1142; + gDropdownItemsFormat[currentItem] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[currentItem] = name | (currentItem << 16); currentItem++; } @@ -1815,7 +1815,7 @@ static void window_ride_show_view_dropdown(rct_window *w, rct_widget *widget) // Stations name = RideNameConvention[ride->type].station_name + 6; for (i = 1; i <= ride->num_stations; i++) { - gDropdownItemsFormat[currentItem] = 1142; + gDropdownItemsFormat[currentItem] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[currentItem] = name | (i << 16); currentItem++; } @@ -1845,17 +1845,17 @@ static void window_ride_show_open_dropdown(rct_window *w, rct_widget *widget) ride = get_ride(w->number); numItems = 0; - gDropdownItemsFormat[numItems] = 1142; + gDropdownItemsFormat[numItems] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[numItems] = STR_CLOSE_RIDE; numItems++; if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_NO_TEST_MODE)) { - gDropdownItemsFormat[numItems] = 1142; + gDropdownItemsFormat[numItems] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[numItems] = STR_TEST_RIDE; numItems++; } - gDropdownItemsFormat[numItems] = 1142; + gDropdownItemsFormat[numItems] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[numItems] = STR_OPEN_RIDE; numItems++; @@ -2180,7 +2180,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window *w, void *argumen trackType == TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT) { if (track_type_is_invented(ride->type, TRACK_BLOCK_BRAKES) && vehicle->velocity == 0) { RCT2_GLOBAL((int)arguments + 0, uint16) = STR_STOPPED_BY_BLOCK_BRAKES; - return 1191; + return STR_BLACK_STRING; } } } @@ -2193,7 +2193,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window *w, void *argumen if (ride->type == RIDE_TYPE_MINI_GOLF) return 0; - if ((RideData4[ride->type].flags & RIDE_TYPE_FLAG4_SINGLE_SESSION) && stringId <= 1104) + if ((RideData4[ride->type].flags & RIDE_TYPE_FLAG4_SINGLE_SESSION) && stringId <= STR_UNLOADING_PASSENGERS_AT) stringId += 23; RCT2_GLOBAL((int)arguments + 4, uint16) = RideNameConvention[ride->type].station_name; @@ -2202,7 +2202,7 @@ static rct_string_id window_ride_get_status_vehicle(rct_window *w, void *argumen RCT2_GLOBAL((int)arguments + 4, uint16) += 6; RCT2_GLOBAL((int)arguments + 0, uint16) = stringId; - return stringId != 1106 && stringId != 1107 ? 1191 : 1192; + return stringId != STR_CRASHING && stringId != STR_CRASHED_0 ? STR_BLACK_STRING : STR_LOSS; } /** @@ -2250,7 +2250,7 @@ static rct_string_id window_ride_get_status_station(rct_window *w, void *argumen } RCT2_GLOBAL((int)arguments + 0, uint16) = stringId; - return 1191; + return STR_BLACK_STRING; } /** @@ -2307,7 +2307,7 @@ static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi) widget = &window_ride_main_widgets[WIDX_VIEW]; gfx_draw_string_centred( dpi, - 1193, + STR_WINDOW_COLOUR_2_STRING, w->x + (widget->left + widget->right - 11) / 2, w->y + widget->top, 0, @@ -2425,7 +2425,7 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi if (ride->subtype == rideEntryIndex) selectedIndex = numItems; - gDropdownItemsFormat[numItems] = 1142; + gDropdownItemsFormat[numItems] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[numItems] = (rideEntryIndex << 16) | currentRideEntry->name; numItems++; @@ -2604,33 +2604,33 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi) y = w->y + 64; // Description - y += gfx_draw_string_left_wrapped(dpi, &rideEntry->description, x, y, 300, 1191, 0); + y += gfx_draw_string_left_wrapped(dpi, &rideEntry->description, x, y, 300, STR_BLACK_STRING, 0); y += 5; // Capacity stringId = rideEntry->description + 1; - gfx_draw_string_left(dpi, 3142, &stringId, 0, x, y); + gfx_draw_string_left(dpi, STR_CAPACITY, &stringId, 0, x, y); y += 15; if ((!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE) || rideTypeShouldLoseSeparateFlag(rideEntry)) && var_496(w) > 1) { // Excitement Factor factor = rideEntry->excitement_multipler; if (factor > 0) { - gfx_draw_string_left(dpi, 3125, &factor, 0, x, y); + gfx_draw_string_left(dpi, STR_EXCITEMENT_FACTOR, &factor, 0, x, y); y += 10; } // Intensity Factor factor = rideEntry->intensity_multipler; if (factor > 0) { - gfx_draw_string_left(dpi, 3126, &factor, 0, x, y); + gfx_draw_string_left(dpi, STR_INTENSITY_FACTOR, &factor, 0, x, y); y += 10; } // Nausea Factor factor = rideEntry->nausea_multipler; if (factor > 0) { - gfx_draw_string_left(dpi, 3127, &factor, 0, x, y); + gfx_draw_string_left(dpi, STR_NAUSEA_FACTOR, &factor, 0, x, y); y += 10; } } @@ -2745,25 +2745,25 @@ static void window_ride_mode_tweak_set(rct_window *w, uint8 value) { rct_ride *ride = get_ride(w->number); - gGameCommandErrorTitle = 1362; + gGameCommandErrorTitle = STR_CANT_CHANGE_LAUNCH_SPEED; if (ride->mode == RIDE_MODE_STATION_TO_STATION) - gGameCommandErrorTitle = 1361; + gGameCommandErrorTitle = STR_CANT_CHANGE_SPEED; if (ride->mode == RIDE_MODE_RACE) - gGameCommandErrorTitle = 1738; + gGameCommandErrorTitle = STR_CANT_CHANGE_NUMBER_OF_LAPS; if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_13)) - gGameCommandErrorTitle = 1746; + gGameCommandErrorTitle = STR_CANT_CHANGE_THIS; if (ride->mode == RIDE_MODE_BUMPERCAR) - gGameCommandErrorTitle = 1751; + gGameCommandErrorTitle = STR_CANT_CHANGE_TIME_LIMIT; if (ride->mode == RIDE_MODE_SWING) - gGameCommandErrorTitle = 1768; + gGameCommandErrorTitle = STR_CANT_CHANGE_NUMBER_OF_SWINGS; if (ride->mode == RIDE_MODE_ROTATION) - gGameCommandErrorTitle = 1868; + gGameCommandErrorTitle = STR_CANT_CHANGE_NUMBER_OF_ROTATIONS; if ( ride->mode == RIDE_MODE_ROTATION || ride->mode == RIDE_MODE_FORWARD_ROTATION || ride->mode == RIDE_MODE_BACKWARD_ROTATION ) - gGameCommandErrorTitle = 1868; + gGameCommandErrorTitle = STR_CANT_CHANGE_NUMBER_OF_ROTATIONS; set_operating_setting(w->number, RIDE_SETTING_OPERATION_OPTION, value); } @@ -2850,7 +2850,7 @@ static void window_ride_mode_dropdown(rct_window *w, rct_widget *widget) // Create dropdown list for (i = 0; i < numAvailableModes; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_RIDE_MODE_START + availableModes[i]; } window_dropdown_show_text_custom_width( @@ -2884,7 +2884,7 @@ static void window_ride_load_dropdown(rct_window *w, rct_widget *widget) rct_ride *ride = get_ride(w->number); for (i = 0; i < 5; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_QUARTER_LOAD + i; } window_dropdown_show_text_custom_width( @@ -3118,7 +3118,7 @@ static void window_ride_operating_invalidate(rct_window *w) ) { window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].type = WWT_CHECKBOX; window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].tooltip = STR_LEAVE_IF_ANOTHER_VEHICLE_ARRIVES_TIP; - window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].image = RideNameConvention[ride->type].vehicle_name == 1236 ? + window_ride_operating_widgets[WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX].image = RideNameConvention[ride->type].vehicle_name == STR_VEHICLE_LOWERCASE_BOAT ? STR_LEAVE_IF_ANOTHER_BOAT_ARRIVES : STR_LEAVE_IF_ANOTHER_TRAIN_ARRIVES; } else { @@ -3154,9 +3154,9 @@ static void window_ride_operating_invalidate(rct_window *w) window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WWT_DROPDOWN_BUTTON; window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WWT_DROPDOWN_BUTTON; - set_format_arg(10, uint16, 1217); + set_format_arg(10, uint16, STR_FORMAT_SECONDS); set_format_arg(12, uint16, ride->min_waiting_time); - set_format_arg(14, uint16, 1217); + set_format_arg(14, uint16, STR_FORMAT_SECONDS); set_format_arg(16, uint16, ride->max_waiting_time); if (ride->depart_flags & RIDE_DEPART_WAIT_FOR_LOAD) @@ -3402,7 +3402,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc case WIDX_INSPECTION_INTERVAL_DROPDOWN: dropdownWidget--; for (i = 0; i < 7; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_EVERY_10_MINUTES + i; } window_dropdown_show_text_custom_width( @@ -3424,7 +3424,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc if (ride_type->ride_type[j] != 0xFF) break; } - gDropdownItemsFormat[0] = 1142; + gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[0] = STR_DEBUG_FIX_RIDE; for (i = 0; i < 8; i++) { if (RideAvailableBreakdowns[ride_type->ride_type[j]] & (uint8)(1 << i)) { @@ -3432,7 +3432,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc if (ride->num_vehicles != 1) continue; } - gDropdownItemsFormat[num_items] = 1142; + gDropdownItemsFormat[num_items] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[num_items] = STR_SAFETY_CUT_OUT + i; num_items++; } @@ -3463,7 +3463,7 @@ static void window_ride_maintenance_mousedown(int widgetIndex, rct_window *w, rc dropdown_set_checked(num_items, true); break; } - gDropdownItemsFormat[num_items] = 1142; + gDropdownItemsFormat[num_items] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[num_items] = STR_SAFETY_CUT_OUT + i; num_items++; } @@ -3537,10 +3537,10 @@ static void window_ride_maintenance_dropdown(rct_window *w, int widgetIndex, int break; } if (ride->lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED)) { - window_error_open(5291, 5287); + window_error_open(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_ALREADY_BROKEN); } else if (ride->status == RIDE_STATUS_CLOSED) { - window_error_open(5291, 5288); + window_error_open(STR_DEBUG_CANT_FORCE_BREAKDOWN, STR_DEBUG_RIDE_IS_CLOSED); } else { num_items = 1; @@ -3863,7 +3863,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid switch (widgetIndex) { case WIDX_TRACK_COLOUR_SCHEME_DROPDOWN: for (i = 0; i < 4; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_MAIN_COLOUR_SCHEME + i; } @@ -3890,7 +3890,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid break; case WIDX_MAZE_STYLE_DROPDOWN: for (i = 0; i < 4; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_BRICK_WALLS + i; } @@ -3909,7 +3909,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid case WIDX_ENTRANCE_STYLE_DROPDOWN: gDropdownItemsChecked = 0; for (i = 0; i < countof(window_ride_entrance_style_list); i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = RideEntranceDefinitions[window_ride_entrance_style_list[i]].string_id; if (ride->entrance_style == window_ride_entrance_style_list[i]) { @@ -3932,7 +3932,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid break; case WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN: for (i = 0; i < 3; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = (RideNameConvention[ride->type].vehicle_name << 16) | (STR_ALL_VEHICLES_IN_SAME_COLOURS + i); } @@ -3955,7 +3955,7 @@ static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_wid stringId = (ride->colour_scheme_type & 3) == VEHICLE_COLOUR_SCHEME_PER_TRAIN ? 1135 : 1133; for (i = 0; i < 32; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = ((sint64)(i + 1) << 32) | ((RideNameConvention[ride->type].vehicle_name + 2) << 16) | stringId; } @@ -4499,7 +4499,7 @@ static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widg } for (i = 0; i < numItems; i++) { - gDropdownItemsFormat[i] = 1142; + gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL; gDropdownItemsArgs[i] = STR_MUSIC_STYLE_START + window_ride_current_music_style_order[i]; } @@ -5223,7 +5223,7 @@ static void window_ride_graphs_tooltip(rct_window* w, int widgetIndex, rct_strin rct_string_id message; if (widgetIndex == WIDX_GRAPH) { - set_format_arg(0, uint16, 3158); + set_format_arg(0, uint16, STR_GRAPH); measurement = ride_get_measurement(w->number, &message); if (measurement != NULL && (measurement->flags & RIDE_MEASUREMENT_FLAG_RUNNING)) { set_format_arg(4, uint16, measurement->vehicle_index + 1); @@ -5383,7 +5383,7 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi time = 0; for (x = 0; x < dpi->x + dpi->width; x += 80) { if (x + 80 >= dpi->x) - gfx_draw_string_left(dpi, 1414, &time, 0, x + 2, 1); + gfx_draw_string_left(dpi, STR_RIDE_STATS_TIME, &time, 0, x + 2, 1); time += 5; } diff --git a/src/windows/title_editor.c b/src/windows/title_editor.c index ef8e2f51e9..36f3ea3797 100644 --- a/src/windows/title_editor.c +++ b/src/windows/title_editor.c @@ -199,7 +199,7 @@ static int window_title_editor_tab_animation_divisor[] = { }; static int window_title_editor_tab_sprites[] = { SPR_TAB_RIDE_0, - 5183, + SPR_FLOPPY, SPR_TAB_STATS_0 }; diff --git a/src/windows/title_scenarioselect.c b/src/windows/title_scenarioselect.c index cb73374c08..3637f78dd7 100644 --- a/src/windows/title_scenarioselect.c +++ b/src/windows/title_scenarioselect.c @@ -406,13 +406,13 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4; y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5; safe_strcpy((char*)0x009BC677, scenario->name, 64); - set_format_arg(0, short, 3165); // empty string + set_format_arg(0, short, STR_PLACEHOLDER); // empty string gfx_draw_string_centred_clipped(dpi, 1193, gCommonFormatArgs, 0, x + 85, y, 170); y += 15; // Scenario details safe_strcpy((char*)0x009BC677, scenario->details, 256); - set_format_arg(0, short, 3165); // empty string + set_format_arg(0, short, STR_PLACEHOLDER); // empty string y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, 1191, 0) + 5; // Scenario objective @@ -429,7 +429,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) completedByName = scenario->highscore->name; } safe_strcpy((char*)0x009BC677, completedByName, 64); - set_format_arg(0, short, 3165); // empty string + set_format_arg(0, short, STR_PLACEHOLDER); // empty string set_format_arg(2, int, scenario->highscore->company_value); y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_COMPLETED_BY_WITH_COMPANY_VALUE, 0); } @@ -473,7 +473,7 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo * bool isDisabled = listItem->scenario.is_locked; // Draw scenario name - rct_string_id placeholderStringId = 3165; + rct_string_id placeholderStringId = STR_PLACEHOLDER; safe_strcpy((char*)language_get_string(placeholderStringId), scenario->name, 64); int format = isDisabled ? 865 : (isHighlighted ? highlighted_format : unhighlighted_format); colour = isDisabled ? w->colours[1] | 0x40 : COLOUR_BLACK;