From 705fb94f58efca9ab6ebe638a829bd19a2cda6c0 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 15 Dec 2018 19:00:37 +0100 Subject: [PATCH] Fix #8406: Add 'Entrance style:' label to Ride window --- data/language/en-GB.txt | 1 + src/openrct2-ui/windows/Ride.cpp | 4 +++- src/openrct2/localisation/StringIds.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index f26fdc4927..e452e11f12 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3722,6 +3722,7 @@ STR_6271 :Terrain Edges STR_6272 :Stations STR_6273 :Music STR_6274 :Can't set colour scheme... +STR_6275 :{WINDOW_COLOUR_2}Entrance style: ############# # Scenarios # diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index ef1c88c944..254c6c73ea 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -291,7 +291,7 @@ static rct_widget window_ride_colour_widgets[] = { { WWT_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, 1, 103, 241, 103, 114, 0, STR_NONE }, { WWT_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, STR_ARG_6_STRINGID, STR_NONE }, @@ -4915,6 +4915,8 @@ static void window_ride_colour_paint(rct_window* w, rct_drawpixelinfo* dpi) gfx_draw_sprite(&clippedDpi, ((spriteIndex + 20) & 0x7FFFF) + terniaryColour, 34, 20, terniaryColour); } } + + gfx_draw_string_left_clipped(dpi, STR_ENTRANCE_STYLE, gCommonFormatArgs, COLOUR_BLACK, w->x + 3, w->y + 103, 97); } } diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index b3450e5c85..e4fa436672 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -3893,6 +3893,8 @@ enum STR_CANT_SET_COLOUR_SCHEME = 6274, + STR_ENTRANCE_STYLE = 6275, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 };