From c1cff7fab07e65b302a70b4a1f3d7c2fa35f5451 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Thu, 30 Jul 2020 22:25:18 +0200 Subject: [PATCH] Refactor Park --- src/openrct2-ui/windows/Park.cpp | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 789b13c51b..31451f5fac 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -79,25 +79,25 @@ enum WINDOW_PARK_WIDGET_IDX { #define MAIN_PARK_WIDGETS(WW) \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - { WWT_RESIZE, 1, 0, WW - 1, 43, 173, 0xFFFFFFFF, STR_NONE }, /* tab content panel */ \ - { WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_ENTRANCE_TAB_TIP }, /* tab 1 */ \ - { WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_RATING_TAB_TIP }, /* tab 2 */ \ - { WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_GUESTS_TAB_TIP }, /* tab 3 */ \ - { WWT_TAB, 1, 96, 126, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_PRICE_TAB_TIP }, /* tab 4 */ \ - { WWT_TAB, 1, 127, 157, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_STATS_TAB_TIP }, /* tab 5 */ \ - { WWT_TAB, 1, 158, 188, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_OBJECTIVE_TAB_TIP }, /* tab 6 */ \ - { WWT_TAB, 1, 189, 219, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_AWARDS_TAB_TIP } /* tab 7 */ + MakeWidget ({ 0, 43}, {WW, 131}, WWT_RESIZE, 1 ), /* tab content panel */ \ + MakeRemapWidget({ 3, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_ENTRANCE_TAB_TIP ), /* tab 1 */ \ + MakeRemapWidget({ 34, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_RATING_TAB_TIP ), /* tab 2 */ \ + MakeRemapWidget({ 65, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_GUESTS_TAB_TIP ), /* tab 3 */ \ + MakeRemapWidget({ 96, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_PRICE_TAB_TIP ), /* tab 4 */ \ + MakeRemapWidget({127, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_STATS_TAB_TIP ), /* tab 5 */ \ + MakeRemapWidget({158, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_OBJECTIVE_TAB_TIP), /* tab 6 */ \ + MakeRemapWidget({189, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_AWARDS_TAB_TIP ) /* tab 7 */ static rct_widget window_park_entrance_widgets[] = { MAIN_PARK_WIDGETS(230), - { WWT_VIEWPORT, 1, 3, 204, 46, 160, 0xFFFFFFFF, STR_NONE }, // viewport - { WWT_LABEL_CENTRED, 1, 3, 204, 161, 171, 0xFFFFFFFF, STR_NONE }, // status - { WWT_FLATBTN, 1, 205, 228, 49, 72, 0xFFFFFFFF, STR_OPEN_OR_CLOSE_PARK_TIP }, // open / close - { WWT_FLATBTN, 1, 205, 228, 73, 96, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_AND_CONSTRUCTION_RIGHTS_TIP }, // buy land rights - { WWT_FLATBTN, 1, 205, 228, 97, 120, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // locate - { WWT_FLATBTN, 1, 205, 228, 121, 144, SPR_RENAME, STR_NAME_PARK_TIP }, // rename - { WWT_IMGBTN, 1, 210, 223, 51, 65, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_PARK_TIP }, - { WWT_IMGBTN, 1, 210, 223, 66, 79, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_PARK_TIP }, + MakeWidget({ 3, 46}, {202, 115}, WWT_VIEWPORT, 1 ), // viewport + MakeWidget({ 3, 161}, {202, 11}, WWT_LABEL_CENTRED, 1 ), // status + MakeWidget({205, 49}, { 24, 24}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_OPEN_OR_CLOSE_PARK_TIP ), // open / close + MakeWidget({205, 73}, { 24, 24}, WWT_FLATBTN, 1, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_AND_CONSTRUCTION_RIGHTS_TIP), // buy land rights + MakeWidget({205, 97}, { 24, 24}, WWT_FLATBTN, 1, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // locate + MakeWidget({205, 121}, { 24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_NAME_PARK_TIP ), // rename + MakeWidget({210, 51}, { 14, 15}, WWT_IMGBTN, 1, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_PARK_TIP ), + MakeWidget({210, 66}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_PARK_TIP ), { WIDGETS_END }, }; @@ -113,8 +113,8 @@ static rct_widget window_park_guests_widgets[] = { static rct_widget window_park_price_widgets[] = { MAIN_PARK_WIDGETS(230), - { WWT_LABEL, 1, 21, 146, 50, 63, STR_ADMISSION_PRICE, STR_NONE }, // - SPINNER_WIDGETS (1, 147, 222, 50, 63, STR_NONE, STR_NONE), // Price (3 widgets) + MakeWidget ({ 21, 50}, {126, 14}, WWT_LABEL, 1, STR_ADMISSION_PRICE), + MakeSpinnerWidgets({147, 50}, { 76, 14}, WWT_SPINNER, 1 ), // Price (3 widgets) { WIDGETS_END }, }; @@ -125,7 +125,7 @@ static rct_widget window_park_stats_widgets[] = { static rct_widget window_park_objective_widgets[] = { MAIN_PARK_WIDGETS(230), - { WWT_BUTTON, 1, 7, 222, 207, 220, STR_ENTER_NAME_INTO_SCENARIO_CHART, STR_NONE }, // enter name + MakeWidget({7, 207}, {216, 14}, WWT_BUTTON, 1, STR_ENTER_NAME_INTO_SCENARIO_CHART), // enter name { WIDGETS_END }, };