From e6e850e3997ae7965f809ab561036c8512f896c2 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 31 Jul 2020 11:25:50 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Tulio Leao --- src/openrct2-ui/windows/MapGen.cpp | 10 +++++----- src/openrct2-ui/windows/Ride.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 4f8dcc756c..e14bf44cd5 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -116,11 +116,11 @@ static constexpr const int32_t WH = 273; #define SHARED_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \ - MakeWidget ({ 0, 43}, {250, 229}, WWT_RESIZE, 1, 0xFFFFFFFF, STR_NONE), /* WIDX_PAGE_BACKGROUND */ \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_NONE), /* WIDX_TAB_1 */ \ - MakeRemapWidget({34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_NONE), /* WIDX_TAB_2 */ \ - MakeRemapWidget({65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_NONE), /* WIDX_TAB_3 */ \ - MakeRemapWidget({96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_NONE) /* WIDX_TAB_4 */ + MakeWidget ({ 0, 43}, {250, 229}, WWT_RESIZE, 1 ), /* WIDX_PAGE_BACKGROUND */ \ + MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB), /* WIDX_TAB_1 */ \ + MakeRemapWidget({34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB), /* WIDX_TAB_2 */ \ + MakeRemapWidget({65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB), /* WIDX_TAB_3 */ \ + MakeRemapWidget({96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB) /* WIDX_TAB_4 */ static rct_widget MapWidgets[] = { SHARED_WIDGETS, diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 002227906b..b3bcdddc25 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -266,7 +266,7 @@ static rct_widget window_ride_operating_widgets[] = { MakeSpinnerWidgets({157, 154}, {152, 12}, WWT_SPINNER, 1, STR_ARG_14_STRINGID ), // NB: 3 widgets MakeWidget ({ 7, 169}, {302, 12}, WWT_CHECKBOX, 1, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP ), MakeWidget ({ 21, 61}, {129, 12}, WWT_LABEL, 1 ), - MakeWidget ({ 21, 75}, {129, 12}, WWT_LABEL, 1, STR_LIFT_HILL_CHAIN_SPEED, STR_NONE ), + MakeWidget ({ 21, 75}, {129, 12}, WWT_LABEL, 1, STR_LIFT_HILL_CHAIN_SPEED ), MakeWidget ({ 7, 47}, {302, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE ), MakeWidget ({297, 48}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE ), MakeWidget ({ 87, 109}, {222, 12}, WWT_DROPDOWN, 1 ),