mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

Remove unused WWT_4, WWT_5, WWT_11, WWT_18.

Browse Source
This commit is contained in:
Aaron van Geffen
2018-01-03 19:30:40 +01:00
parent 8ad1bc9b86
commit 7b4c71ff68
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/interface/Widget.cpp
View File

@@ -124,10 +124,8 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn
widget_resize_draw(dpi, w, widgetIndex); widget_resize_draw(dpi, w, widgetIndex);
break; break;
case WWT_IMGBTN: case WWT_IMGBTN:
case WWT_4:
widget_button_draw(dpi, w, widgetIndex); widget_button_draw(dpi, w, widgetIndex);
break; break;
case WWT_5:
case WWT_COLOURBTN: case WWT_COLOURBTN:
case WWT_TRNBTN: case WWT_TRNBTN:
case WWT_TAB: 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); widget_flat_button_draw(dpi, w, widgetIndex);
break; break;
case WWT_DROPDOWN_BUTTON: case WWT_DROPDOWN_BUTTON:
case WWT_11:
case WWT_TABLE_HEADER: case WWT_TABLE_HEADER:
widget_text_button(dpi, w, widgetIndex); widget_text_button(dpi, w, widgetIndex);
break; break;
@@ -152,8 +149,6 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn
case WWT_VIEWPORT: case WWT_VIEWPORT:
widget_text_inset(dpi, w, widgetIndex); widget_text_inset(dpi, w, widgetIndex);
break; break;
case WWT_18:
break;
case WWT_GROUPBOX: case WWT_GROUPBOX:
widget_groupbox_draw(dpi, w, widgetIndex); widget_groupbox_draw(dpi, w, widgetIndex);
break; break;
@@ -406,10 +401,6 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, rct_widge
if (stringId == STR_NONE) if (stringId == STR_NONE)
return; 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->type == WWT_TABLE_HEADER) {
if (widget_is_disabled(w, widgetIndex)) if (widget_is_disabled(w, widgetIndex))
colour |= COLOUR_FLAG_INSET; colour |= COLOUR_FLAG_INSET;
@@ -816,7 +807,7 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, rct_widgeti
// Get the colour // Get the colour
uint8 colour = NOT_TRANSLUCENT(w->colours[widget->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)) if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))
image++; image++;

4
src/openrct2/interface/Widget.h
View File

@@ -24,21 +24,17 @@ typedef enum {
WWT_FRAME = 1, WWT_FRAME = 1,
WWT_RESIZE = 2, WWT_RESIZE = 2,
WWT_IMGBTN = 3, WWT_IMGBTN = 3,
WWT_4 = 4, // Same as IMGBTN but uses .image + 1 while pressed/active
WWT_5 = 5,
WWT_COLOURBTN = 6, WWT_COLOURBTN = 6,
WWT_TRNBTN = 7, WWT_TRNBTN = 7,
WWT_TAB = 8, WWT_TAB = 8,
WWT_FLATBTN = 9, WWT_FLATBTN = 9,
WWT_DROPDOWN_BUTTON = 10, WWT_DROPDOWN_BUTTON = 10,
WWT_11, // Same as dropdown button but uses .text + 1 while pressed/active
WWT_LABEL_CENTRED = 12, // Centred text WWT_LABEL_CENTRED = 12, // Centred text
WWT_TABLE_HEADER = 13, // Left-aligned textual button WWT_TABLE_HEADER = 13, // Left-aligned textual button
WWT_LABEL = 14, // Left-aligned text WWT_LABEL = 14, // Left-aligned text
WWT_SPINNER = 15, WWT_SPINNER = 15,
WWT_DROPDOWN = 16, WWT_DROPDOWN = 16,
WWT_VIEWPORT = 17, WWT_VIEWPORT = 17,
WWT_18,
WWT_GROUPBOX = 19, WWT_GROUPBOX = 19,
WWT_CAPTION = 20, WWT_CAPTION = 20,
WWT_CLOSEBOX = 21, WWT_CLOSEBOX = 21,

2
src/openrct2/interface/Window.cpp
View File

@@ -2254,7 +2254,7 @@ static void window_invalidate_pressed_image_buttons(rct_window *w)
widgetIndex = 0; widgetIndex = 0;
for (widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) { 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; continue;
if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))