diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index a1129ea340..a210a4e59f 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -36,8 +36,6 @@ enum WINDOW_CLEAR_SCENERY_WIDGET_IDX { WIDX_FOOTPATH }; -validate_global_widx(WC_CLEAR_SCENERY, WIDX_PREVIEW); - static rct_widget window_clear_scenery_widgets[] = { { WWT_FRAME, 0, 0, 97, 0, 93, 0xFFFFFFFF, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 96, 1, 14, STR_CLEAR_SCENERY, STR_WINDOW_TITLE_TIP }, // title bar diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 76c8f3beab..cd6a173a0c 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -40,8 +40,6 @@ enum WINDOW_LAND_WIDGET_IDX { WIDX_WALL, }; -validate_global_widx(WC_LAND, WIDX_PREVIEW); - static rct_widget window_land_widgets[] = { { WWT_FRAME, 0, 0, 97, 0, 159, 0xFFFFFFFF, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 96, 1, 14, STR_LAND, STR_WINDOW_TITLE_TIP }, // title bar diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 02b39878aa..99dfc02341 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -39,8 +39,6 @@ enum WINDOW_WATER_WIDGET_IDX { WIDX_BUY_CONSTRUCTION_RIGHTS }; -validate_global_widx(WC_LAND_RIGHTS, WIDX_PREVIEW); - static rct_widget window_land_rights_widgets[] = { { WWT_FRAME, 0, 0, 97, 0, 93, 0xFFFFFFFF, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 96, 1, 14, STR_LAND_RIGHTS, STR_WINDOW_TITLE_TIP }, // title bar diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index c1b926acf9..21612cc3d3 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -77,7 +77,6 @@ enum WINDOW_MAP_WIDGET_IDX { WIDX_MAP_GENERATOR = 21 }; -validate_global_widx(WC_MAP, WIDX_LAND_TOOL); validate_global_widx(WC_MAP, WIDX_ROTATE_90); static rct_widget window_map_widgets[] = { diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index c7f0a873eb..62a28b6977 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -33,8 +33,6 @@ enum WINDOW_WATER_WIDGET_IDX { WIDX_INCREMENT }; -validate_global_widx(WC_WATER, WIDX_PREVIEW); - static rct_widget window_water_widgets[] = { { WWT_FRAME, 0, 0, 75, 0, 76, 0xFFFFFFFF, STR_NONE }, // panel / background { WWT_CAPTION, 0, 1, 74, 1, 14, STR_WATER, STR_WINDOW_TITLE_TIP }, // title bar diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index addf3ab39b..456315127e 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -457,18 +457,13 @@ enum { #define WC_RIDE_CONSTRUCTION__WIDX_ROTATE 32 #define WC_SCENERY__WIDX_SCENERY_TAB_1 4 #define WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON 25 -#define WC_LAND__WIDX_PREVIEW 5 -#define WC_WATER__WIDX_PREVIEW 3 #define WC_PEEP__WIDX_PATROL 11 #define WC_PEEP__WIDX_ACTION_LBL 12 #define WC_PEEP__WIDX_PICKUP 13 #define WC_TRACK_DESIGN_LIST__WIDX_ROTATE 8 #define WC_TRACK_DESIGN_PLACE__WIDX_ROTATE 3 -#define WC_MAP__WIDX_LAND_TOOL 13 #define WC_MAP__WIDX_ROTATE_90 20 #define WC_EDITOR_OBJECT_SELECTION__WIDX_TAB_1 21 -#define WC_CLEAR_SCENERY__WIDX_PREVIEW 3 -#define WC_LAND_RIGHTS__WIDX_PREVIEW 3 #define WC_STAFF__WIDX_PICKUP 10 enum PROMPT_MODE {