From fbbc871aeaa5f3591b9de13a05e3da2b150d6f0f Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 27 Jul 2016 00:15:46 +0200 Subject: [PATCH] Clean up double-used strings --- data/language/en-GB.txt | 5 +++++ src/config.c | 2 +- src/localisation/string_ids.h | 11 ++++++++--- src/windows/mapgen.c | 12 ++++++------ src/windows/multiplayer.c | 2 +- src/windows/ride.c | 2 +- src/windows/server_start.c | 24 ++++++++++++------------ 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 3358a57fea..f4972faee5 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4223,6 +4223,11 @@ STR_5911 :See-Through Paths STR_5912 :See-through paths toggle STR_5913 :Chat STR_5914 :Unknown ride +STR_5915 :Player +STR_5916 :{COMMA16} player +STR_5917 :{COMMA16} players +STR_5918 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16} +STR_5919 :{COMMA16} ############# # Scenarios # diff --git a/src/config.c b/src/config.c index 51eb6b8699..ba74b5d60e 100644 --- a/src/config.c +++ b/src/config.c @@ -434,7 +434,7 @@ void config_set_defaults() if (username) { destValue->value_string = _strdup(username); } else { - destValue->value_string = _strdup(language_get_string(STR_RIDE_COMPONENT_PLAYER_CAPITALISED)); + destValue->value_string = _strdup(language_get_string(STR_MULTIPLAYER_DEFAULT_NAME)); } } else { diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index babb5662ed..4f2bd27d54 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1172,7 +1172,7 @@ enum { STR_NUMBER_OF_LAPS = 1734, STR_NUMBER_OF_LAPS_TIP = 1735, STR_RIDE_MODE_COUNT_VALUE = 1736, - STR_MAPGEN_COMMA16 = 1737, +// STR_1737 :{COMMA16} STR_CANT_CHANGE_NUMBER_OF_LAPS = 1738, STR_RACE_WON_BY_GUEST = 1739, STR_RACE_WON_BY = 1740, @@ -1306,8 +1306,8 @@ enum { STR_CANT_CHANGE_NUMBER_OF_ROTATIONS = 1868, STR_NUMBER_OF_ROTATIONS = 1869, STR_NUMBER_OF_ROTATIONS_TIP = 1870, - STR_ARG18_COMMA16 = 1871, // Should probably be in RIDE domain - STR_COMMA16 = 1872, + STR_NUMBER_OF_ROTATIONS_VALUE = 1871, +// STR_1872 :{COMMA16} STR_INCOME_PER_HOUR = 1873, STR_PROFIT_PER_HOUR = 1874, STR_GUEST_ITEM_FORMAT = 1875, @@ -3565,6 +3565,11 @@ enum { STR_SHORTCUT_SEE_THROUGH_PATHS_TOGGLE = 5912, STR_CHAT = 5913, STR_RIDE_DESCRIPTION_UNKNOWN = 5914, + STR_MULTIPLAYER_DEFAULT_NAME = 5915, + STR_MULTIPLAYER_PLAYER_COUNT = 5916, + STR_MULTIPLAYER_PLAYER_COUNT_PLURAL = 5917, + STR_SERVER_MAX_PLAYERS_VALUE = 5918, + STR_COMMA16 = 5919, // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c index 711032804d..0bd5022aba 100644 --- a/src/windows/mapgen.c +++ b/src/windows/mapgen.c @@ -685,10 +685,10 @@ static void window_mapgen_base_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_RESOLUTION_X_BY_Y, mapSizeArgs, w->colours[1], w->x + w->widgets[WIDX_MAP_SIZE].left + 1, w->y + w->widgets[WIDX_MAP_SIZE].top + 1); arg = (_baseHeight - 12) / 2; - gfx_draw_string_left(dpi, STR_MAPGEN_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_BASE_HEIGHT].left + 1, w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1); + gfx_draw_string_left(dpi, STR_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_BASE_HEIGHT].left + 1, w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1); arg = (_waterLevel - 12) / 2; - gfx_draw_string_left(dpi, STR_MAPGEN_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_WATER_LEVEL].left + 1, w->y + w->widgets[WIDX_WATER_LEVEL].top + 1); + gfx_draw_string_left(dpi, STR_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_WATER_LEVEL].left + 1, w->y + w->widgets[WIDX_WATER_LEVEL].top + 1); } #pragma endregion @@ -986,17 +986,17 @@ static void window_mapgen_simplex_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_MAP_SIZE, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_MAP_SIZE].top + 1); gfx_draw_string_left(dpi, STR_WATER_LEVEL_LABEL, 0, 0, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].top + 1); - gfx_draw_string_left(dpi, STR_MAPGEN_COMMA16, &_simplex_low, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_LOW].left + 1, w->y + w->widgets[WIDX_SIMPLEX_LOW].top + 1); - gfx_draw_string_left(dpi, STR_MAPGEN_COMMA16, &_simplex_high, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_HIGH].left + 1, w->y + w->widgets[WIDX_SIMPLEX_HIGH].top + 1); + gfx_draw_string_left(dpi, STR_COMMA16, &_simplex_low, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_LOW].left + 1, w->y + w->widgets[WIDX_SIMPLEX_LOW].top + 1); + gfx_draw_string_left(dpi, STR_COMMA16, &_simplex_high, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_HIGH].left + 1, w->y + w->widgets[WIDX_SIMPLEX_HIGH].top + 1); gfx_draw_string_left(dpi, STR_WINDOW_OBJECTIVE_VALUE_RATING, &_simplex_base_freq, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_BASE_FREQ].left + 1, w->y + w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1); - gfx_draw_string_left(dpi, STR_MAPGEN_COMMA16, &_simplex_octaves, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_OCTAVES].left + 1, w->y + w->widgets[WIDX_SIMPLEX_OCTAVES].top + 1); + gfx_draw_string_left(dpi, STR_COMMA16, &_simplex_octaves, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_OCTAVES].left + 1, w->y + w->widgets[WIDX_SIMPLEX_OCTAVES].top + 1); // The practical map size is 2 lower than the technical map size uint16 mapSizeArgs[2] = { _mapSize - 2, _mapSize - 2 }; gfx_draw_string_left(dpi, STR_RESOLUTION_X_BY_Y, mapSizeArgs, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_MAP_SIZE].left + 1, w->y + w->widgets[WIDX_SIMPLEX_MAP_SIZE].top + 1); arg = (_waterLevel - 12) / 2; - gfx_draw_string_left(dpi, STR_MAPGEN_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].left + 1, w->y + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].top + 1); + gfx_draw_string_left(dpi, STR_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].left + 1, w->y + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].top + 1); } #pragma endregion diff --git a/src/windows/multiplayer.c b/src/windows/multiplayer.c index 6e61c48231..c30f642454 100644 --- a/src/windows/multiplayer.c +++ b/src/windows/multiplayer.c @@ -586,7 +586,7 @@ static void window_multiplayer_players_paint(rct_window *w, rct_drawpixelinfo *d gfx_draw_string_left(dpi, STR_PING, NULL, w->colours[2], w->x + 363, 58 - 12 + w->y + 1); // Number of players - stringId = w->no_list_items == 1 ? STR_RIDE_COMPONENT_PLAYER_COUNT : STR_RIDE_COMPONENT_PLAYER_COUNT_PLURAL; + stringId = w->no_list_items == 1 ? STR_MULTIPLAYER_PLAYER_COUNT : STR_MULTIPLAYER_PLAYER_COUNT_PLURAL; x = w->x + 4; y = w->y + w->widgets[WIDX_LIST].bottom + 2; gfx_draw_string_left(dpi, stringId, &w->no_list_items, w->colours[2], x, y); diff --git a/src/windows/ride.c b/src/windows/ride.c index cce220d632..4e34b597ff 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -3603,7 +3603,7 @@ static void window_ride_operating_invalidate(rct_window *w) case RIDE_MODE_ROTATION: case RIDE_MODE_FORWARD_ROTATION: case RIDE_MODE_BACKWARD_ROTATION: - format = STR_ARG18_COMMA16; + format = STR_NUMBER_OF_ROTATIONS_VALUE; caption = STR_NUMBER_OF_ROTATIONS; tooltip = STR_NUMBER_OF_ROTATIONS_TIP; break; diff --git a/src/windows/server_start.c b/src/windows/server_start.c index a72a453d9f..9bc9e7ccd3 100644 --- a/src/windows/server_start.c +++ b/src/windows/server_start.c @@ -48,18 +48,18 @@ enum { #define WH 120 static rct_widget window_server_start_widgets[] = { - { WWT_FRAME, 0, 0, WW-1, 0, WH-1, 0xFFFFFFFF, STR_NONE }, // panel / background - { WWT_CAPTION, 0, 1, WW-2, 1, 14, STR_START_SERVER, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, WW-13, WW-3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button - { WWT_TEXT_BOX, 1, 120, WW-8, 20, 32, STR_NONE, STR_NONE }, // port text box - { WWT_TEXT_BOX, 1, 120, WW-8, 36, 48, STR_NONE, STR_NONE }, // name text box - { WWT_TEXT_BOX, 1, 120, WW-8, 52, 64, STR_NONE, STR_NONE }, // password text box - { WWT_SPINNER, 1, 120, WW-8, 68, 77, STR_ARG18_COMMA16, STR_NONE }, // max players - { WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 68, 72, STR_NUMERIC_UP, STR_NONE }, - { WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 72, 76, STR_NUMERIC_DOWN, STR_NONE }, - { WWT_CHECKBOX, 1, 6, WW-8, 85, 91, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP }, // advertise checkbox - { WWT_DROPDOWN_BUTTON, 1, 6, 106, WH-6-11, WH-6, STR_NEW_GAME, STR_NONE }, // start server button - { WWT_DROPDOWN_BUTTON, 1, 112, 212, WH-6-11, WH-6, STR_LOAD_GAME, STR_NONE }, + { WWT_FRAME, 0, 0, WW-1, 0, WH-1, 0xFFFFFFFF, STR_NONE }, // panel / background + { WWT_CAPTION, 0, 1, WW-2, 1, 14, STR_START_SERVER, STR_WINDOW_TITLE_TIP }, // title bar + { WWT_CLOSEBOX, 0, WW-13, WW-3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button + { WWT_TEXT_BOX, 1, 120, WW-8, 20, 32, STR_NONE, STR_NONE }, // port text box + { WWT_TEXT_BOX, 1, 120, WW-8, 36, 48, STR_NONE, STR_NONE }, // name text box + { WWT_TEXT_BOX, 1, 120, WW-8, 52, 64, STR_NONE, STR_NONE }, // password text box + { WWT_SPINNER, 1, 120, WW-8, 68, 77, STR_SERVER_MAX_PLAYERS_VALUE, STR_NONE }, // max players + { WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 68, 72, STR_NUMERIC_UP, STR_NONE }, + { WWT_DROPDOWN_BUTTON, 1, WW-18, WW-8, 72, 76, STR_NUMERIC_DOWN, STR_NONE }, + { WWT_CHECKBOX, 1, 6, WW-8, 85, 91, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP }, // advertise checkbox + { WWT_DROPDOWN_BUTTON, 1, 6, 106, WH-6-11, WH-6, STR_NEW_GAME, STR_NONE }, // start server button + { WWT_DROPDOWN_BUTTON, 1, 112, 212, WH-6-11, WH-6, STR_LOAD_GAME, STR_NONE }, { WIDGETS_END }, };