diff --git a/src/openrct2/interface/Widget.cpp b/src/openrct2/interface/Widget.cpp index 957c2fa4af..ea2d449a86 100644 --- a/src/openrct2/interface/Widget.cpp +++ b/src/openrct2/interface/Widget.cpp @@ -124,10 +124,8 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn widget_resize_draw(dpi, w, widgetIndex); break; case WWT_IMGBTN: - case WWT_4: widget_button_draw(dpi, w, widgetIndex); break; - case WWT_5: case WWT_COLOURBTN: case WWT_TRNBTN: case WWT_TAB: @@ -137,7 +135,6 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn widget_flat_button_draw(dpi, w, widgetIndex); break; case WWT_DROPDOWN_BUTTON: - case WWT_11: case WWT_TABLE_HEADER: widget_text_button(dpi, w, widgetIndex); break; @@ -152,8 +149,6 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn case WWT_VIEWPORT: widget_text_inset(dpi, w, widgetIndex); break; - case WWT_18: - break; case WWT_GROUPBOX: widget_groupbox_draw(dpi, w, widgetIndex); break; @@ -406,10 +401,6 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, rct_widge if (stringId == STR_NONE) return; - if (widget->type == WWT_11 && (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))) - // TODO: remove string addition - stringId++; - if (widget->type == WWT_TABLE_HEADER) { if (widget_is_disabled(w, widgetIndex)) colour |= COLOUR_FLAG_INSET; @@ -816,7 +807,7 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, rct_widgeti // Get the colour uint8 colour = NOT_TRANSLUCENT(w->colours[widget->colour]); - if (widget->type == WWT_4 || widget->type == WWT_COLOURBTN || widget->type == WWT_TRNBTN || widget->type == WWT_TAB) + if (widget->type == WWT_COLOURBTN || widget->type == WWT_TRNBTN || widget->type == WWT_TAB) if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) image++; diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index 7b127e5e60..0eae18ebf2 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -24,21 +24,17 @@ typedef enum { WWT_FRAME = 1, WWT_RESIZE = 2, WWT_IMGBTN = 3, - WWT_4 = 4, // Same as IMGBTN but uses .image + 1 while pressed/active - WWT_5 = 5, WWT_COLOURBTN = 6, WWT_TRNBTN = 7, WWT_TAB = 8, WWT_FLATBTN = 9, WWT_DROPDOWN_BUTTON = 10, - WWT_11, // Same as dropdown button but uses .text + 1 while pressed/active WWT_LABEL_CENTRED = 12, // Centred text WWT_TABLE_HEADER = 13, // Left-aligned textual button WWT_LABEL = 14, // Left-aligned text WWT_SPINNER = 15, WWT_DROPDOWN = 16, WWT_VIEWPORT = 17, - WWT_18, WWT_GROUPBOX = 19, WWT_CAPTION = 20, WWT_CLOSEBOX = 21, diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 7e3c9d3eac..fc19d719e0 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -2254,7 +2254,7 @@ static void window_invalidate_pressed_image_buttons(rct_window *w) widgetIndex = 0; for (widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) { - if (widget->type != WWT_5 && widget->type != WWT_IMGBTN) + if (widget->type != WWT_IMGBTN) continue; if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))