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

Rename WWT_25 to WWT_PLACEHOLDER.

Browse Source 
This is only used in the bottom toolbar as a placeholder,
while still capturing events.
This commit is contained in:
Aaron van Geffen
2018-01-03 22:13:44 +01:00
parent 12e3e171f1
commit e61194961f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@@ -58,7 +58,7 @@ static rct_widget window_game_bottom_toolbar_widgets[] =
{ WWT_FLATBTN, 0, 2, 139, 21, 31, 0xFFFFFFFF, STR_PARK_RATING_TIP }, // Park rating window
{ WWT_IMGBTN, 2, 142, 497, 0, 33, 0xFFFFFFFF, STR_NONE }, // Middle outset panel
{ WWT_25, 2, 144, 495, 2, 31, 0xFFFFFFFF, STR_NONE }, // Middle inset panel
{ WWT_PLACEHOLDER, 2, 144, 495, 2, 31, 0xFFFFFFFF, STR_NONE }, // Middle inset panel
{ WWT_FLATBTN, 2, 147, 170, 5, 28, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP }, // Associated news item window
{ WWT_FLATBTN, 2, 469, 492, 5, 28, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // Scroll to news item target
@@ -325,7 +325,7 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w)
else
{
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].type = WWT_IMGBTN;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_25;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_PLACEHOLDER;
window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].type = WWT_EMPTY;
window_game_bottom_toolbar_widgets[WIDX_NEWS_LOCATE].type = WWT_EMPTY;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].colour = 0;
@@ -336,7 +336,7 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w)
{
NewsItem * newsItem = news_item_get(0);
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].type = WWT_IMGBTN;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_25;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_INSET].type = WWT_PLACEHOLDER;
window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].type = WWT_FLATBTN;
window_game_bottom_toolbar_widgets[WIDX_NEWS_LOCATE].type = WWT_FLATBTN;
window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].colour = 2;

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

@@ -166,7 +166,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn
case WWT_CHECKBOX:
widget_checkbox_draw(dpi, w, widgetIndex);
break;
case WWT_25:
case WWT_PLACEHOLDER:
break;
case WWT_TEXT_BOX:
widget_text_box_draw(dpi, w, widgetIndex);

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

@@ -40,7 +40,7 @@ typedef enum {
WWT_CLOSEBOX = 21,
WWT_SCROLL = 22,
WWT_CHECKBOX = 23,
WWT_25 = 25,
WWT_PLACEHOLDER = 25,
WWT_TEXT_BOX = 27,
WWT_LAST = 26,
} WINDOW_WIDGET_TYPES;