From 4fb4feb83c2d3c6cc25e113aec3a5d0b5ee1b466 Mon Sep 17 00:00:00 2001 From: Duncan Date: Thu, 8 Oct 2020 19:22:23 +0100 Subject: [PATCH] Fix missing error message on ride graph (#13129) * Fix missing error message on ride graph Mistake made during implementation meant that the ride graph would not show the error message when the ride had not left the station. Another mistake meant that the tertiary colour of the ride window was not set to green. The tertiary colour was only used by this error message though so was not noticed. --- distribution/changelog.txt | 1 + src/openrct2-ui/interface/Theme.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 69b80d001e..82080a2e65 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -17,6 +17,7 @@ - Fix: [#13044] Rides in RCT1 saves all have "0 customers per hour". - Fix: [#13074] Entrance and exit ghosts for mazes not being removed. - Fix: [#13083] Dialog for renaming conflicting track design crops text out. +- Fix: [#13129] Missing error message when waiting for train to leave station on the ride measurements graph. - Improved: [#13023] Made add_news_item console command last argument, assoc, optional. 0.3.1 (2020-09-27) diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp index dc741e9221..d353dcd867 100644 --- a/src/openrct2-ui/interface/Theme.cpp +++ b/src/openrct2-ui/interface/Theme.cpp @@ -122,7 +122,7 @@ static constexpr const WindowThemeDesc WindowThemeDescriptors[] = // WindowClass, WindowClassSZ WindowName NumColours, DefaultTheme { THEME_WC(WC_TOP_TOOLBAR), STR_THEMES_WINDOW_TOP_TOOLBAR, COLOURS_4(COLOUR_LIGHT_BLUE, COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_GREY ) }, { THEME_WC(WC_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR, COLOURS_4(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), COLOUR_BLACK, COLOUR_BRIGHT_GREEN ) }, - { THEME_WC(WC_RIDE), STR_THEMES_WINDOW_RIDE, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_GREY ) }, + { THEME_WC(WC_RIDE), STR_THEMES_WINDOW_RIDE, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_SATURATED_GREEN ) }, { THEME_WC(WC_RIDE_CONSTRUCTION), STR_THEMES_WINDOW_RIDE_CONSTRUCTION, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, { THEME_WC(WC_RIDE_LIST), STR_THEMES_WINDOW_RIDE_LIST, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, { THEME_WC(WC_SAVE_PROMPT), STR_THEMES_WINDOW_SAVE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 33e7fc71fe..6240d86470 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3039,7 +3039,7 @@ std::pair ride_get_measurement(Ride* ride) auto ft = Formatter::Common(); ft.Add(RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].singular); ft.Add(RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.station].singular); - return { measurement.get(), STR_DATA_LOGGING_WILL_START_WHEN_NEXT_LEAVES }; + return { nullptr, STR_DATA_LOGGING_WILL_START_WHEN_NEXT_LEAVES }; } }