diff --git a/src/openrct2/input.c b/src/openrct2/input.c index 72a267c783..ab3579e7e3 100644 --- a/src/openrct2/input.c +++ b/src/openrct2/input.c @@ -867,7 +867,7 @@ static void input_scroll_part_update_vbottom(rct_window *w, rct_widgetindex widg */ static void input_widget_over(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex) { - rct_windowclass windowClass = 255; + rct_windowclass windowClass = WC_NULL; rct_windownumber windowNumber = 0; rct_widget *widget = NULL; @@ -953,7 +953,7 @@ static void input_widget_over_flatbutton_invalidate() */ static void input_widget_left(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex) { - rct_windowclass windowClass = 255; + rct_windowclass windowClass = WC_NULL; rct_windownumber windowNumber = 0; rct_widget *widget; diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index ff0cb0fc86..1e48c4b13f 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -115,66 +115,66 @@ struct WindowThemeDesc WindowThemeDesc WindowThemeDescriptors[] = { - // WindowClass, WindowClassSZ WindowName NumColours, DefaultTheme - { THEME_WC(WC_TOP_TOOLBAR), STR_THEMES_WINDOW_TOP_TOOLBAR, COLOURS_4(COLOUR_LIGHT_BLUE, COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_GREY ) }, - { THEME_WC(WC_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR, COLOURS_4(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), COLOUR_BLACK, COLOUR_BRIGHT_GREEN ) }, - { THEME_WC(WC_RIDE), STR_THEMES_WINDOW_RIDE, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_GREY ) }, - { THEME_WC(WC_RIDE_CONSTRUCTION), STR_THEMES_WINDOW_RIDE_CONSTRUCTION, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_RIDE_LIST), STR_THEMES_WINDOW_RIDE_LIST, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, - { THEME_WC(WC_SAVE_PROMPT), STR_THEMES_WINDOW_SAVE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, - { THEME_WC(WC_CONSTRUCT_RIDE), STR_THEMES_WINDOW_CONSTRUCT_RIDE, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, - { THEME_WC(WC_DEMOLISH_RIDE_PROMPT), STR_THEMES_WINDOW_DEMOLISH_RIDE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, - { THEME_WC(WC_SCENERY), STR_THEMES_WINDOW_SCENERY, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN ) }, - { THEME_WC(WC_OPTIONS), STR_THEMES_WINDOW_OPTIONS, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_FOOTPATH), STR_THEMES_WINDOW_FOOTPATH, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_LAND), STR_THEMES_WINDOW_LAND, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_WATER), STR_THEMES_WINDOW_WATER, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_PEEP), STR_THEMES_WINDOW_PEEP, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, - { THEME_WC(WC_GUEST_LIST), STR_THEMES_WINDOW_GUEST_LIST, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, - { THEME_WC(WC_STAFF_LIST), STR_THEMES_WINDOW_STAFF_LIST, COLOURS_3(COLOUR_GREY, COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE ) }, - { THEME_WC(WC_FIRE_PROMPT), STR_THEMES_WINDOW_FIRE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, - { THEME_WC(WC_PARK_INFORMATION), STR_THEMES_WINDOW_PARK_INFORMATION, COLOURS_3(COLOUR_GREY, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, - { THEME_WC(WC_FINANCES), STR_THEMES_WINDOW_FINANCES, COLOURS_3(COLOUR_GREY, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, - { THEME_WC(WC_TITLE_MENU), STR_THEMES_WINDOW_TITLE_MENU_BUTTONS, COLOURS_3(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN) ) }, - { THEME_WC(WC_TITLE_EXIT), STR_THEMES_WINDOW_TITLE_MENU_EXIT, COLOURS_3(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN) ) }, - { THEME_WC(WC_RECENT_NEWS), STR_THEMES_WINDOW_RECENT_NEWS, COLOURS_3(COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK ) }, - { THEME_WC(WC_SCENARIO_SELECT), STR_THEMES_WINDOW_TITLE_MENU_SCENARIO_SELECTION, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, - { THEME_WC(WC_TRACK_DESIGN_LIST), STR_THEMES_WINDOW_TRACK_DESIGN_LIST, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, - { THEME_WC(WC_TRACK_DESIGN_PLACE), STR_THEMES_WINDOW_TRACK_DESIGN_PLACE, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_NEW_CAMPAIGN), STR_THEMES_WINDOW_NEW_CAMPAIGN, COLOURS_3(COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, - { THEME_WC(WC_KEYBOARD_SHORTCUT_LIST), STR_THEMES_WINDOW_KEYBOARD_SHORTCUT_LIST, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + // WindowClass, WindowClassSZ WindowName NumColours, DefaultTheme + { THEME_WC(WC_TOP_TOOLBAR), STR_THEMES_WINDOW_TOP_TOOLBAR, COLOURS_4(COLOUR_LIGHT_BLUE, COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_GREY ) }, + { THEME_WC(WC_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR, COLOURS_4(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), COLOUR_BLACK, COLOUR_BRIGHT_GREEN ) }, + { THEME_WC(WC_RIDE), STR_THEMES_WINDOW_RIDE, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_GREY ) }, + { THEME_WC(WC_RIDE_CONSTRUCTION), STR_THEMES_WINDOW_RIDE_CONSTRUCTION, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_RIDE_LIST), STR_THEMES_WINDOW_RIDE_LIST, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, + { THEME_WC(WC_SAVE_PROMPT), STR_THEMES_WINDOW_SAVE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, + { THEME_WC(WC_CONSTRUCT_RIDE), STR_THEMES_WINDOW_CONSTRUCT_RIDE, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, + { THEME_WC(WC_DEMOLISH_RIDE_PROMPT), STR_THEMES_WINDOW_DEMOLISH_RIDE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, + { THEME_WC(WC_SCENERY), STR_THEMES_WINDOW_SCENERY, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN ) }, + { THEME_WC(WC_OPTIONS), STR_THEMES_WINDOW_OPTIONS, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_FOOTPATH), STR_THEMES_WINDOW_FOOTPATH, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_LAND), STR_THEMES_WINDOW_LAND, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_WATER), STR_THEMES_WINDOW_WATER, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_PEEP), STR_THEMES_WINDOW_PEEP, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, + { THEME_WC(WC_GUEST_LIST), STR_THEMES_WINDOW_GUEST_LIST, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, + { THEME_WC(WC_STAFF_LIST), STR_THEMES_WINDOW_STAFF_LIST, COLOURS_3(COLOUR_GREY, COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE ) }, + { THEME_WC(WC_FIRE_PROMPT), STR_THEMES_WINDOW_FIRE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, + { THEME_WC(WC_PARK_INFORMATION), STR_THEMES_WINDOW_PARK_INFORMATION, COLOURS_3(COLOUR_GREY, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, + { THEME_WC(WC_FINANCES), STR_THEMES_WINDOW_FINANCES, COLOURS_3(COLOUR_GREY, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, + { THEME_WC(WC_TITLE_MENU), STR_THEMES_WINDOW_TITLE_MENU_BUTTONS, COLOURS_3(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN) ) }, + { THEME_WC(WC_TITLE_EXIT), STR_THEMES_WINDOW_TITLE_MENU_EXIT, COLOURS_3(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN) ) }, + { THEME_WC(WC_RECENT_NEWS), STR_THEMES_WINDOW_RECENT_NEWS, COLOURS_3(COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK ) }, + { THEME_WC(WC_SCENARIO_SELECT), STR_THEMES_WINDOW_TITLE_MENU_SCENARIO_SELECTION, COLOURS_3(COLOUR_GREY, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, + { THEME_WC(WC_TRACK_DESIGN_LIST), STR_THEMES_WINDOW_TRACK_DESIGN_LIST, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, + { THEME_WC(WC_TRACK_DESIGN_PLACE), STR_THEMES_WINDOW_TRACK_DESIGN_PLACE, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_NEW_CAMPAIGN), STR_THEMES_WINDOW_NEW_CAMPAIGN, COLOURS_3(COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, + { THEME_WC(WC_KEYBOARD_SHORTCUT_LIST), STR_THEMES_WINDOW_KEYBOARD_SHORTCUT_LIST, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, { THEME_WC(WC_CHANGE_KEYBOARD_SHORTCUT), STR_THEMES_WINDOW_CHANGE_KEYBOARD_SHORTCUT, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_MAP), STR_THEMES_WINDOW_MAP, COLOURS_2(COLOUR_DARK_GREEN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_BANNER), STR_THEMES_WINDOW_BANNER, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_EDITOR_OBJECT_SELECTION), STR_THEMES_WINDOW_EDITOR_OBJECT_SELECTION, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, - { THEME_WC(WC_EDITOR_INVENTION_LIST), STR_THEMES_WINDOW_EDITOR_INVENTION_LIST, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, - { THEME_WC(WC_EDITOR_SCENARIO_OPTIONS), STR_THEMES_WINDOW_EDITOR_SCENARIO_OPTIONS, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, + { THEME_WC(WC_MAP), STR_THEMES_WINDOW_MAP, COLOURS_2(COLOUR_DARK_GREEN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_BANNER), STR_THEMES_WINDOW_BANNER, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_EDITOR_OBJECT_SELECTION), STR_THEMES_WINDOW_EDITOR_OBJECT_SELECTION, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, + { THEME_WC(WC_EDITOR_INVENTION_LIST), STR_THEMES_WINDOW_EDITOR_INVENTION_LIST, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, + { THEME_WC(WC_EDITOR_SCENARIO_OPTIONS), STR_THEMES_WINDOW_EDITOR_SCENARIO_OPTIONS, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, { THEME_WC(WC_EDTIOR_OBJECTIVE_OPTIONS), STR_THEMES_WINDOW_EDTIOR_OBJECTIVE_OPTIONS, COLOURS_3(COLOUR_LIGHT_PURPLE, COLOUR_GREY, COLOUR_GREY ) }, - { THEME_WC(WC_MANAGE_TRACK_DESIGN), STR_THEMES_WINDOW_MANAGE_TRACK_DESIGN, COLOURS_3(COLOUR_GREY, COLOUR_GREY, COLOUR_GREY ) }, - { THEME_WC(WC_TRACK_DELETE_PROMPT), STR_THEMES_WINDOW_TRACK_DELETE_PROMPT, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, - { THEME_WC(WC_INSTALL_TRACK), STR_THEMES_WINDOW_INSTALL_TRACK, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, - { THEME_WC(WC_CLEAR_SCENERY), STR_THEMES_WINDOW_CLEAR_SCENERY, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_CHEATS), STR_CHEAT_TITLE, COLOURS_2(COLOUR_GREY, COLOUR_DARK_YELLOW ) }, - { THEME_WC(WC_RESEARCH), STR_THEMES_WINDOW_RESEARCH, COLOURS_3(COLOUR_GREY, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, - { THEME_WC(WC_VIEWPORT), STR_THEMES_WINDOW_VIEWPORT, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_MAPGEN), STR_THEMES_WINDOW_MAPGEN, COLOURS_3(COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, - { THEME_WC(WC_LOADSAVE), STR_THEMES_WINDOW_LOADSAVE, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_LOADSAVE_OVERWRITE_PROMPT), STR_THEMES_WINDOW_LOADSAVE_OVERWRITE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, - { THEME_WC(WC_TITLE_OPTIONS), STR_THEMES_WINDOW_TITLE_MENU_OPTIONS, COLOURS_3(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN) ) }, - { THEME_WC(WC_LAND_RIGHTS), STR_THEMES_WINDOW_LAND_RIGHTS, COLOURS_3(COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, - { THEME_WC(WC_THEMES), STR_THEMES_WINDOW_THEMES, COLOURS_3(COLOUR_GREY, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN ) }, - { THEME_WC(WC_STAFF), STR_THEMES_WINDOW_STAFF, COLOURS_3(COLOUR_GREY, COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE ) }, - { THEME_WC(WC_EDITOR_TRACK_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR_TRACK_EDITOR, COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BLUE), TRANSLUCENT(COLOUR_LIGHT_BLUE), TRANSLUCENT(COLOUR_LIGHT_BLUE) ) }, - { THEME_WC(WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR_SCENARIO_EDITOR, COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_MOSS_GREEN) ) }, - { THEME_WC(WC_TITLE_EDITOR), STR_TITLE_EDITOR_TITLE, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, - { THEME_WC(WC_TILE_INSPECTOR), STR_TILE_INSPECTOR_TITLE, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_VIEW_CLIPPING), STR_VIEW_CLIPPING_TITLE, COLOURS_1(COLOUR_DARK_GREEN ) }, - { THEME_WC(WC_CHANGELOG), STR_CHANGELOG_TITLE, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_MULTIPLAYER), STR_MULTIPLAYER, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_PLAYER), STR_THEMES_WINDOW_PLAYER, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_NETWORK_STATUS), STR_THEMES_WINDOW_NETWORK_STATUS, COLOURS_1(COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_SERVER_LIST), STR_SERVER_LIST, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, - { THEME_WC(WC_CHAT), STR_CHAT, COLOURS_1(TRANSLUCENT(COLOUR_GREY) ) }, + { THEME_WC(WC_MANAGE_TRACK_DESIGN), STR_THEMES_WINDOW_MANAGE_TRACK_DESIGN, COLOURS_3(COLOUR_GREY, COLOUR_GREY, COLOUR_GREY ) }, + { THEME_WC(WC_TRACK_DELETE_PROMPT), STR_THEMES_WINDOW_TRACK_DELETE_PROMPT, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, + { THEME_WC(WC_INSTALL_TRACK), STR_THEMES_WINDOW_INSTALL_TRACK, COLOURS_3(COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) }, + { THEME_WC(WC_CLEAR_SCENERY), STR_THEMES_WINDOW_CLEAR_SCENERY, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_CHEATS), STR_CHEAT_TITLE, COLOURS_2(COLOUR_GREY, COLOUR_DARK_YELLOW ) }, + { THEME_WC(WC_RESEARCH), STR_THEMES_WINDOW_RESEARCH, COLOURS_3(COLOUR_GREY, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, + { THEME_WC(WC_VIEWPORT), STR_THEMES_WINDOW_VIEWPORT, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_MAPGEN), STR_THEMES_WINDOW_MAPGEN, COLOURS_3(COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) }, + { THEME_WC(WC_LOADSAVE), STR_THEMES_WINDOW_LOADSAVE, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_LOADSAVE_OVERWRITE_PROMPT), STR_THEMES_WINDOW_LOADSAVE_OVERWRITE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) }, + { THEME_WC(WC_TITLE_OPTIONS), STR_THEMES_WINDOW_TITLE_MENU_OPTIONS, COLOURS_3(TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN), TRANSLUCENT(COLOUR_DARK_GREEN) ) }, + { THEME_WC(WC_LAND_RIGHTS), STR_THEMES_WINDOW_LAND_RIGHTS, COLOURS_3(COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW, COLOUR_DARK_YELLOW ) }, + { THEME_WC(WC_THEMES), STR_THEMES_WINDOW_THEMES, COLOURS_3(COLOUR_GREY, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN ) }, + { THEME_WC(WC_STAFF), STR_THEMES_WINDOW_STAFF, COLOURS_3(COLOUR_GREY, COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE ) }, + { THEME_WC(WC_EDITOR_TRACK_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR_TRACK_EDITOR, COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BLUE), TRANSLUCENT(COLOUR_LIGHT_BLUE), TRANSLUCENT(COLOUR_LIGHT_BLUE) ) }, + { THEME_WC(WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR_SCENARIO_EDITOR, COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_MOSS_GREEN) ) }, + { THEME_WC(WC_TITLE_EDITOR), STR_TITLE_EDITOR_TITLE, COLOURS_3(COLOUR_GREY, COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN ) }, + { THEME_WC(WC_TILE_INSPECTOR), STR_TILE_INSPECTOR_TITLE, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_VIEW_CLIPPING), STR_VIEW_CLIPPING_TITLE, COLOURS_1(COLOUR_DARK_GREEN ) }, + { THEME_WC(WC_CHANGELOG), STR_CHANGELOG_TITLE, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_MULTIPLAYER), STR_MULTIPLAYER, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_PLAYER), STR_THEMES_WINDOW_PLAYER, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_NETWORK_STATUS), STR_THEMES_WINDOW_NETWORK_STATUS, COLOURS_1(COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_SERVER_LIST), STR_SERVER_LIST, COLOURS_2(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) }, + { THEME_WC(WC_CHAT), STR_CHAT, COLOURS_1(TRANSLUCENT(COLOUR_GREY) ) }, }; #pragma endregion @@ -706,6 +706,12 @@ extern "C" } ThemeManager::ActiveAvailableThemeIndex = index; String::DiscardDuplicate(&gConfigInterface.current_theme_preset, theme_manager_get_available_theme_name(index)); + + // Apply the selected theme to all open windows + for (rct_window *w = g_window_list; w < gWindowNextSlot; w++) + { + colour_scheme_update(w); + } } uint8 theme_get_colour(rct_windowclass wc, uint8 index) @@ -871,6 +877,13 @@ extern "C" else { const WindowThemeDesc * desc = GetWindowThemeDescriptor(classification); + + // Some windows don't have a theme set (e.g. main window, title screen) + if (desc == nullptr) + { + return; + } + windowTheme = &desc->DefaultTheme; } diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index b3823d4cd1..2b349e541b 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -20,6 +20,7 @@ #include "../editor.h" #include "../game.h" #include "../input.h" +#include "../interface/themes.h" #include "../interface/Cursors.h" #include "../localisation/localisation.h" #include "../localisation/string_ids.h" @@ -478,6 +479,7 @@ rct_window *window_create(sint32 x, sint32 y, sint32 width, sint32 height, rct_w w->var_4AE = 0; RCT2_NEW_WINDOW++; + colour_scheme_update(w); window_invalidate(w); return w; } @@ -2511,7 +2513,7 @@ void window_cancel_textbox() gCurrentTextBox.window.number ); window_event_textinput_call(w, gCurrentTextBox.widget_index, NULL); - gCurrentTextBox.window.classification = 255; + gCurrentTextBox.window.classification = WC_NULL; gCurrentTextBox.window.number = 0; platform_stop_text_input(); gUsingWidgetTextBox = false; diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 5d52efc37c..78e30f0965 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -480,6 +480,8 @@ enum { WC_EDITOR_TRACK_BOTTOM_TOOLBAR = 221, WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR = 222, WC_CHAT = 223, + + WC_NULL = 255, }; #define validate_global_widx(wc, widx) \ diff --git a/src/openrct2/windows/about.c b/src/openrct2/windows/about.c index 371932608e..6dc44a88f9 100644 --- a/src/openrct2/windows/about.c +++ b/src/openrct2/windows/about.c @@ -16,7 +16,6 @@ #include "../localisation/localisation.h" #include "../sprites.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/openrct2/windows/banner.c b/src/openrct2/windows/banner.c index 865bdf06a6..ae3b521d12 100644 --- a/src/openrct2/windows/banner.c +++ b/src/openrct2/windows/banner.c @@ -26,7 +26,6 @@ #include "error.h" #include "dropdown.h" #include "../drawing/drawing.h" -#include "../interface/themes.h" #include "../sprites.h" #define WW 113 @@ -300,8 +299,6 @@ static void window_banner_textinput(rct_window *w, rct_widgetindex widgetIndex, */ static void window_banner_invalidate(rct_window *w) { - colour_scheme_update(w); - rct_banner* banner = &gBanners[w->number]; rct_widget* colour_btn = &window_banner_widgets[WIDX_MAIN_COLOUR]; colour_btn->type = WWT_EMPTY; diff --git a/src/openrct2/windows/changelog.c b/src/openrct2/windows/changelog.c index 8d1880a5e5..a5a0468180 100644 --- a/src/openrct2/windows/changelog.c +++ b/src/openrct2/windows/changelog.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -171,8 +170,6 @@ static void window_changelog_scrollgetsize(rct_window *w, sint32 scrollIndex, si static void window_changelog_invalidate(rct_window *w) { - colour_scheme_update(w); - window_changelog_widgets[WIDX_BACKGROUND].right = w->width - 1; window_changelog_widgets[WIDX_BACKGROUND].bottom = w->height - 1; window_changelog_widgets[WIDX_TITLE].right = w->width - 2; diff --git a/src/openrct2/windows/cheats.c b/src/openrct2/windows/cheats.c index d41424a478..227dbb0cf7 100644 --- a/src/openrct2/windows/cheats.c +++ b/src/openrct2/windows/cheats.c @@ -27,7 +27,6 @@ #include "../world/Climate.h" #include "../world/park.h" #include "../world/sprite.h" -#include "../interface/themes.h" #include "../cheats.h" #include "../network/network.h" #include "../management/marketing.h" @@ -852,8 +851,6 @@ static void window_cheats_invalidate(rct_window *w) { sint32 i; - colour_scheme_update(w); - rct_widget *widgets = window_cheats_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; diff --git a/src/openrct2/windows/clear_scenery.c b/src/openrct2/windows/clear_scenery.c index e7bcf0fc42..65db08efd8 100644 --- a/src/openrct2/windows/clear_scenery.c +++ b/src/openrct2/windows/clear_scenery.c @@ -15,7 +15,6 @@ #pragma endregion #include "../input.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -213,8 +212,6 @@ static void window_clear_scenery_update(rct_window *w) */ static void window_clear_scenery_invalidate(rct_window *w) { - colour_scheme_update(w); - // Set the preview image button to be pressed down w->pressed_widgets = (1 << WIDX_PREVIEW) | (gClearSmallScenery ? (1 << WIDX_SMALL_SCENERY) : 0) | diff --git a/src/openrct2/windows/debug_paint.c b/src/openrct2/windows/debug_paint.c index 8dfe31cc9c..ebaf5e867e 100644 --- a/src/openrct2/windows/debug_paint.c +++ b/src/openrct2/windows/debug_paint.c @@ -15,7 +15,6 @@ #pragma endregion #include "../input.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" diff --git a/src/openrct2/windows/demolish_ride_prompt.c b/src/openrct2/windows/demolish_ride_prompt.c index 8f0382e465..8740eb973a 100644 --- a/src/openrct2/windows/demolish_ride_prompt.c +++ b/src/openrct2/windows/demolish_ride_prompt.c @@ -22,7 +22,6 @@ #include "../peep/staff.h" #include "../sprites.h" #include "../world/sprite.h" -#include "../interface/themes.h" #define WW 200 #define WH 100 @@ -46,7 +45,6 @@ static rct_widget window_ride_demolish_widgets[] = { }; static void window_ride_demolish_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_ride_demolish_invalidate(rct_window *w); static void window_ride_demolish_paint(rct_window *w, rct_drawpixelinfo *dpi); //0x0098E2E4 @@ -76,7 +74,7 @@ static rct_window_event_list window_ride_demolish_events = { NULL, NULL, NULL, - window_ride_demolish_invalidate, + NULL, window_ride_demolish_paint, NULL }; @@ -116,11 +114,6 @@ static void window_ride_demolish_mouseup(rct_window *w, rct_widgetindex widgetIn } } -static void window_ride_demolish_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - /** * * rct2: 0x006B48E5 diff --git a/src/openrct2/windows/editor_inventions_list.c b/src/openrct2/windows/editor_inventions_list.c index f6bb003416..854642ea37 100644 --- a/src/openrct2/windows/editor_inventions_list.c +++ b/src/openrct2/windows/editor_inventions_list.c @@ -17,7 +17,6 @@ #include "../editor.h" #include "../input.h" #include "../interface/Cursors.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -722,8 +721,6 @@ static void window_editor_inventions_list_cursor(rct_window *w, rct_widgetindex */ static void window_editor_inventions_list_invalidate(rct_window *w) { - colour_scheme_update(w); - w->pressed_widgets |= 1 << WIDX_PREVIEW; w->pressed_widgets |= 1 << WIDX_TAB_1; diff --git a/src/openrct2/windows/editor_object_selection.c b/src/openrct2/windows/editor_object_selection.c index 0eabe3f04e..8af147ba87 100644 --- a/src/openrct2/windows/editor_object_selection.c +++ b/src/openrct2/windows/editor_object_selection.c @@ -20,7 +20,6 @@ #include "../config/Config.h" #include "../game.h" #include "../editor.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -1109,8 +1108,6 @@ static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetinde */ static void window_editor_object_selection_invalidate(rct_window *w) { - colour_scheme_update(w); - // Resize widgets w->widgets[WIDX_BACKGROUND].right = w->width - 1; w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; diff --git a/src/openrct2/windows/editor_objective_options.c b/src/openrct2/windows/editor_objective_options.c index a1c3c8c9c3..1424044f13 100644 --- a/src/openrct2/windows/editor_objective_options.c +++ b/src/openrct2/windows/editor_objective_options.c @@ -15,7 +15,6 @@ #pragma endregion #include "../game.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/date.h" @@ -828,8 +827,6 @@ static void window_editor_objective_options_main_invalidate(rct_window *w) rct_widget *widgets; rct_stex_entry *stex; - colour_scheme_update(w); - stex = g_stexEntries[0]; if (stex == (rct_stex_entry*)-1) stex = NULL; @@ -1161,8 +1158,6 @@ static void window_editor_objective_options_rides_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_editor_objective_options_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index 08d7a28077..a9a27a0f84 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -16,7 +16,6 @@ #include "../editor.h" #include "../game.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -719,8 +718,6 @@ static void window_editor_scenario_options_financial_update(rct_window *w) */ static void window_editor_scenario_options_financial_invalidate(rct_window *w) { - colour_scheme_update(w); - rct_widget *widgets = window_editor_scenario_options_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -1027,8 +1024,6 @@ static void window_editor_scenario_options_guests_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_editor_scenario_options_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -1382,8 +1377,6 @@ static void window_editor_scenario_options_park_invalidate(rct_window *w) { uint64 pressedWidgets; - colour_scheme_update(w); - rct_widget *widgets = window_editor_scenario_options_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; diff --git a/src/openrct2/windows/finances.c b/src/openrct2/windows/finances.c index 34ac3b5d0c..5cbacf4e7f 100644 --- a/src/openrct2/windows/finances.c +++ b/src/openrct2/windows/finances.c @@ -29,7 +29,6 @@ #include "../scenario/scenario.h" #include "../sprites.h" #include "dropdown.h" -#include "../interface/themes.h" enum { WINDOW_FINANCES_PAGE_SUMMARY, @@ -644,8 +643,6 @@ static void window_finances_summary_update(rct_window *w) */ static void window_finances_summary_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_SUMMARY]) { w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_SUMMARY]; window_init_scroll_widgets(w); @@ -800,8 +797,6 @@ static void window_finances_financial_graph_update(rct_window *w) */ static void window_finances_financial_graph_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH]) { w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH]; window_init_scroll_widgets(w); @@ -910,8 +905,6 @@ static void window_finances_park_value_graph_update(rct_window *w) */ static void window_finances_park_value_graph_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH]) { w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH]; window_init_scroll_widgets(w); @@ -1016,8 +1009,6 @@ static void window_finances_profit_graph_update(rct_window *w) */ static void window_finances_profit_graph_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH]) { w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH]; window_init_scroll_widgets(w); @@ -1127,8 +1118,6 @@ static void window_finances_marketing_invalidate(rct_window *w) { sint32 i; - colour_scheme_update(w); - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_MARKETING]) { w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_MARKETING]; window_init_scroll_widgets(w); @@ -1338,8 +1327,6 @@ static void window_finances_research_update(rct_window *w) */ static void window_finances_research_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_finances_page_widgets[WINDOW_FINANCES_PAGE_RESEARCH]) { w->widgets = window_finances_page_widgets[WINDOW_FINANCES_PAGE_RESEARCH]; window_init_scroll_widgets(w); diff --git a/src/openrct2/windows/footpath.c b/src/openrct2/windows/footpath.c index 4f2a74c541..3cb67dc750 100644 --- a/src/openrct2/windows/footpath.c +++ b/src/openrct2/windows/footpath.c @@ -18,7 +18,6 @@ #include "../cheats.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../localisation/localisation.h" @@ -545,8 +544,6 @@ static void window_footpath_invalidate(rct_window *w) sint32 selectedPath; rct_footpath_entry *pathType; - colour_scheme_update(w); - // Press / unpress footpath and queue type buttons w->pressed_widgets &= ~(1 << WIDX_FOOTPATH_TYPE); w->pressed_widgets &= ~(1 << WIDX_QUEUELINE_TYPE); diff --git a/src/openrct2/windows/game_bottom_toolbar.c b/src/openrct2/windows/game_bottom_toolbar.c index 93c1cc4167..734fb837fd 100644 --- a/src/openrct2/windows/game_bottom_toolbar.c +++ b/src/openrct2/windows/game_bottom_toolbar.c @@ -17,7 +17,6 @@ #include "../config/Config.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/date.h" @@ -242,8 +241,6 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w) sint32 x; NewsItem *newsItem; - colour_scheme_update(w); - // Anchor the middle and right panel to the right x = gScreenWidth; w->width = x; diff --git a/src/openrct2/windows/guest.c b/src/openrct2/windows/guest.c index 922cde0462..4b687f8cc8 100644 --- a/src/openrct2/windows/guest.c +++ b/src/openrct2/windows/guest.c @@ -26,7 +26,6 @@ #include "../scenario/scenario.h" #include "../localisation/localisation.h" #include "../sprites.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -1053,8 +1052,6 @@ void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) */ void window_guest_overview_invalidate(rct_window *w) { - colour_scheme_update(w); - if (window_guest_page_widgets[w->page] != w->widgets){ w->widgets = window_guest_page_widgets[w->page]; window_init_scroll_widgets(w); @@ -1303,8 +1300,6 @@ void window_guest_stats_update(rct_window *w) */ void window_guest_stats_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_guest_page_widgets[w->page]) { w->widgets = window_guest_page_widgets[w->page]; window_init_scroll_widgets(w); @@ -1634,8 +1629,6 @@ void window_guest_rides_scroll_mouse_over(rct_window *w, sint32 scrollIndex, sin */ void window_guest_rides_invalidate(rct_window *w) { - colour_scheme_update(w); - if (window_guest_page_widgets[w->page] != w->widgets){ w->widgets = window_guest_page_widgets[w->page]; window_init_scroll_widgets(w); @@ -1760,8 +1753,6 @@ void window_guest_finance_update(rct_window *w) */ void window_guest_finance_invalidate(rct_window *w) { - colour_scheme_update(w); - if (window_guest_page_widgets[w->page] != w->widgets){ w->widgets = window_guest_page_widgets[w->page]; window_init_scroll_widgets(w); @@ -1903,8 +1894,6 @@ void window_guest_thoughts_update(rct_window *w) */ void window_guest_thoughts_invalidate(rct_window *w) { - colour_scheme_update(w); - if (window_guest_page_widgets[w->page] != w->widgets){ w->widgets = window_guest_page_widgets[w->page]; window_init_scroll_widgets(w); @@ -2005,8 +1994,6 @@ void window_guest_inventory_update(rct_window *w) */ void window_guest_inventory_invalidate(rct_window *w) { - colour_scheme_update(w); - if (window_guest_page_widgets[w->page] != w->widgets){ w->widgets = window_guest_page_widgets[w->page]; window_init_scroll_widgets(w); diff --git a/src/openrct2/windows/guest_list.c b/src/openrct2/windows/guest_list.c index 238fecfcab..ba10e5d44a 100644 --- a/src/openrct2/windows/guest_list.c +++ b/src/openrct2/windows/guest_list.c @@ -16,7 +16,6 @@ #include "../config/Config.h" #include "../game.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -596,8 +595,6 @@ static void window_guest_list_tooltip(rct_window* w, rct_widgetindex widgetIndex */ static void window_guest_list_invalidate(rct_window *w) { - colour_scheme_update(w); - w->pressed_widgets &= ~(1 << WIDX_TAB_1); w->pressed_widgets &= ~(1 << WIDX_TAB_2); w->pressed_widgets |= (1LL << (_window_guest_list_selected_tab + WIDX_TAB_1)); diff --git a/src/openrct2/windows/install_track.c b/src/openrct2/windows/install_track.c index b015cb45e2..bdd2e2710b 100644 --- a/src/openrct2/windows/install_track.c +++ b/src/openrct2/windows/install_track.c @@ -16,7 +16,6 @@ #include "../audio/audio.h" #include "../editor.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -191,8 +190,6 @@ static void window_install_track_mouseup(rct_window *w, rct_widgetindex widgetIn */ static void window_install_track_invalidate(rct_window *w) { - colour_scheme_update(w); - w->pressed_widgets |= 1 << WIDX_TRACK_PREVIEW; if (!gTrackDesignSceneryToggle) { w->pressed_widgets |= (1 << WIDX_TOGGLE_SCENERY); diff --git a/src/openrct2/windows/land.c b/src/openrct2/windows/land.c index 5b11f4c903..68acfbf88f 100644 --- a/src/openrct2/windows/land.c +++ b/src/openrct2/windows/land.c @@ -15,7 +15,6 @@ #pragma endregion #include "../input.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -338,8 +337,6 @@ static void window_land_update(rct_window *w) */ static void window_land_invalidate(rct_window *w) { - colour_scheme_update(w); - w->pressed_widgets = (1 << WIDX_PREVIEW); if (gLandToolTerrainSurface != 255) w->pressed_widgets |= (1 << WIDX_FLOOR); diff --git a/src/openrct2/windows/land_rights.c b/src/openrct2/windows/land_rights.c index 47a392339a..b888f1522d 100644 --- a/src/openrct2/windows/land_rights.c +++ b/src/openrct2/windows/land_rights.c @@ -16,7 +16,6 @@ #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -206,8 +205,6 @@ static void window_land_rights_update(rct_window *w) static void window_land_rights_invalidate(rct_window *w) { - colour_scheme_update(w); - // Set the preview image button to be pressed down w->pressed_widgets |= (1 << WIDX_PREVIEW) | (1 << (LandRightsMode ? WIDX_BUY_LAND_RIGHTS : WIDX_BUY_CONSTRUCTION_RIGHTS)); w->pressed_widgets &= ~(1 << (!LandRightsMode ? WIDX_BUY_LAND_RIGHTS : WIDX_BUY_CONSTRUCTION_RIGHTS)); diff --git a/src/openrct2/windows/loadsave.c b/src/openrct2/windows/loadsave.c index a96152b727..755e485276 100644 --- a/src/openrct2/windows/loadsave.c +++ b/src/openrct2/windows/loadsave.c @@ -19,7 +19,6 @@ #include "../core/Guard.hpp" #include "../editor.h" #include "../game.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -75,7 +74,6 @@ static void window_loadsave_scrollmousedown(rct_window *w, sint32 scrollIndex, s static void window_loadsave_scrollmouseover(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); static void window_loadsave_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text); static void window_loadsave_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId); -static void window_loadsave_invalidate(rct_window *w); static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); @@ -105,7 +103,7 @@ static rct_window_event_list window_loadsave_events = { window_loadsave_tooltip, NULL, NULL, - window_loadsave_invalidate, + NULL, window_loadsave_paint, window_loadsave_scrollpaint }; @@ -469,11 +467,6 @@ static void window_loadsave_tooltip(rct_window* w, rct_widgetindex widgetIndex, set_format_arg(0, rct_string_id, STR_LIST); } -static void window_loadsave_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); @@ -858,7 +851,6 @@ static rct_widget window_overwrite_prompt_widgets[] = { }; static void window_overwrite_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_overwrite_prompt_invalidate(rct_window *w); static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi); static rct_window_event_list window_overwrite_prompt_events = { @@ -887,7 +879,7 @@ static rct_window_event_list window_overwrite_prompt_events = { NULL, NULL, NULL, - window_overwrite_prompt_invalidate, + NULL, window_overwrite_prompt_paint, NULL }; @@ -934,11 +926,6 @@ static void window_overwrite_prompt_mouseup(rct_window *w, rct_widgetindex widge } } -static void window_overwrite_prompt_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); diff --git a/src/openrct2/windows/map.c b/src/openrct2/windows/map.c index e7a4a26c41..50c2bfa422 100644 --- a/src/openrct2/windows/map.c +++ b/src/openrct2/windows/map.c @@ -18,7 +18,6 @@ #include "../cheats.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -690,8 +689,6 @@ static void window_map_invalidate(rct_window *w) uint64 pressedWidgets; sint32 i, height; - colour_scheme_update(w); - // Set the pressed widgets pressedWidgets = w->pressed_widgets; pressedWidgets &= (1ULL << WIDX_PEOPLE_TAB); diff --git a/src/openrct2/windows/mapgen.c b/src/openrct2/windows/mapgen.c index dec7e26b04..2eb9680ed8 100644 --- a/src/openrct2/windows/mapgen.c +++ b/src/openrct2/windows/mapgen.c @@ -24,7 +24,6 @@ #include "../world/mapgen.h" #include "../world/scenery.h" #include "dropdown.h" -#include "../interface/themes.h" #include "../localisation/string_ids.h" enum { @@ -821,8 +820,6 @@ static void window_mapgen_textinput(rct_window *w, rct_widgetindex widgetIndex, static void window_mapgen_base_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_BASE]) { w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_BASE]; window_init_scroll_widgets(w); @@ -910,8 +907,6 @@ static void window_mapgen_random_update(rct_window *w) static void window_mapgen_random_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM]) { w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_RANDOM]; window_init_scroll_widgets(w); @@ -1113,8 +1108,6 @@ static void window_mapgen_simplex_update(rct_window *w) static void window_mapgen_simplex_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_SIMPLEX]) { w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_SIMPLEX]; window_init_scroll_widgets(w); @@ -1276,8 +1269,6 @@ static void window_mapgen_heightmap_mouseup(rct_window *w, rct_widgetindex widge static void window_mapgen_heightmap_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP]) { w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_HEIGHTMAP]; diff --git a/src/openrct2/windows/maze_construction.c b/src/openrct2/windows/maze_construction.c index ef33bb01eb..fa26e1fb50 100644 --- a/src/openrct2/windows/maze_construction.c +++ b/src/openrct2/windows/maze_construction.c @@ -18,7 +18,6 @@ #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -153,7 +152,6 @@ rct_window *window_maze_construction_open() (1ULL << WIDX_MAZE_EXIT); window_init_scroll_widgets(w); - colour_scheme_update(w); w->number = _currentRideIndex; diff --git a/src/openrct2/windows/multiplayer.c b/src/openrct2/windows/multiplayer.c index 88c6205efc..a63299bb9e 100644 --- a/src/openrct2/windows/multiplayer.c +++ b/src/openrct2/windows/multiplayer.c @@ -15,7 +15,6 @@ #pragma endregion #include "../config/Config.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -426,7 +425,6 @@ static void window_multiplayer_information_update(rct_window *w) static void window_multiplayer_information_invalidate(rct_window *w) { - colour_scheme_update(w); window_multiplayer_set_pressed_tab(w); window_multiplayer_anchor_border_widgets(w); window_align_tabs(w, WIDX_TAB1, WIDX_TAB4); @@ -563,8 +561,6 @@ static void window_multiplayer_players_scrollmouseover(rct_window *w, sint32 scr static void window_multiplayer_players_invalidate(rct_window *w) { - colour_scheme_update(w); - window_multiplayer_set_pressed_tab(w); window_multiplayer_anchor_border_widgets(w); window_multiplayer_players_widgets[WIDX_LIST].right = w->width - 4; @@ -799,7 +795,6 @@ static void window_multiplayer_groups_text_input(rct_window *w, rct_widgetindex static void window_multiplayer_groups_invalidate(rct_window *w) { - colour_scheme_update(w); window_multiplayer_set_pressed_tab(w); window_multiplayer_anchor_border_widgets(w); window_multiplayer_groups_widgets[WIDX_PERMISSIONS_LIST].right = w->width - 4; @@ -943,7 +938,6 @@ static void window_multiplayer_options_update(rct_window *w) static void window_multiplayer_options_invalidate(rct_window *w) { - colour_scheme_update(w); window_multiplayer_set_pressed_tab(w); window_multiplayer_anchor_border_widgets(w); window_align_tabs(w, WIDX_TAB1, WIDX_TAB4); diff --git a/src/openrct2/windows/network_status.c b/src/openrct2/windows/network_status.c index f12ea666ce..5f5342e2f4 100644 --- a/src/openrct2/windows/network_status.c +++ b/src/openrct2/windows/network_status.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -161,8 +160,6 @@ static void window_network_status_textinput(rct_window *w, rct_widgetindex widge static void window_network_status_invalidate(rct_window *w) { - colour_scheme_update(w); - window_network_status_widgets[WIDX_BACKGROUND].right = w->width - 1; window_network_status_widgets[WIDX_BACKGROUND].bottom = w->height - 1; window_network_status_widgets[WIDX_TITLE].right = w->width - 2; diff --git a/src/openrct2/windows/new_campaign.c b/src/openrct2/windows/new_campaign.c index 45333fbbf4..09e8a7bbcb 100644 --- a/src/openrct2/windows/new_campaign.c +++ b/src/openrct2/windows/new_campaign.c @@ -23,7 +23,6 @@ #include "../ride/ride.h" #include "../ride/ride_data.h" #include "dropdown.h" -#include "../interface/themes.h" #define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF) @@ -329,8 +328,6 @@ static void window_new_campaign_dropdown(rct_window *w, rct_widgetindex widgetIn */ static void window_new_campaign_invalidate(rct_window *w) { - colour_scheme_update(w); - window_new_campaign_widgets[WIDX_RIDE_LABEL].type = WWT_EMPTY; window_new_campaign_widgets[WIDX_RIDE_DROPDOWN].type = WWT_EMPTY; window_new_campaign_widgets[WIDX_RIDE_DROPDOWN_BUTTON].type = WWT_EMPTY; diff --git a/src/openrct2/windows/new_ride.c b/src/openrct2/windows/new_ride.c index 932ffcbb50..2fdffcd9f6 100644 --- a/src/openrct2/windows/new_ride.c +++ b/src/openrct2/windows/new_ride.c @@ -19,7 +19,6 @@ #include "../game.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../interface/themes.h" #include "../localisation/localisation.h" #include "../management/news_item.h" #include "../management/research.h" @@ -737,8 +736,6 @@ static void window_new_ride_tooltip(rct_window* w, rct_widgetindex widgetIndex, */ static void window_new_ride_invalidate(rct_window *w) { - colour_scheme_update(w); - window_new_ride_set_pressed_tab(w); window_new_ride_widgets[WIDX_TITLE].text = window_new_ride_titles[_windowNewRideCurrentTab]; diff --git a/src/openrct2/windows/news.c b/src/openrct2/windows/news.c index 831f3f382a..ac2cd2ad3d 100644 --- a/src/openrct2/windows/news.c +++ b/src/openrct2/windows/news.c @@ -22,7 +22,6 @@ #include "../sprites.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../interface/themes.h" enum WINDOW_NEWS_WIDGET_IDX { WIDX_BACKGROUND, @@ -46,7 +45,6 @@ static void window_news_update(rct_window *w); static void window_news_scrollgetsize(rct_window *w, sint32 scrollIndex, sint32 *width, sint32 *height); static void window_news_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 x, sint32 y); static void window_news_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId); -static void window_news_invalidate(rct_window *w); static void window_news_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, sint32 scrollIndex); @@ -76,7 +74,7 @@ static rct_window_event_list window_news_events = { window_news_tooltip, NULL, NULL, - window_news_invalidate, + NULL, window_news_paint, window_news_scrollpaint }; @@ -261,11 +259,6 @@ static void window_news_paint(rct_window *w, rct_drawpixelinfo *dpi) window_draw_widgets(w, dpi); } -static void window_news_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - /** * * rct2: 0x0066E4EE diff --git a/src/openrct2/windows/news_options.c b/src/openrct2/windows/news_options.c index 4ebe48805a..eb0071e13f 100644 --- a/src/openrct2/windows/news_options.c +++ b/src/openrct2/windows/news_options.c @@ -198,8 +198,6 @@ static void window_news_options_update(rct_window *w) static void window_news_options_invalidate(rct_window *w) { - // colour_scheme_update(w); - // Set pressed tab w->pressed_widgets &= ~(1ULL << WIDX_TAB_PARK); w->pressed_widgets &= ~(1ULL << WIDX_TAB_RIDE); diff --git a/src/openrct2/windows/options.c b/src/openrct2/windows/options.c index 07194f02f8..c52aeb1499 100644 --- a/src/openrct2/windows/options.c +++ b/src/openrct2/windows/options.c @@ -584,9 +584,6 @@ void window_options_open() w->page = WINDOW_OPTIONS_PAGE_DISPLAY; w->frame_no = 0; window_init_scroll_widgets(w); - //window_invalidate(w); - - colour_scheme_update(w); } @@ -1485,8 +1482,6 @@ static void window_options_invalidate(rct_window *w) { rct_widget* widget; - colour_scheme_update(w); - if (window_options_page_widgets[w->page] != w->widgets) { w->widgets = window_options_page_widgets[w->page]; window_init_scroll_widgets(w); diff --git a/src/openrct2/windows/park.c b/src/openrct2/windows/park.c index 936390e82e..d2a5b50ef9 100644 --- a/src/openrct2/windows/park.c +++ b/src/openrct2/windows/park.c @@ -964,8 +964,6 @@ static void window_park_entrance_invalidate(rct_window *w) { sint32 i, height; - colour_scheme_update(w); - w->widgets = window_park_page_widgets[w->page]; window_init_scroll_widgets(w); @@ -1232,8 +1230,6 @@ static void window_park_rating_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_park_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -1349,8 +1345,6 @@ static void window_park_guests_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_park_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -1468,8 +1462,6 @@ static void window_park_price_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_park_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -1586,8 +1578,6 @@ static void window_park_stats_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_park_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -1752,8 +1742,6 @@ static void window_park_objective_textinput(rct_window *w, rct_widgetindex widge */ static void window_park_objective_invalidate(rct_window *w) { - colour_scheme_update(w); - window_park_set_pressed_tab(w); window_park_prepare_window_title_text(); @@ -1883,8 +1871,6 @@ static void window_park_awards_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_park_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; diff --git a/src/openrct2/windows/player.c b/src/openrct2/windows/player.c index 1be41a50b4..5d44a35424 100644 --- a/src/openrct2/windows/player.c +++ b/src/openrct2/windows/player.c @@ -26,7 +26,6 @@ #include "../scenario/scenario.h" #include "../localisation/localisation.h" #include "../sprites.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -412,8 +411,6 @@ void window_player_overview_invalidate(rct_window *w) window_init_scroll_widgets(w); } - colour_scheme_update(w); - w->pressed_widgets &= ~(WIDX_TAB_1); w->pressed_widgets &= ~(WIDX_TAB_2); w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1); @@ -498,8 +495,6 @@ void window_player_statistics_invalidate(rct_window *w) window_init_scroll_widgets(w); } - colour_scheme_update(w); - w->pressed_widgets &= ~(WIDX_TAB_1); w->pressed_widgets &= ~(WIDX_TAB_2); w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1); diff --git a/src/openrct2/windows/research.c b/src/openrct2/windows/research.c index 10f9652b08..c988bf2ba5 100644 --- a/src/openrct2/windows/research.c +++ b/src/openrct2/windows/research.c @@ -25,7 +25,6 @@ #include "../sprites.h" #include "../world/scenery.h" #include "dropdown.h" -#include "../interface/themes.h" #include "../rct1.h" enum { @@ -305,8 +304,6 @@ static void window_research_development_update(rct_window *w) */ static void window_research_development_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_DEVELOPMENT]) { w->widgets = window_research_page_widgets[WINDOW_RESEARCH_PAGE_DEVELOPMENT]; window_init_scroll_widgets(w); @@ -520,8 +517,6 @@ static void window_research_funding_update(rct_window *w) */ static void window_research_funding_invalidate(rct_window *w) { - colour_scheme_update(w); - if (w->widgets != window_research_page_widgets[WINDOW_RESEARCH_PAGE_FUNDING]) { w->widgets = window_research_page_widgets[WINDOW_RESEARCH_PAGE_FUNDING]; window_init_scroll_widgets(w); diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index e56cc425d5..6d869ef720 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -2330,8 +2330,6 @@ static void window_ride_main_invalidate(rct_window *w) rct_widget *widgets; sint32 i, height; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -2803,8 +2801,6 @@ static void window_ride_vehicle_invalidate(rct_window *w) rct_string_id stringId; sint32 carsPerTrain; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -3381,8 +3377,6 @@ static void window_ride_operating_invalidate(rct_window *w) rct_ride_entry *rideEntry; rct_string_id format, caption, tooltip; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -3916,8 +3910,6 @@ static void window_ride_maintenance_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -4411,8 +4403,6 @@ static void window_ride_colour_invalidate(rct_window *w) track_colour trackColour; vehicle_colour vehicleColour; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -4891,8 +4881,6 @@ static void window_ride_music_invalidate(rct_window *w) rct_widget *widgets; sint32 isMusicActivated; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -5171,8 +5159,6 @@ static void window_ride_measurements_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -5569,8 +5555,6 @@ static void window_ride_graphs_invalidate(rct_window *w) rct_ride *ride; sint32 x, y; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -6001,8 +5985,6 @@ static void window_ride_income_invalidate(rct_window *w) rct_ride_entry *rideEntry; sint32 primaryItem, secondaryItem; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; @@ -6249,8 +6231,6 @@ static void window_ride_customer_invalidate(rct_window *w) { rct_widget *widgets; - colour_scheme_update(w); - widgets = window_ride_page_widgets[w->page]; if (w->widgets != widgets) { w->widgets = widgets; diff --git a/src/openrct2/windows/ride_construction.c b/src/openrct2/windows/ride_construction.c index d8ad384bba..b9b7f4a9b2 100644 --- a/src/openrct2/windows/ride_construction.c +++ b/src/openrct2/windows/ride_construction.c @@ -20,7 +20,6 @@ #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -633,7 +632,6 @@ rct_window *window_ride_construction_open() _autoOpeningShop = false; _trackPlaceCtrlState = false; _trackPlaceShiftState = false; - colour_scheme_update(w); return w; } diff --git a/src/openrct2/windows/ride_list.c b/src/openrct2/windows/ride_list.c index 9df7ea35d9..509cbab759 100644 --- a/src/openrct2/windows/ride_list.c +++ b/src/openrct2/windows/ride_list.c @@ -471,9 +471,6 @@ static void window_ride_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, */ static void window_ride_list_invalidate(rct_window *w) { - - colour_scheme_update(w); - window_ride_list_widgets[WIDX_CURRENT_INFORMATION_TYPE].text = ride_info_type_string_mapping[_window_ride_list_information_type]; // Set correct active tab diff --git a/src/openrct2/windows/save_prompt.c b/src/openrct2/windows/save_prompt.c index c67171ee54..63c8a14605 100644 --- a/src/openrct2/windows/save_prompt.c +++ b/src/openrct2/windows/save_prompt.c @@ -18,7 +18,6 @@ #include "../config/Config.h" #include "../game.h" #include "../localisation/localisation.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../OpenRCT2.h" @@ -72,7 +71,6 @@ static const rct_string_id window_save_prompt_labels[][2] = { static void window_save_prompt_close(rct_window *w); static void window_save_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_save_prompt_invalidate(rct_window *w); static void window_save_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_save_prompt_callback(sint32 result, const utf8 * path); @@ -102,7 +100,7 @@ static rct_window_event_list window_save_prompt_events = { NULL, NULL, NULL, - window_save_prompt_invalidate, + NULL, window_save_prompt_paint, NULL }; @@ -249,11 +247,6 @@ static void window_save_prompt_mouseup(rct_window *w, rct_widgetindex widgetInde } } -static void window_save_prompt_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - static void window_save_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); diff --git a/src/openrct2/windows/scenery.c b/src/openrct2/windows/scenery.c index 933bbd0d8d..0a5d486a2d 100644 --- a/src/openrct2/windows/scenery.c +++ b/src/openrct2/windows/scenery.c @@ -28,7 +28,6 @@ #include "../world/scenery.h" #include "../world/sprite.h" #include "dropdown.h" -#include "../interface/themes.h" #include "../network/network.h" #include "error.h" #include "../sprites.h" @@ -904,8 +903,6 @@ void window_scenery_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_stri */ void window_scenery_invalidate(rct_window *w) { - colour_scheme_update(w); - uint16 tabIndex = gWindowSceneryActiveTabIndex; uint32 titleStringId = STR_MISCELLANEOUS; if (tabIndex < 19) diff --git a/src/openrct2/windows/server_list.cpp b/src/openrct2/windows/server_list.cpp index 284dbecd61..fe2cfa7514 100644 --- a/src/openrct2/windows/server_list.cpp +++ b/src/openrct2/windows/server_list.cpp @@ -22,7 +22,6 @@ extern "C" { #include "../interface/colour.h" - #include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -145,14 +144,14 @@ extern "C" void window_server_list_open() { rct_window* window; - + // Check if window is already open window = window_bring_to_front_by_class(WC_SERVER_LIST); if (window != NULL) return; - + window = window_create_centred(WWIDTH_MIN, WHEIGHT_MIN, &window_server_list_events, WC_SERVER_LIST, WF_10 | WF_RESIZABLE); - + window_server_list_widgets[WIDX_PLAYER_NAME_INPUT].string = _playerName; window->widgets = window_server_list_widgets; window->enabled_widgets = ( @@ -170,20 +169,17 @@ extern "C" window->min_height = 90; window->max_width = window->min_width; window->max_height = window->min_height; - + window->page = 0; window->list_information_type = 0; - window->colours[0] = COLOUR_GREY; - window->colours[1] = COLOUR_BORDEAUX_RED; - window->colours[2] = COLOUR_BORDEAUX_RED; - + window_set_resize(window, WWIDTH_MIN, WHEIGHT_MIN, WWIDTH_MAX, WHEIGHT_MAX); - + safe_strcpy(_playerName, gConfigNetwork.player_name, sizeof(_playerName)); - + server_list_load_server_entries(); window->no_list_items = _numServerEntries; - + fetch_servers(); } } @@ -370,8 +366,6 @@ static void window_server_list_textinput(rct_window *w, rct_widgetindex widgetIn static void window_server_list_invalidate(rct_window *w) { - colour_scheme_update(w); - set_format_arg(0, char *, _version); window_server_list_widgets[WIDX_BACKGROUND].right = w->width - 1; window_server_list_widgets[WIDX_BACKGROUND].bottom = w->height - 1; diff --git a/src/openrct2/windows/shortcut_key_change.c b/src/openrct2/windows/shortcut_key_change.c index 84abe19c70..6f90f2b28d 100644 --- a/src/openrct2/windows/shortcut_key_change.c +++ b/src/openrct2/windows/shortcut_key_change.c @@ -16,7 +16,6 @@ #include "../config/Config.h" #include "../interface/keyboard_shortcut.h" -#include "../interface/themes.h" #include "../interface/window.h" #include "../interface/widget.h" #include "../localisation/localisation.h" @@ -41,7 +40,6 @@ static rct_widget window_shortcut_change_widgets[] = { }; static void window_shortcut_change_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_shortcut_change_invalidate(rct_window *w); static void window_shortcut_change_paint(rct_window *w, rct_drawpixelinfo *dpi); // 0x9A3F7C @@ -71,7 +69,7 @@ static rct_window_event_list window_shortcut_change_events = { NULL, NULL, NULL, - window_shortcut_change_invalidate, + NULL, window_shortcut_change_paint, NULL }; @@ -101,11 +99,6 @@ static void window_shortcut_change_mouseup(rct_window *w, rct_widgetindex widget } } -static void window_shortcut_change_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - /** * * rct2: 0x006E3A9F diff --git a/src/openrct2/windows/shortcut_keys.c b/src/openrct2/windows/shortcut_keys.c index b78beaa8ad..f5c20a7501 100644 --- a/src/openrct2/windows/shortcut_keys.c +++ b/src/openrct2/windows/shortcut_keys.c @@ -20,7 +20,6 @@ #include "../localisation/localisation.h" #include "../platform/platform.h" #include "../interface/keyboard_shortcut.h" -#include "../interface/themes.h" #define WW 420 #define WH 280 @@ -203,8 +202,6 @@ static void window_shortcut_resize(rct_window *w) static void window_shortcut_invalidate(rct_window *w) { - colour_scheme_update(w); - window_shortcut_widgets[WIDX_BACKGROUND].right = w->width - 1; window_shortcut_widgets[WIDX_BACKGROUND].bottom = w->height - 1; window_shortcut_widgets[WIDX_TITLE].right = w->width - 2; diff --git a/src/openrct2/windows/sign.c b/src/openrct2/windows/sign.c index f0aece9e41..3c61f216f2 100644 --- a/src/openrct2/windows/sign.c +++ b/src/openrct2/windows/sign.c @@ -27,7 +27,6 @@ #include "error.h" #include "dropdown.h" #include "../drawing/drawing.h" -#include "../interface/themes.h" #include "../sprites.h" #define WW 113 @@ -325,8 +324,6 @@ static void window_sign_textinput(rct_window *w, rct_widgetindex widgetIndex, ch */ static void window_sign_invalidate(rct_window *w) { - colour_scheme_update(w); - rct_widget* main_colour_btn = &window_sign_widgets[WIDX_MAIN_COLOUR]; rct_widget* text_colour_btn = &window_sign_widgets[WIDX_TEXT_COLOUR]; @@ -559,8 +556,6 @@ static void window_sign_small_dropdown(rct_window *w, rct_widgetindex widgetInde */ static void window_sign_small_invalidate(rct_window *w) { - colour_scheme_update(w); - rct_widget* main_colour_btn = &window_sign_widgets[WIDX_MAIN_COLOUR]; rct_widget* text_colour_btn = &window_sign_widgets[WIDX_TEXT_COLOUR]; diff --git a/src/openrct2/windows/staff_fire_prompt.c b/src/openrct2/windows/staff_fire_prompt.c index 142e0b0242..66578e62d5 100644 --- a/src/openrct2/windows/staff_fire_prompt.c +++ b/src/openrct2/windows/staff_fire_prompt.c @@ -22,7 +22,6 @@ #include "../peep/staff.h" #include "../sprites.h" #include "../world/sprite.h" -#include "../interface/themes.h" #define WW 200 #define WH 100 @@ -46,7 +45,6 @@ static rct_widget window_staff_fire_widgets[] = { }; static void window_staff_fire_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_staff_fire_invalidate(rct_window *w); static void window_staff_fire_paint(rct_window *w, rct_drawpixelinfo *dpi); //0x9A3F7C @@ -76,7 +74,7 @@ static rct_window_event_list window_staff_fire_events = { NULL, NULL, NULL, - window_staff_fire_invalidate, + NULL, window_staff_fire_paint, NULL }; @@ -94,8 +92,6 @@ void window_staff_fire_prompt_open(rct_peep* peep) window_init_scroll_widgets(w); - colour_scheme_update(w); - w->number = peep->sprite_index; } @@ -118,11 +114,6 @@ static void window_staff_fire_mouseup(rct_window *w, rct_widgetindex widgetIndex } } -static void window_staff_fire_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - /** * * rct2: 0x006C0AF2 diff --git a/src/openrct2/windows/staff_list.c b/src/openrct2/windows/staff_list.c index d9db13ca47..636253753a 100644 --- a/src/openrct2/windows/staff_list.c +++ b/src/openrct2/windows/staff_list.c @@ -18,7 +18,6 @@ #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -495,8 +494,6 @@ void window_staff_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_s */ void window_staff_list_invalidate(rct_window *w) { - colour_scheme_update(w); - sint32 pressed_widgets = w->pressed_widgets & ~( (1LL << WIDX_STAFF_LIST_HANDYMEN_TAB) | (1LL << WIDX_STAFF_LIST_MECHANICS_TAB) | diff --git a/src/openrct2/windows/themes.c b/src/openrct2/windows/themes.c index 3d2695ef74..b1136e83d5 100644 --- a/src/openrct2/windows/themes.c +++ b/src/openrct2/windows/themes.c @@ -684,8 +684,6 @@ void window_themes_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_strin void window_themes_invalidate(rct_window *w) { - colour_scheme_update(w); - sint32 pressed_widgets = w->pressed_widgets & ~( (1LL << WIDX_THEMES_SETTINGS_TAB) | (1LL << WIDX_THEMES_MAIN_UI_TAB) | diff --git a/src/openrct2/windows/tile_inspector.c b/src/openrct2/windows/tile_inspector.c index 2be4cf30d7..f83c9e9d3c 100644 --- a/src/openrct2/windows/tile_inspector.c +++ b/src/openrct2/windows/tile_inspector.c @@ -18,7 +18,6 @@ #include "../core/Guard.hpp" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -1377,8 +1376,6 @@ static void window_tile_inspector_scrollmouseover(rct_window *w, sint32 scrollIn static void window_tile_inspector_invalidate(rct_window *w) { - colour_scheme_update(w); - w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; if (w->page == TILE_INSPECTOR_PAGE_DEFAULT) { diff --git a/src/openrct2/windows/title_editor.c b/src/openrct2/windows/title_editor.c index c85d5880a8..29f3d702c2 100644 --- a/src/openrct2/windows/title_editor.c +++ b/src/openrct2/windows/title_editor.c @@ -18,7 +18,6 @@ #include "../drawing/drawing.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -656,8 +655,6 @@ static void window_title_editor_tooltip(rct_window* w, rct_widgetindex widgetInd static void window_title_editor_invalidate(rct_window *w) { - colour_scheme_update(w); - sint32 pressed_widgets = w->pressed_widgets & ~( (1LL << WIDX_TITLE_EDITOR_PRESETS_TAB) | (1LL << WIDX_TITLE_EDITOR_SAVES_TAB) | diff --git a/src/openrct2/windows/title_exit.c b/src/openrct2/windows/title_exit.c index 022e19d937..96b4133482 100644 --- a/src/openrct2/windows/title_exit.c +++ b/src/openrct2/windows/title_exit.c @@ -20,7 +20,6 @@ #include "../localisation/localisation.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../interface/themes.h" #include "../intro.h" #include "../rct2.h" @@ -35,7 +34,6 @@ static rct_widget window_title_exit_widgets[] = { static void window_title_exit_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_title_exit_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_title_exit_invalidate(rct_window *w); static rct_window_event_list window_title_exit_events = { NULL, @@ -63,7 +61,7 @@ static rct_window_event_list window_title_exit_events = { NULL, NULL, NULL, - window_title_exit_invalidate, + NULL, window_title_exit_paint, NULL }; @@ -113,8 +111,3 @@ static void window_title_exit_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); } - -static void window_title_exit_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} diff --git a/src/openrct2/windows/title_menu.c b/src/openrct2/windows/title_menu.c index 48a146187f..ea28d1c791 100644 --- a/src/openrct2/windows/title_menu.c +++ b/src/openrct2/windows/title_menu.c @@ -18,7 +18,6 @@ #include "../editor.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -48,7 +47,6 @@ static void window_title_menu_mousedown(rct_widgetindex widgetIndex, rct_window* static void window_title_menu_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex); static void window_title_menu_cursor(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y, sint32 *cursorId); static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi); -static void window_title_menu_invalidate(rct_window *w); static rct_window_event_list window_title_menu_events = { NULL, @@ -76,7 +74,7 @@ static rct_window_event_list window_title_menu_events = { NULL, window_title_menu_cursor, NULL, - window_title_menu_invalidate, + NULL, window_title_menu_paint, NULL }; @@ -223,8 +221,3 @@ static void window_title_menu_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_filter_rect(dpi, w->x, w->y, w->x + w->width - 1, w->y + 82 - 1, PALETTE_51); window_draw_widgets(w, dpi); } - -static void window_title_menu_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} diff --git a/src/openrct2/windows/title_options.c b/src/openrct2/windows/title_options.c index 606a5214d2..583ec59379 100644 --- a/src/openrct2/windows/title_options.c +++ b/src/openrct2/windows/title_options.c @@ -20,7 +20,6 @@ #include "../localisation/localisation.h" #include "../interface/widget.h" #include "../interface/window.h" -#include "../interface/themes.h" #include "../rct2.h" enum WINDOW_TITLE_OPTIONS_WIDGET_IDX { @@ -33,7 +32,6 @@ static rct_widget window_title_options_widgets[] = { }; static void window_title_options_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_title_options_invalidate(rct_window *w); static void window_title_options_paint(rct_window *w, rct_drawpixelinfo *dpi); static rct_window_event_list window_title_options_events = { @@ -62,7 +60,7 @@ static rct_window_event_list window_title_options_events = { NULL, NULL, NULL, - window_title_options_invalidate, + NULL, window_title_options_paint, NULL }; @@ -102,8 +100,3 @@ static void window_title_options_paint(rct_window *w, rct_drawpixelinfo *dpi) { window_draw_widgets(w, dpi); } - -static void window_title_options_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} diff --git a/src/openrct2/windows/title_scenarioselect.c b/src/openrct2/windows/title_scenarioselect.c index 1ae5dbf9fe..f9eb5c3b48 100644 --- a/src/openrct2/windows/title_scenarioselect.c +++ b/src/openrct2/windows/title_scenarioselect.c @@ -337,8 +337,6 @@ static void window_scenarioselect_scrollmouseover(rct_window *w, sint32 scrollIn static void window_scenarioselect_invalidate(rct_window *w) { - colour_scheme_update(w); - w->pressed_widgets &= ~( (1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4) | (1 << WIDX_TAB5) | (1 << WIDX_TAB6) | (1 << WIDX_TAB7) | (1 << WIDX_TAB8) ); diff --git a/src/openrct2/windows/top_toolbar.c b/src/openrct2/windows/top_toolbar.c index 230947c96a..bbb0b8a133 100644 --- a/src/openrct2/windows/top_toolbar.c +++ b/src/openrct2/windows/top_toolbar.c @@ -22,7 +22,6 @@ #include "../input.h" #include "../interface/console.h" #include "../interface/screenshot.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -649,8 +648,6 @@ static void window_top_toolbar_invalidate(rct_window *w) sint32 x, enabledWidgets, widgetIndex, widgetWidth, firstAlignment; rct_widget *widget; - colour_scheme_update(w); - // Enable / disable buttons window_top_toolbar_widgets[WIDX_PAUSE].type = WWT_TRNBTN; window_top_toolbar_widgets[WIDX_FILE_MENU].type = WWT_TRNBTN; diff --git a/src/openrct2/windows/track_list.c b/src/openrct2/windows/track_list.c index 48c47a330a..4b4b481c35 100644 --- a/src/openrct2/windows/track_list.c +++ b/src/openrct2/windows/track_list.c @@ -18,7 +18,6 @@ #include "../config/Config.h" #include "../drawing/IDrawingEngine.h" #include "../editor.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -339,8 +338,6 @@ static void window_track_list_update(rct_window *w) */ static void window_track_list_invalidate(rct_window *w) { - colour_scheme_update(w); - rct_string_id stringId = STR_NONE; rct_ride_entry *entry = get_ride_entry(_window_track_list_item.entry_index); if (entry != NULL && entry != (rct_ride_entry*)-1) { diff --git a/src/openrct2/windows/track_manage.c b/src/openrct2/windows/track_manage.c index c5d9ed862f..b248a74dc5 100644 --- a/src/openrct2/windows/track_manage.c +++ b/src/openrct2/windows/track_manage.c @@ -15,7 +15,6 @@ #pragma endregion #include "../game.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../localisation/localisation.h" @@ -64,11 +63,9 @@ static rct_widget window_track_delete_prompt_widgets[] = { static void window_track_manage_close(rct_window *w); static void window_track_manage_mouseup(rct_window *w, rct_widgetindex widgetIndex); static void window_track_manage_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text); -static void window_track_manage_invalidate(rct_window *w); static void window_track_manage_paint(rct_window *w, rct_drawpixelinfo *dpi); static void window_track_delete_prompt_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_track_delete_prompt_invalidate(rct_window *w); static void window_track_delete_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi); // 0x009940EC @@ -98,7 +95,7 @@ static rct_window_event_list window_track_manage_events = { NULL, NULL, NULL, - window_track_manage_invalidate, + NULL, window_track_manage_paint, NULL }; @@ -130,7 +127,7 @@ static rct_window_event_list window_track_delete_prompt_events = { NULL, NULL, NULL, - window_track_delete_prompt_invalidate, + NULL, window_track_delete_prompt_paint, NULL }; @@ -239,11 +236,6 @@ static void window_track_manage_textinput(rct_window *w, rct_widgetindex widgetI } } -static void window_track_manage_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - /** * * rct2: 0x006D3523 @@ -305,11 +297,6 @@ static void window_track_delete_prompt_mouseup(rct_window *w, rct_widgetindex wi } } -static void window_track_delete_prompt_invalidate(rct_window *w) -{ - colour_scheme_update(w); -} - /** * * rct2: 0x006D37EE diff --git a/src/openrct2/windows/track_place.c b/src/openrct2/windows/track_place.c index fe8006507a..7854e9b4f3 100644 --- a/src/openrct2/windows/track_place.c +++ b/src/openrct2/windows/track_place.c @@ -18,7 +18,6 @@ #include "../cheats.h" #include "../game.h" #include "../input.h" -#include "../interface/themes.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" @@ -375,7 +374,6 @@ static void window_track_place_unknown14(rct_window *w) static void window_track_place_invalidate(rct_window *w) { - colour_scheme_update(w); window_track_place_draw_mini_preview(_trackDesign); } diff --git a/src/openrct2/windows/view_clipping.c b/src/openrct2/windows/view_clipping.c index f19eb5f06e..b0d434a19f 100644 --- a/src/openrct2/windows/view_clipping.c +++ b/src/openrct2/windows/view_clipping.c @@ -15,7 +15,6 @@ #pragma endregion #include "../config/Config.h" -#include "../interface/themes.h" #include "../interface/widget.h" #include "../interface/window.h" #include "../interface/viewport.h" @@ -145,8 +144,6 @@ void window_view_clipping_open() window_push_others_below(window); - colour_scheme_update(window); - // Turn on view clipping when the window is opened. if (mainWindow != NULL) { mainWindow->viewport->flags |= VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT; @@ -232,8 +229,6 @@ static void window_view_clipping_update(rct_window *w) static void window_view_clipping_invalidate(rct_window *w) { - colour_scheme_update(w); - widget_scroll_update_thumbs(w, WIDX_CLIP_HEIGHT_SLIDER); rct_window *mainWindow = window_get_main(); diff --git a/src/openrct2/windows/viewport.c b/src/openrct2/windows/viewport.c index 356fc4e114..43f2c4ca33 100644 --- a/src/openrct2/windows/viewport.c +++ b/src/openrct2/windows/viewport.c @@ -23,7 +23,6 @@ #include "../interface/widget.h" #include "../interface/window.h" #include "dropdown.h" -#include "../interface/themes.h" #define INITIAL_WIDTH 500 #define INITIAL_HEIGHT 350 @@ -195,8 +194,6 @@ static void window_viewport_invalidate(rct_window *w) rct_viewport *viewport; sint32 i; - colour_scheme_update(w); - viewportWidget = &window_viewport_widgets[WIDX_VIEWPORT]; viewport = w->viewport; diff --git a/src/openrct2/windows/water.c b/src/openrct2/windows/water.c index d0ea37916d..a4246ae32b 100644 --- a/src/openrct2/windows/water.c +++ b/src/openrct2/windows/water.c @@ -21,7 +21,6 @@ #include "../rct2.h" #include "../sprites.h" #include "../world/map.h" -#include "../interface/themes.h" #define MINIMUM_TOOL_SIZE 1 #define MAXIMUM_TOOL_SIZE 64 @@ -199,8 +198,6 @@ static void window_water_update(rct_window *w) */ static void window_water_invalidate(rct_window *w) { - colour_scheme_update(w); - // Set the preview image button to be pressed down w->pressed_widgets |= (1 << WIDX_PREVIEW);