diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index c8d6aa719a..7ee79c3f37 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index 62c013c8a8..231dd247b4 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -32,9 +32,11 @@ #include #include #include +#include #include #include #include +#include #include "KeyboardShortcuts.h" uint8 gKeyboardShortcutChangeId; diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index 656549c86f..f498c25618 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -20,6 +20,7 @@ #include #include #include +#include static uint16 toolSizeSpriteIndices[] = { diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index 88cf03e5dd..f8af10b775 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index bd7115f570..864dd09ffb 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -21,9 +21,10 @@ #include #include -#include #include #include +#include +#include #define WW 113 #define WH 96 diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 99b63623e3..6749b3c084 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using namespace OpenRCT2; diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index b3ae0b307e..c2ba660757 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -21,6 +21,8 @@ #include #include #include +#include +#include enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index daaf34e4f9..04d46aa191 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #define WW 200 #define WH 100 diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index 350eba1694..160bf15da1 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -22,6 +22,7 @@ #include #include #include +#include // The maximum number of rows to list before items overflow into new columns #define DROPDOWN_TEXT_MAX_ROWS 32 diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 2b75efa66d..459e8f104b 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include enum { WIDX_PREVIOUS_IMAGE, // 1 diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index d174a74a29..6bd6350ff9 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -27,6 +27,8 @@ #include #include #include +#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 2956c22579..3e3b4abb56 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 2454e786ee..f314774b41 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -23,6 +23,7 @@ #include #include #include +#include enum { WIDX_BACKGROUND diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 5256ba484e..52e0cf6aaf 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include enum { diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 16a98d5e07..dfacecdf33 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -28,6 +28,7 @@ #include #include #include +#include enum { diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 78a4d527f5..738de8d376 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 6acbe96c2e..e69da0c213 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -32,6 +32,8 @@ #include #include #include +#include +#include enum WINDOW_GUEST_PAGE { WINDOW_GUEST_OVERVIEW, diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 035b33d5ef..e248a28398 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include enum { PAGE_INDIVIDUAL, diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 9dde814a1f..bf39553ed7 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -29,6 +29,7 @@ #include #include #include +#include enum { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index f5634bdfe2..a9bfe7771d 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -22,6 +22,8 @@ #include #include #include +#include +#include enum WINDOW_LAND_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index e0d252763a..1f65739ec2 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -24,6 +24,8 @@ #include #include #include +#include +#include enum WINDOW_WATER_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index c8ac478cae..7f8cebf424 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -36,6 +36,9 @@ #include #include #include +#include +#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 7095d2b333..e6619c4bbc 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 86483fb57f..059d83c583 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -26,6 +26,7 @@ #include #include #include +#include enum { WINDOW_MAPGEN_PAGE_BASE, diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index b25f874279..0c0d796f9e 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -21,6 +21,7 @@ #include #include #include +#include static rct_widget window_map_tooltip_widgets[] = { { WWT_IMGBTN, 0, 0, 199, 0, 29, 0xFFFFFFFF, STR_NONE }, diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 80e7dc775b..b702b38765 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -23,6 +23,7 @@ #include #include #include +#include enum { WINDOW_MULTIPLAYER_PAGE_INFORMATION, diff --git a/src/openrct2-ui/windows/MusicCredits.cpp b/src/openrct2-ui/windows/MusicCredits.cpp index cd46ecd06a..2872f3e057 100644 --- a/src/openrct2-ui/windows/MusicCredits.cpp +++ b/src/openrct2-ui/windows/MusicCredits.cpp @@ -20,6 +20,8 @@ #include #include +#include +#include enum WINDOW_MUSIC_CREDITS_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 0aa87332e3..e168eee2ac 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -20,6 +20,7 @@ #include #include #include +#include static char _password[33]; diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 36df9e3b97..fd6fa29c44 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 1bac704866..09fe89e31f 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #define AVAILABILITY_STRING_SIZE 256 #define WH 382 diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 3a1068ecc9..c8b3557ece 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -25,6 +25,7 @@ #include #include #include +#include enum WINDOW_NEWS_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 5ab8005dd9..2ed280ee15 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -23,6 +23,7 @@ #include #include #include +#include enum { NOTIFICATION_CATEGORY_PARK, diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 09309d9b4d..0e7bf0d3ea 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -47,6 +47,7 @@ #include #include #include +#include enum WINDOW_OPTIONS_PAGE { WINDOW_OPTIONS_PAGE_DISPLAY, diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index c2b206ab8f..0700d12d7d 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -32,6 +32,8 @@ #include #include #include +#include +#include enum WINDOW_PARK_PAGE { WINDOW_PARK_PAGE_ENTRANCE, diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 9ac870bf19..83c0d5bab9 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -26,6 +26,8 @@ #include #include #include +#include +#include enum WINDOW_PLAYER_PAGE { WINDOW_PLAYER_PAGE_OVERVIEW, diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 9a2fb65ab1..33605df4c0 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -24,6 +24,8 @@ #include #include #include +#include +#include enum { WINDOW_RESEARCH_PAGE_DEVELOPMENT, diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 5d72cdf552..93259633a0 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -47,6 +47,8 @@ #include #include #include +#include +#include enum { WINDOW_RIDE_PAGE_MAIN, diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 622d253da9..4954b2447d 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 91aae51c1c..04cbcda21f 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -27,6 +27,9 @@ #include #include #include +#include +#include +#include enum { PAGE_RIDES, diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index e8bef27a47..b49d59c226 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -25,6 +25,7 @@ #include #include #include +#include enum WINDOW_SAVE_PROMPT_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index f596ea6783..4f24b2c942 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -29,6 +29,8 @@ #include #include #include +#include +#include #define WINDOW_SCENERY_WIDTH 634 #define WINDOW_SCENERY_HEIGHT 180 diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index f191399af2..c7f372cb21 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -30,6 +30,8 @@ #include #include #include +#include +#include #define WWIDTH_MIN 500 #define WHEIGHT_MIN 300 diff --git a/src/openrct2-ui/windows/ShortcutKeyChange.cpp b/src/openrct2-ui/windows/ShortcutKeyChange.cpp index 615b60e00b..e9f137ab4a 100644 --- a/src/openrct2-ui/windows/ShortcutKeyChange.cpp +++ b/src/openrct2-ui/windows/ShortcutKeyChange.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #define WW 250 #define WH 60 diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 7c7d8493aa..f5b5f5df8c 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -20,6 +20,7 @@ #include #include +#include #define WW 420 #define WH 280 diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 62382c4a88..161f7491ff 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #define WW 113 #define WH 96 diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 1713a8ba42..08436f7ae5 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include #define WW 190 #define WH 180 diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index 5d451e45b2..ca7bea9557 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -18,6 +18,9 @@ #include #include #include +#include +#include +#include #define WW 200 #define WH 100 diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 4db99dc0a2..9a0c175350 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -31,6 +31,9 @@ #include #include #include +#include +#include +#include enum { WINDOW_STAFF_LIST_TAB_HANDYMEN, diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index bbafbdf767..85fc166a0d 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #define WW 250 #define WH 90 diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 63306361ea..ad881d3caf 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -26,6 +26,7 @@ #include #include #include +#include enum { WINDOW_THEMES_TAB_SETTINGS, diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 526e2e8c21..ce2e01eea1 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -35,6 +35,8 @@ #include #include #include +#include +#include static constexpr const rct_string_id TerrainTypeStringIds[] = { STR_TILE_INSPECTOR_TERRAIN_GRASS, diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 7f7902fdf3..45f0846d5a 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -31,6 +31,8 @@ #include #include #include +#include +#include struct TITLE_COMMAND_ORDER { // originally a uint8, but the new millisecond wait times require a uint16. diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 7482f2a072..1ad2800a2a 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -35,6 +35,7 @@ #include #include #include +#include enum WINDOW_TITLE_EDITOR_TAB { WINDOW_TITLE_EDITOR_TAB_PRESETS, diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index 2b0646a530..86eb504922 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -19,6 +19,8 @@ #include #include #include +#include +#include static rct_widget window_title_logo_widgets[] = { { WIDGETS_END }, diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index 75f972cfd8..8479337216 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -26,6 +26,8 @@ #include #include #include +#include +#include #define INITIAL_NUM_UNLOCKED_SCENARIOS 5 diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index abe235971a..808523c47e 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -20,6 +20,7 @@ #include #include #include +#include enum { WIDX_BACKGROUND diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 7a07e0099d..1172640b1f 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -45,6 +45,8 @@ #include #include #include +#include +#include enum { WIDX_PAUSE, diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 30604261cc..34f40981fa 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index ab0350f00e..8e38f95df3 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -31,6 +31,8 @@ #include #include #include +#include +#include #define TRACK_MINI_PREVIEW_WIDTH 168 #define TRACK_MINI_PREVIEW_HEIGHT 78 @@ -40,6 +42,8 @@ #define PALETTE_INDEX_PRIMARY_MID_DARK (248) #define PALETTE_INDEX_PRIMARY_LIGHTEST (252) +struct rct_track_td6; + enum { WIDX_BACKGROUND, WIDX_TITLE, diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 8e2bc304c6..bff0393775 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -29,6 +29,7 @@ #include #include #include +#include enum { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index e71c13e365..7b894a21c2 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -22,6 +22,7 @@ #include #include #include +#include enum WINDOW_VIEW_CLIPPING_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 8601c82c5f..f65f805475 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -21,6 +21,7 @@ #include #include #include +#include enum WINDOW_WATER_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 377e8e66df..fb47f11ba3 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -20,9 +20,13 @@ #include #include +#include using loadsave_callback = void (*)(sint32 result, const utf8 * path); using scenarioselect_callback = void (*)(const utf8 *path); +struct rct_peep; +struct rct_tile_element; +struct rct_vehicle; rct_window * window_about_open(); rct_window * window_changelog_open(); diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index f0176639b0..4292bf6a63 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -18,6 +18,8 @@ #include "config/Config.h" #include "localisation/Localisation.h" #include "network/network.h" +#include "ride/Ride.h" +#include "scenario/Scenario.h" #include "util/Util.h" #include "world/Climate.h" #include "world/Footpath.h" diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 342d20b558..53165da744 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -43,6 +43,7 @@ #include "platform/Crash.h" #include "PlatformEnvironment.h" #include "ride/TrackDesignRepository.h" +#include "scenario/Scenario.h" #include "scenario/ScenarioRepository.h" #include "title/TitleScreen.h" #include "title/TitleSequenceManager.h" diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 004c275f8e..76ddc69d8f 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -31,12 +31,14 @@ #include "object/ObjectManager.h" #include "peep/Staff.h" #include "rct1/RCT1.h" +#include "scenario/Scenario.h" #include "util/Util.h" #include "windows/Intent.h" #include "world/Climate.h" #include "world/Entrance.h" #include "world/Footpath.h" #include "world/Scenery.h" +#include "world/Park.h" #include "interface/Window_internal.h" namespace Editor diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 683096a9af..1c02c5a8c5 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -21,6 +21,7 @@ #include "EditorObjectSelectionSession.h" #include "Game.h" #include "localisation/Localisation.h" +#include "management/Research.h" #include "object/DefaultObjects.h" #include "object/ObjectList.h" #include "object/ObjectManager.h" diff --git a/src/openrct2/actions/GuestSetNameAction.hpp b/src/openrct2/actions/GuestSetNameAction.hpp index bb4b234a3c..35c7f58831 100644 --- a/src/openrct2/actions/GuestSetNameAction.hpp +++ b/src/openrct2/actions/GuestSetNameAction.hpp @@ -22,10 +22,12 @@ #include "../Cheats.h" #include "../Context.h" +#include "../drawing/Drawing.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../windows/Intent.h" #include "../world/Park.h" +#include "../world/Sprite.h" struct GuestSetNameAction : public GameActionBase { diff --git a/src/openrct2/actions/MazeSetTrackAction.hpp b/src/openrct2/actions/MazeSetTrackAction.hpp index 98c61ec78b..82a4312004 100644 --- a/src/openrct2/actions/MazeSetTrackAction.hpp +++ b/src/openrct2/actions/MazeSetTrackAction.hpp @@ -23,6 +23,7 @@ #include "../Cheats.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" +#include "../management/Finance.h" #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index 6e93b2f20b..3c0e210ba6 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -22,9 +22,12 @@ #include "GameAction.h" #include "../Cheats.h" +#include "../management/Finance.h" #include "../world/Entrance.h" #include "../world/Park.h" #include "../world/Footpath.h" +#include "../world/MapAnimation.h" +#include "../world/Sprite.h" struct PlaceParkEntranceAction : public GameActionBase { diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 68daef5b9d..14cb3d6bcc 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -30,6 +30,7 @@ #include "../ride/RideData.h" #include "../ride/Ride.h" #include "../ride/Station.h" +#include "../scenario/Scenario.h" class RideCreateGameActionResult final : public GameActionResult { diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 9f74f2f5ba..fe20c2423d 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -24,8 +24,11 @@ #include "../Game.h" #include "../interface/Viewport.h" #include "../interface/Window.h" +#include "../ride/Ride.h" #include "../util/Util.h" #include "../world/Climate.h" +#include "../world/Map.h" +#include "../world/Sprite.h" #include "Drawing.h" #include "LightFX.h" diff --git a/src/openrct2/drawing/Rain.cpp b/src/openrct2/drawing/Rain.cpp index d05d23c496..bf84de4b2e 100644 --- a/src/openrct2/drawing/Rain.cpp +++ b/src/openrct2/drawing/Rain.cpp @@ -20,6 +20,8 @@ #include "Drawing.h" #include "../config/Config.h" #include "../interface/Viewport.h" +#include "../ride/TrackDesign.h" +#include "../scenario/Scenario.h" #include "IDrawingEngine.h" #include "Rain.h" diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/String.cpp index 0a703ea87c..3a6a3343ca 100644 --- a/src/openrct2/drawing/String.cpp +++ b/src/openrct2/drawing/String.cpp @@ -16,6 +16,7 @@ #include #include "../config/Config.h" +#include "../drawing/Drawing.h" #include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../platform/platform.h" diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index 59497616cd..76b20693d4 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -18,6 +18,7 @@ #include "../audio/audio.h" #include "../audio/AudioMixer.h" #include "../Context.h" +#include "../drawing/Drawing.h" #include "../interface/themes.h" #include "../localisation/Localisation.h" #include "../network/network.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index db6067bc44..bd35fc1028 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -32,6 +32,8 @@ #include "../platform/platform.h" #include "../util/Util.h" #include "../world/Climate.h" +#include "../world/Map.h" +#include "../world/Park.h" #include "Viewport.h" using namespace OpenRCT2; diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index d9cdd02b2e..74aef9f8b4 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -31,12 +31,14 @@ #include "../core/Math.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" +#include "../drawing/Drawing.h" #include "../localisation/Language.h" #include "../localisation/StringIds.h" #include "../PlatformEnvironment.h" #include "themes.h" #include "Window.h" #include "Window_internal.h" +#include "Colour.h" using namespace OpenRCT2; diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index ab541f170e..df720e3206 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -26,6 +26,8 @@ #include "../OpenRCT2.h" #include "../paint/Paint.h" #include "../peep/Staff.h" +#include "../ride/Ride.h" +#include "../ride/TrackDesign.h" #include "../world/Climate.h" #include "../world/Map.h" #include "../world/Sprite.h" diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 4c3985ce28..4a0992f62e 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -18,6 +18,7 @@ #define _VIEWPORT_H_ #include "Window.h" +#include "../world/Location.hpp" struct paint_session; struct paint_struct; diff --git a/src/openrct2/interface/ViewportInteraction.cpp b/src/openrct2/interface/ViewportInteraction.cpp index f16c45bdc3..552f0debb3 100644 --- a/src/openrct2/interface/ViewportInteraction.cpp +++ b/src/openrct2/interface/ViewportInteraction.cpp @@ -31,6 +31,7 @@ #include "../world/Scenery.h" #include "../world/LargeScenery.h" #include "../world/Sprite.h" +#include "../world/Park.h" #include "Viewport.h" #include "Window_internal.h" #include "../Context.h" diff --git a/src/openrct2/interface/Widget.cpp b/src/openrct2/interface/Widget.cpp index 7505cb6d34..6934dbbae4 100644 --- a/src/openrct2/interface/Widget.cpp +++ b/src/openrct2/interface/Widget.cpp @@ -16,6 +16,7 @@ #include #include +#include "../drawing/Drawing.h" #include "../Input.h" #include "../sprites.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 9fc4822ed2..2ca58695bf 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -31,6 +31,7 @@ #include "../localisation/StringIds.h" #include "../OpenRCT2.h" #include "../platform/platform.h" +#include "../scenario/Scenario.h" #include "../world/Map.h" #include "../world/Sprite.h" #include "Viewport.h" diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index c2478a20bb..b590921238 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -18,13 +18,8 @@ #define _WINDOW_H_ #include "../common.h" -#include "../ride/Ride.h" -#include "../ride/TrackDesign.h" -#include "../scenario/Scenario.h" -#include "../world/Park.h" -#include "../paint/Paint.h" -#include "Colour.h" +struct rct_drawpixelinfo; struct rct_window; union rct_window_event; struct track_design_file_ref; diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index e602351eef..dddd97823f 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -18,6 +18,7 @@ #define _WINDOW2_H_ struct rct_research_item; +struct rct_object_entry; /** * Window structure diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index c3962fd8a3..9f5d153d4b 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -21,6 +21,7 @@ #include "../peep/Peep.h" #include "../ride/Ride.h" #include "../scenario/Scenario.h" +#include "../world/Park.h" #include "Award.h" #include "NewsItem.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 72b9dfd5c7..105bca1842 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -21,6 +21,7 @@ #include "../peep/Peep.h" #include "../peep/Staff.h" #include "../ride/Ride.h" +#include "../scenario/Scenario.h" #include "../util/Util.h" #include "../world/Park.h" #include "../world/Sprite.h" diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index e6299d4e6d..3029251867 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -21,6 +21,7 @@ #include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ride/RideData.h" +#include "../world/Park.h" #include "../Cheats.h" #include "Finance.h" #include "Marketing.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 1df610c4bd..fe1e49be61 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -21,6 +21,7 @@ #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" +#include "../management/Research.h" #include "../OpenRCT2.h" #include "../ride/Ride.h" #include "../util/Util.h" diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index b3b2f44954..d3b7ae441e 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -70,6 +70,7 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL; #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../Cheats.h" +#include "../world/Park.h" #include "NetworkAction.h" diff --git a/src/openrct2/paint/VirtualFloor.h b/src/openrct2/paint/VirtualFloor.h index bc1959b39e..7c20c27a29 100644 --- a/src/openrct2/paint/VirtualFloor.h +++ b/src/openrct2/paint/VirtualFloor.h @@ -17,6 +17,8 @@ #ifndef _VIRTUAL_FLOOR_H #define _VIRTUAL_FLOOR_H +struct paint_session; + uint16 virtual_floor_get_height(); bool virtual_floor_is_enabled(); diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Sprite.cpp index 024b23d493..6cfb4d73fb 100644 --- a/src/openrct2/paint/sprite/Sprite.cpp +++ b/src/openrct2/paint/sprite/Sprite.cpp @@ -20,7 +20,9 @@ #include "../../world/Sprite.h" #include "../../ride/RideData.h" #include "../../interface/Viewport.h" +#include "../../peep/Staff.h" #include "../../ride/VehiclePaint.h" +#include "../../ride/TrackDesign.h" /** * Paint Quadrant diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Banner.cpp index e87916213b..bbfaf0b62f 100644 --- a/src/openrct2/paint/tile_element/Banner.cpp +++ b/src/openrct2/paint/tile_element/Banner.cpp @@ -19,6 +19,7 @@ #include "../../Game.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" +#include "../../ride/TrackDesign.h" #include "TileElement.h" #include "../../world/Banner.h" #include "../../world/Scenery.h" diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Entrance.cpp index 2dfdfde0ef..f5ea30f1b5 100644 --- a/src/openrct2/paint/tile_element/Entrance.cpp +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -19,8 +19,10 @@ #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../ride/RideData.h" +#include "../../ride/TrackDesign.h" #include "../../world/Entrance.h" #include "../../world/Footpath.h" +#include "../../world/Park.h" #include "../Paint.h" #include "../Supports.h" #include "TileElement.h" diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index 494ac9b395..7c75e87662 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -22,6 +22,8 @@ #include "../../interface/Colour.h" #include "../../interface/Viewport.h" #include "../../ride/Track.h" +#include "../../ride/TrackDesign.h" +#include "../../world/Banner.h" #include "../../world/Map.h" #include "../../world/Scenery.h" #include "../../world/Wall.h" diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/LargeScenery.cpp index 52e3d67f9e..d5b2775eed 100644 --- a/src/openrct2/paint/tile_element/LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -19,7 +19,10 @@ #include "../../Game.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" +#include "../../ride/Ride.h" +#include "../../ride/TrackDesign.h" #include "../../util/Util.h" +#include "../../world/Banner.h" #include "../../world/Map.h" #include "../../world/LargeScenery.h" #include "../../world/Scenery.h" diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index e36e9b3b06..83b28c6824 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -21,9 +21,11 @@ #include "../../object/ObjectList.h" #include "../../peep/Staff.h" #include "../../ride/Track.h" +#include "../../ride/TrackDesign.h" #include "../../ride/TrackPaint.h" #include "../../world/Footpath.h" #include "../../world/Scenery.h" +#include "../../world/Sprite.h" #include "../Paint.h" #include "../Supports.h" #include "TileElement.h" diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/SmallScenery.cpp index ffa7051c7d..ddf47064fa 100644 --- a/src/openrct2/paint/tile_element/SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -20,6 +20,7 @@ #include "../../interface/Viewport.h" #include "../../localisation/Date.h" #include "../Paint.h" +#include "../../ride/TrackDesign.h" #include "../Supports.h" #include "../../world/Map.h" #include "../../world/Scenery.h" diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index dc674d9f1f..59b79a4ae0 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -21,9 +21,14 @@ #include "../../config/Config.h" #include "../../core/Math.hpp" #include "../../core/Util.hpp" +#include "../../drawing/Drawing.h" +#include "../../interface/Colour.h" #include "../../interface/Viewport.h" +#include "../../paint/Paint.h" #include "../../peep/Staff.h" +#include "../../ride/TrackDesign.h" #include "../../sprites.h" +#include "../../world/Sprite.h" #include "Surface.h" #include "TileElement.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 6589694067..4b11a0bcb7 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -45,6 +45,7 @@ #include "../world/Footpath.h" #include "../world/Map.h" #include "../world/LargeScenery.h" +#include "../world/Park.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" #include "../world/Sprite.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index b411d9300d..5d94bc6303 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -31,6 +31,7 @@ #include "../object/ObjectRepository.h" #include "../ParkImporter.h" #include "../ride/Station.h" +#include "../scenario/Scenario.h" #include "../scenario/ScenarioSources.h" #include "../scenario/ScenarioRepository.h" #include "Tables.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index eaa7b8face..5a5f640ce9 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -49,6 +49,7 @@ #include "../world/Footpath.h" #include "../world/Map.h" #include "../world/MapAnimation.h" +#include "../world/Park.h" #include "../world/Scenery.h" #include "../world/Sprite.h" #include "CableLift.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 5e18f32419..a27ba9f964 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -38,6 +38,7 @@ #include "Station.h" #include "Track.h" #include "TrackData.h" +#include "TrackDesign.h" uint8 gTrackGroundFlags; diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index cebed9d306..2caa620012 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -39,6 +39,7 @@ #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/Footpath.h" +#include "../world/Park.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index c134d77e9d..96066e87d2 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -22,10 +22,12 @@ #include "../paint/Paint.h" #include "../paint/Supports.h" #include "../paint/tile_element/TileElement.h" +#include "../scenario/Scenario.h" #include "../sprites.h" #include "../world/Map.h" #include "../world/Sprite.h" #include "TrackData.h" +#include "TrackDesign.h" #include "RideData.h" #include "TrackPaint.h" #include "Station.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 5dbe123db4..dfbd65f0c2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -32,6 +32,7 @@ #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../world/MapAnimation.h" +#include "../world/Park.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" #include "../world/Sprite.h" diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp index 0cf60b7880..ad6ef5d70d 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -17,6 +17,7 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" +#include "../../world/Sprite.h" #include "../Track.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 1290bf9553..373af5f553 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" struct rct_crooked_house_bound_box { diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 4f1e574913..720dfa1191 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" static constexpr const uint8 edges_1x4_ne_sw[] = { EDGE_NW | EDGE_SE, diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 3f8b53fe1f..7a05028281 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" struct haunted_house_bound_box { diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index d687b60edf..95689e6943 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" /** rct2: 0x0142805C */ static constexpr const uint32 merry_go_round_rider_offsets[] = { 0, 32, 64, 96, 16, 48, 80, 112 }; diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 9ebfc9f207..a0543cf145 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -24,6 +24,7 @@ #include "../TrackData.h" #include "../TrackPaint.h" #include "../VehiclePaint.h" +#include "../../world/Sprite.h" enum { diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 80d7314781..3d9fc69e09 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -20,6 +20,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" enum { diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 18fb596405..c569832aa8 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" /** * rct2: 0x007664C2 diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index e853b0642e..3c633c594f 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -20,6 +20,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" /** rct2: 0x008A2ABC */ static void paint_enterprise_structure( diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index a70da3253c..9aa0abd211 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" enum { diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index eec367ca7d..35f8d2ba62 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" enum { diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index 352afc833e..12e32db906 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" // 1 2 0 3 4 static constexpr const uint8 track_map_1x5[][5] = { diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 87b6d3d02f..167f76fb4c 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -19,6 +19,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" /** rct2: 0x01428010 */ static constexpr const uint32 swinging_inverter_ship_base_sprite_offset[] = { 0, 16, 0, 16 }; diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index c0c4bf7800..410de0f049 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -20,6 +20,7 @@ #include "../../paint/Supports.h" #include "../Track.h" #include "../TrackPaint.h" +#include "../../world/Sprite.h" /** rct2: 0x0076E5C9 */ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 direction, sint8 xOffset, sint8 yOffset, diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index 950bb78339..99ab1d0239 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -17,6 +17,7 @@ #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/Viewport.h" +#include "../../scenario/Scenario.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 6aed4dabe3..9654af8f28 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -20,6 +20,7 @@ #include "../interface/Screenshot.h" #include "../network/network.h" #include "../OpenRCT2.h" +#include "../scenario/Scenario.h" #include "../scenario/ScenarioRepository.h" #include "TitleScreen.h" #include "TitleSequence.h" diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index 473ba719a3..06c75481c5 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -38,6 +38,7 @@ #include "../management/NewsItem.h" #include "../windows/Intent.h" #include "../world/Scenery.h" +#include "../world/Sprite.h" using namespace OpenRCT2; diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp index 754383caab..1bf8f70d92 100644 --- a/src/openrct2/windows/_legacy.cpp +++ b/src/openrct2/windows/_legacy.cpp @@ -23,8 +23,10 @@ #include "../interface/Viewport.h" #include "../network/network.h" #include "../paint/VirtualFloor.h" +#include "../peep/Staff.h" #include "../ride/Track.h" #include "../ride/TrackData.h" +#include "../world/Banner.h" #include "../world/Scenery.h" #include "Intent.h" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 2c34243bdc..47aa9f0641 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -26,11 +26,13 @@ #include "Banner.h" #include "Map.h" +#include "MapAnimation.h" #include "Park.h" #include "Scenery.h" #include "../Game.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" +#include "../management/Finance.h" #include "../ride/Ride.h" #include "../ride/Track.h" #include "../windows/Intent.h" diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 0ad7e4de50..fdd1e0cf45 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -20,6 +20,7 @@ #include "Entrance.h" #include "Footpath.h" #include "Map.h" +#include "MapAnimation.h" #include "Park.h" #include "../Cheats.h" #include "../Game.h" diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 5059c5a252..8ae258d606 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -20,6 +20,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../localisation/Localisation.h" +#include "../management/Finance.h" #include "../network/network.h" #include "../object/ObjectList.h" #include "../object/ObjectManager.h" @@ -30,6 +31,8 @@ #include "../ride/TrackData.h" #include "../util/Util.h" #include "Map.h" +#include "Park.h" +#include "MapAnimation.h" void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z); void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_tile_element *tileElement); diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 55b435e701..2c8307b5ba 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -33,6 +33,7 @@ #include "../ride/RideData.h" #include "../ride/Track.h" #include "../ride/TrackData.h" +#include "../ride/TrackDesign.h" #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp index b812461abf..059f938ea0 100644 --- a/src/openrct2/world/MoneyEffect.cpp +++ b/src/openrct2/world/MoneyEffect.cpp @@ -14,9 +14,11 @@ *****************************************************************************/ #pragma endregion +#include "../drawing/Drawing.h" #include "../localisation/Localisation.h" #include "../interface/Viewport.h" #include "../interface/Window.h" +#include "Map.h" #include "../OpenRCT2.h" #include "Sprite.h" diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index ea023814ca..55c0bedfa8 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -15,6 +15,7 @@ #pragma endregion #include "../Cheats.h" +#include "../management/Finance.h" #include "../network/network.h" #include "../OpenRCT2.h" #include "../ride/TrackDesign.h" @@ -23,6 +24,7 @@ #include "Park.h" #include "Scenery.h" #include "SmallScenery.h" +#include "MapAnimation.h" static money32 SmallSceneryRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 quadrant, uint8 sceneryType, uint8 flags) { diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 81d27a403c..48010b69e5 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -14,6 +14,7 @@ *****************************************************************************/ #pragma endregion +#include "Banner.h" #include "../common.h" #include "../Context.h" #include "../Game.h" @@ -30,6 +31,7 @@ #include "Scenery.h" #include "TileInspector.h" #include "../ride/Station.h" +#include "Park.h" uint32 windowTileInspectorTileX; uint32 windowTileInspectorTileY;