mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 into ddevrien-master
This commit is contained in:
commit
604f61732c
|
@ -446,6 +446,12 @@ enum {
|
||||||
STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS = 2862,
|
STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS = 2862,
|
||||||
STR_MUSIC_ACKNOWLEDGEMENTS = 2863,
|
STR_MUSIC_ACKNOWLEDGEMENTS = 2863,
|
||||||
|
|
||||||
|
STR_CHANGE_BANNER_TEXT_TIP = 2986,
|
||||||
|
STR_SET_AS_NO_ENTRY_BANNER_TIP = 2987,
|
||||||
|
STR_DEMOLISH_BANNER_TIP = 2988,
|
||||||
|
STR_SELECT_MAIN_COLOR_TIP = 2989,
|
||||||
|
STR_SELECT_TEXT_COLOR_TIP = 2990,
|
||||||
|
|
||||||
STR_LICENCE_AGREEMENT_NOTICE_1 = 2969,
|
STR_LICENCE_AGREEMENT_NOTICE_1 = 2969,
|
||||||
STR_LICENCE_AGREEMENT_NOTICE_2 = 2970,
|
STR_LICENCE_AGREEMENT_NOTICE_2 = 2970,
|
||||||
|
|
||||||
|
|
|
@ -115,7 +115,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
|
||||||
widget_button_draw(dpi, w, widgetIndex);
|
widget_button_draw(dpi, w, widgetIndex);
|
||||||
break;
|
break;
|
||||||
case WWT_5:
|
case WWT_5:
|
||||||
case WWT_6:
|
case WWT_COLORBTN:
|
||||||
case WWT_TRNBTN:
|
case WWT_TRNBTN:
|
||||||
case WWT_TAB:
|
case WWT_TAB:
|
||||||
widget_tab_draw(dpi, w, widgetIndex);
|
widget_tab_draw(dpi, w, widgetIndex);
|
||||||
|
@ -861,7 +861,7 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
|
||||||
// Get the colour
|
// Get the colour
|
||||||
colour = w->colours[widget->colour];
|
colour = w->colours[widget->colour];
|
||||||
|
|
||||||
if (widget->type == WWT_4 || widget->type == WWT_6 || widget->type == WWT_TRNBTN || widget->type == WWT_TAB)
|
if (widget->type == WWT_4 || widget->type == WWT_COLORBTN || 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++;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ typedef enum {
|
||||||
WWT_IMGBTN = 3,
|
WWT_IMGBTN = 3,
|
||||||
WWT_4 = 4,
|
WWT_4 = 4,
|
||||||
WWT_5 = 5,
|
WWT_5 = 5,
|
||||||
WWT_6 = 6,
|
WWT_COLORBTN = 6,
|
||||||
WWT_TRNBTN = 7,
|
WWT_TRNBTN = 7,
|
||||||
WWT_TAB = 8,
|
WWT_TAB = 8,
|
||||||
WWT_FLATBTN = 9,
|
WWT_FLATBTN = 9,
|
||||||
|
|
Loading…
Reference in New Issue