From 877ce58f0be6de1f647fc066294525324663ffdb Mon Sep 17 00:00:00 2001 From: Xkeeper Date: Thu, 31 Jan 2019 14:33:09 -0800 Subject: [PATCH] Update sign tooltip to use STR_NO_ENTRY Changes the number of the sign tooltip string and removes the now-duplicate "no entry" string --- data/language/en-GB.txt | 1 - src/openrct2-ui/interface/ViewportInteraction.cpp | 2 +- src/openrct2/localisation/StringIds.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index f0d159d956..b9becb6007 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3756,7 +3756,6 @@ STR_6305 :Multithreading STR_6306 :{SMALLFONT}{BLACK}Experimental option to use multiple threads to render, may cause instability. STR_6307 :Colour scheme: {BLACK}{STRINGID} STR_6308 :“{STRINGID}{OUTLINE}{TOPAZ}”{NEWLINE}{STRINGID} -STR_6309 :{RED}No entry ############# # Scenarios # diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 6932c17794..8e135ceb5f 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -340,7 +340,7 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter set_map_tooltip_format_arg( 0, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID); if (banner->flags & BANNER_FLAG_NO_ENTRY) - set_map_tooltip_format_arg( 2, rct_string_id, STR_NO_ENTRY_TOOLTIP); + set_map_tooltip_format_arg( 2, rct_string_id, STR_NO_ENTRY); else set_map_tooltip_format_arg( 2, rct_string_id, banner->string_idx); diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 7d24d03726..e3fbb2173c 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3940,7 +3940,6 @@ enum STR_TILE_INSPECTOR_COLOUR_SCHEME = 6307, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID = 6308, - STR_NO_ENTRY_TOOLTIP = 6309, // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768