From 63f7820b259cc05f93192018595c6d2126e01ce8 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 1 Dec 2017 16:20:49 +0100 Subject: [PATCH] Fix #1185: Close button colour of prompt windows does not match --- data/language/en-GB.txt | 1 + distribution/changelog.txt | 1 + src/openrct2-ui/windows/DemolishRidePrompt.cpp | 2 +- src/openrct2-ui/windows/SavePrompt.cpp | 4 ++-- src/openrct2-ui/windows/StaffFirePrompt.cpp | 2 +- src/openrct2/localisation/string_ids.h | 2 ++ 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index ba45ef596f..907c552e89 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4472,6 +4472,7 @@ STR_6160 :{WINDOW_COLOUR_2}Available vehicles: {BLACK}{STRING} STR_6161 :Gridlines display toggle STR_6162 :Spinning Wild Mouse STR_6163 :Mouse shaped cars speed through tight corners and short drops, gently spinning around to disorientate the riders +STR_6164 :{WHITE}{CROSS} ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e5f26c8bfa..7399e950d7 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -30,6 +30,7 @@ - Feature: Add search box to track design window. - Fix: [#816] In the map window, there are more peeps flickering than there are selected (original bug). - Fix: [#996, #2589, #2875] Viewport scrolling no longer shakes or gets stuck. +- Fix: [#1185] Close button colour of prompt windows does not match. - Fix: [#1833, #4937, #6138] 'Too low!' warning when building rides and shops on the lowest land level (original bug). - Fix: [#2254] Edge scrolling horizontally now has the same speed as vertical edge scrolling. - Fix: [#4760] Asia - Great Wall of China and South America - Rio Carnival have incorrect guest entry points (original bug). diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 2a21a2bfcc..bdf3c24bbb 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -36,7 +36,7 @@ enum WINDOW_RIDE_DEMOLISH_WIDGET_IDX { static rct_widget window_ride_demolish_widgets[] = { { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_DEMOLISH_RIDE, STR_WINDOW_TITLE_TIP }, - { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, + { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X_WHITE, STR_CLOSE_WINDOW_TIP }, { WWT_DROPDOWN_BUTTON, 0, 10, 94, WH - 20, WH - 9, STR_DEMOLISH, STR_NONE }, { WWT_DROPDOWN_BUTTON, 0, WW - 95, WW - 11, WH - 20, WH - 9, STR_SAVE_PROMPT_CANCEL, STR_NONE }, { WIDGETS_END } diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 94fa8cbc21..7c17e6c8a5 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -39,7 +39,7 @@ enum WINDOW_SAVE_PROMPT_WIDGET_IDX { static rct_widget window_save_prompt_widgets[] = { { WWT_FRAME, 0, 0, 259, 0, 49, STR_NONE, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 258, 1, 14, 0, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, 247, 257, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button + { WWT_CLOSEBOX, 0, 247, 257, 2, 13, STR_CLOSE_X_WHITE, STR_CLOSE_WINDOW_TIP }, // close x button { WWT_12, 0, 2, 257, 19, 30, 0, STR_NONE }, // question/label { WWT_DROPDOWN_BUTTON, 0, 8, 85, 35, 46, STR_SAVE_PROMPT_SAVE, STR_NONE }, // save { WWT_DROPDOWN_BUTTON, 0, 91, 168, 35, 46, STR_SAVE_PROMPT_DONT_SAVE, STR_NONE }, // don't save @@ -58,7 +58,7 @@ enum WINDOW_QUIT_PROMPT_WIDGET_IDX { static rct_widget window_quit_prompt_widgets[] = { { WWT_FRAME, 0, 0, 176, 0, 33, STR_NONE, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 175, 1, 14, STR_QUIT_GAME_PROMPT_TITLE, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, 164, 174, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button + { WWT_CLOSEBOX, 0, 164, 174, 2, 13, STR_CLOSE_X_WHITE, STR_CLOSE_WINDOW_TIP }, // close x button { WWT_DROPDOWN_BUTTON, 0, 8, 85, 19, 30, STR_OK, STR_NONE }, // ok { WWT_DROPDOWN_BUTTON, 0, 91, 168, 19, 30, STR_CANCEL, STR_NONE }, // cancel { WIDGETS_END }, diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index 1dcbb578c7..d7f14bce7a 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -34,7 +34,7 @@ enum WINDOW_STAFF_FIRE_WIDGET_IDX { static rct_widget window_staff_fire_widgets[] = { { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_SACK_STAFF, STR_WINDOW_TITLE_TIP }, - { WWT_CLOSEBOX, 0, WW-13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, + { WWT_CLOSEBOX, 0, WW-13, WW - 3, 2, 13, STR_CLOSE_X_WHITE, STR_CLOSE_WINDOW_TIP }, { WWT_DROPDOWN_BUTTON, 0, 10, 94, WH - 20, WH - 9, STR_YES, STR_NONE }, { WWT_DROPDOWN_BUTTON, 0, WW - 95, WW - 11, WH - 20, WH - 9, STR_SAVE_PROMPT_CANCEL, STR_NONE }, { WIDGETS_END } diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index 237c9501c9..5257b0f470 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -3825,6 +3825,8 @@ enum { STR_SPINNING_WILD_MOUSE_GROUP = 6162, STR_SPINNING_WILD_MOUSE_GROUP_DESC = 6163, + STR_CLOSE_X_WHITE = 6164, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 };