diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index d56ec7e879..c0ff168448 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3673,7 +3673,7 @@ STR_6356 :{SMALLFONT}{BLACK}Spawns ducks if park contains water STR_6357 :{SMALLFONT}{BLACK}Removes all ducks from the map STR_6358 :Page {UINT16} STR_6359 :{POP16}{POP16}Page {UINT16} -STR_6360 :{SMALLFONT}{BLACK}{UINT16} +STR_6360 :{SMALLFONT}{BLACK}{COMMA32} ############# # Scenarios # diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 91d4f40fae..f6343bcb4d 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -36,6 +36,7 @@ - Fix: [#10904] RCT1/LL-scenarios with red water won't open. - Improved: [#682] The staff patrol area is now drawn on the water, instead of on the surface under water. - Improved: [#10858] Added horizontal grid lines to finance charts. +- Improved: [#10884] Added y-axes and labels to park window charts. - Removed: [#6898] LOADMM and LOADRCT1 title sequence commands (use LOADSC instead). 0.2.4 (2019-10-28) diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index e1479964f7..4bf9711f3c 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -1056,13 +1056,13 @@ static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi) INSET_RECT_F_30); // Y axis labels - x = x + widget->left + 23; + x = x + widget->left + 27; y = y + widget->top + 23; for (int i = 5; i >= 0; i--) { - uint16_t axisValue = i * 200; + uint32_t axisValue = i * 200; gfx_draw_string_right(dpi, STR_GRAPH_AXIS_LABEL, &axisValue, COLOUR_BLACK, x + 10, y); - gfx_fill_rect_inset(dpi, x + 15, y + 5, x + w->width - 28, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); + gfx_fill_rect_inset(dpi, x + 15, y + 5, x + w->width - 32, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); y += 20; } @@ -1187,13 +1187,13 @@ static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi) INSET_RECT_F_30); // Y axis labels - x = x + widget->left + 23; + x = x + widget->left + 27; y = y + widget->top + 23; for (int i = 5; i >= 0; i--) { - uint16_t axisValue = i * 1000; + uint32_t axisValue = i * 1000; gfx_draw_string_right(dpi, STR_GRAPH_AXIS_LABEL, &axisValue, COLOUR_BLACK, x + 10, y); - gfx_fill_rect_inset(dpi, x + 15, y + 5, x + w->width - 28, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); + gfx_fill_rect_inset(dpi, x + 15, y + 5, x + w->width - 32, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); y += 20; }