From 247fdc2f5de8de1122aef072d82a4ae48276f433 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 9 Aug 2017 23:08:55 +0200 Subject: [PATCH] Fix formatting of C includes --- src/openrct2-ui/windows/LandRights.cpp | 12 +++---- src/openrct2-ui/windows/MapGen.cpp | 14 ++++---- src/openrct2-ui/windows/Multiplayer.cpp | 10 +++--- src/openrct2-ui/windows/MusicCredits.cpp | 4 +-- src/openrct2-ui/windows/News.cpp | 14 ++++---- src/openrct2-ui/windows/NewsOptions.cpp | 6 ++-- src/openrct2-ui/windows/Options.cpp | 26 +++++++------- src/openrct2-ui/windows/SavePrompt.cpp | 8 ++--- src/openrct2-ui/windows/ServerList.cpp | 4 +-- src/openrct2-ui/windows/ServerStart.cpp | 10 +++--- src/openrct2-ui/windows/ShortcutKeyChange.cpp | 6 ++-- src/openrct2-ui/windows/ShortcutKeys.cpp | 4 +-- src/openrct2-ui/windows/Themes.cpp | 18 +++++----- src/openrct2-ui/windows/TitleExit.cpp | 4 +-- src/openrct2-ui/windows/TitleMenu.cpp | 4 +-- src/openrct2-ui/windows/TitleOptions.cpp | 2 +- src/openrct2/windows/DemolishRidePrompt.cpp | 6 ++-- src/openrct2/windows/Dropdown.cpp | 10 +++--- src/openrct2/windows/EditorBottomToolbar.cpp | 20 +++++------ src/openrct2/windows/EditorInventionsList.cpp | 16 ++++----- src/openrct2/windows/EditorMain.cpp | 6 ++-- .../windows/EditorObjectSelection.cpp | 28 +++++++-------- .../windows/EditorObjectiveOptions.cpp | 16 ++++----- .../windows/EditorScenarioOptions.cpp | 14 ++++---- src/openrct2/windows/Error.cpp | 8 ++--- src/openrct2/windows/Finances.cpp | 16 ++++----- src/openrct2/windows/Footpath.cpp | 20 +++++------ src/openrct2/windows/GameBottomToolbar.cpp | 16 ++++----- src/openrct2/windows/Guest.cpp | 22 ++++++------ src/openrct2/windows/GuestList.cpp | 10 +++--- src/openrct2/windows/InstallTrack.cpp | 14 ++++---- src/openrct2/windows/Land.cpp | 8 ++--- src/openrct2/windows/LoadSave.cpp | 18 +++++----- src/openrct2/windows/Main.cpp | 6 ++-- src/openrct2/windows/Map.cpp | 24 ++++++------- src/openrct2/windows/MapTooltip.cpp | 6 ++-- src/openrct2/windows/MazeConstruction.cpp | 18 +++++----- src/openrct2/windows/NetworkStatus.cpp | 6 ++-- src/openrct2/windows/NewCampaign.cpp | 10 +++--- src/openrct2/windows/NewRide.cpp | 20 +++++------ src/openrct2/windows/ObjectLoadError.cpp | 6 ++-- src/openrct2/windows/Park.cpp | 26 +++++++------- src/openrct2/windows/Player.cpp | 16 ++++----- src/openrct2/windows/Research.cpp | 14 ++++---- src/openrct2/windows/Ride.cpp | 34 +++++++++---------- src/openrct2/windows/RideConstruction.cpp | 28 +++++++-------- src/openrct2/windows/RideList.cpp | 12 +++---- src/openrct2/windows/Scenery.cpp | 18 +++++----- src/openrct2/windows/Sign.cpp | 14 ++++---- src/openrct2/windows/Staff.cpp | 20 +++++------ src/openrct2/windows/StaffFirePrompt.cpp | 6 ++-- src/openrct2/windows/StaffList.cpp | 24 ++++++------- src/openrct2/windows/TextInput.cpp | 6 ++-- src/openrct2/windows/TileInspector.cpp | 26 +++++++------- src/openrct2/windows/TitleEditor.cpp | 10 +++--- src/openrct2/windows/TitleScenarioSelect.cpp | 2 +- src/openrct2/windows/Tooltip.cpp | 6 ++-- src/openrct2/windows/TopToolbar.cpp | 8 ++--- src/openrct2/windows/_legacy.c | 2 +- 59 files changed, 381 insertions(+), 381 deletions(-) diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 0c8a3a41e1..488e0a8de8 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -20,12 +20,12 @@ extern "C" { -#include -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include + #include } enum WINDOW_WATER_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 1b0dc00518..cb856befce 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -20,13 +20,13 @@ extern "C" { -#include -#include -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include + #include + #include } enum { diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 14b2122d04..c55c72ddda 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -20,11 +20,11 @@ extern "C" { -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include } enum { diff --git a/src/openrct2-ui/windows/MusicCredits.cpp b/src/openrct2-ui/windows/MusicCredits.cpp index 45198c4cd7..63a7e86b10 100644 --- a/src/openrct2-ui/windows/MusicCredits.cpp +++ b/src/openrct2-ui/windows/MusicCredits.cpp @@ -20,8 +20,8 @@ extern "C" { -#include -#include + #include + #include } enum WINDOW_MUSIC_CREDITS_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 4f136c9fb9..c1af5fbf62 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -20,13 +20,13 @@ extern "C" { -#include -#include -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include + #include + #include } enum WINDOW_NEWS_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index bf078964de..874d41898d 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -20,9 +20,9 @@ extern "C" { -#include -#include -#include + #include + #include + #include } enum { diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index cff08763bb..02ddbc4a42 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -35,19 +35,19 @@ extern "C" { -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include } enum WINDOW_OPTIONS_PAGE { diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index defcc98ce4..7618f84853 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -21,10 +21,10 @@ extern "C" { -#include -#include -#include -#include + #include + #include + #include + #include } enum WINDOW_SAVE_PROMPT_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 2eef3c3beb..dc4f5e4573 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -23,8 +23,8 @@ extern "C" { -#include -#include + #include + #include #include #include #include diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index bae5d85dd9..4721d5300e 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -21,11 +21,11 @@ extern "C" { -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include } static char _port[7]; diff --git a/src/openrct2-ui/windows/ShortcutKeyChange.cpp b/src/openrct2-ui/windows/ShortcutKeyChange.cpp index 22aedd4a27..69ad0fab9d 100644 --- a/src/openrct2-ui/windows/ShortcutKeyChange.cpp +++ b/src/openrct2-ui/windows/ShortcutKeyChange.cpp @@ -20,9 +20,9 @@ extern "C" { -#include -#include -#include + #include + #include + #include } #define WW 250 diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 68261559c0..9eadc31742 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -20,8 +20,8 @@ extern "C" { -#include -#include + #include + #include } #define WW 420 diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 75892ac096..baf9055389 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -19,15 +19,15 @@ extern "C" { -#include -#include -#include -#include -#include -#include -#include -#include -#include + #include + #include + #include + #include + #include + #include + #include + #include + #include } enum { diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 5fa5de2e67..73030c98f7 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -20,10 +20,10 @@ extern "C" { -#include + #include #include #include -#include + #include } enum WINDOW_TITLE_EXIT_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index b287668625..8383bf1d27 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -25,9 +25,9 @@ extern "C" #include #include #include -#include + #include #include -#include + #include } enum { diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index 8ce22c83d4..3155b22661 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -20,7 +20,7 @@ extern "C" { -#include + #include #include #include } diff --git a/src/openrct2/windows/DemolishRidePrompt.cpp b/src/openrct2/windows/DemolishRidePrompt.cpp index 6de660786d..6742854b6b 100644 --- a/src/openrct2/windows/DemolishRidePrompt.cpp +++ b/src/openrct2/windows/DemolishRidePrompt.cpp @@ -15,9 +15,9 @@ #pragma endregion extern "C" { -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" } #define WW 200 diff --git a/src/openrct2/windows/Dropdown.cpp b/src/openrct2/windows/Dropdown.cpp index e182a60cd9..17e8acd091 100644 --- a/src/openrct2/windows/Dropdown.cpp +++ b/src/openrct2/windows/Dropdown.cpp @@ -20,11 +20,11 @@ extern "C" { -#include "../input.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "dropdown.h" + #include "../input.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "dropdown.h" } // The maximum number of rows to list before items overflow into new columns diff --git a/src/openrct2/windows/EditorBottomToolbar.cpp b/src/openrct2/windows/EditorBottomToolbar.cpp index 3fe1df878c..af7a21f82e 100644 --- a/src/openrct2/windows/EditorBottomToolbar.cpp +++ b/src/openrct2/windows/EditorBottomToolbar.cpp @@ -19,16 +19,16 @@ extern "C" { -#include "../audio/audio.h" -#include "../game.h" -#include "../editor.h" -#include "../input.h" -#include "../sprites.h" -#include "../localisation/localisation.h" -#include "../interface/themes.h" -#include "../interface/widget.h" -#include "../world/scenery.h" -#include "error.h" + #include "../audio/audio.h" + #include "../game.h" + #include "../editor.h" + #include "../input.h" + #include "../sprites.h" + #include "../localisation/localisation.h" + #include "../interface/themes.h" + #include "../interface/widget.h" + #include "../world/scenery.h" + #include "error.h" } enum { diff --git a/src/openrct2/windows/EditorInventionsList.cpp b/src/openrct2/windows/EditorInventionsList.cpp index fd411f36ad..fe125b9b1f 100644 --- a/src/openrct2/windows/EditorInventionsList.cpp +++ b/src/openrct2/windows/EditorInventionsList.cpp @@ -22,14 +22,14 @@ extern "C" { -#include "../editor.h" -#include "../input.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "../util/util.h" -#include "../world/scenery.h" -#include "_legacy.h" + #include "../editor.h" + #include "../input.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "../util/util.h" + #include "../world/scenery.h" + #include "_legacy.h" } #pragma region Widgets diff --git a/src/openrct2/windows/EditorMain.cpp b/src/openrct2/windows/EditorMain.cpp index 49cec34a5d..e5d3ab2cb6 100644 --- a/src/openrct2/windows/EditorMain.cpp +++ b/src/openrct2/windows/EditorMain.cpp @@ -18,9 +18,9 @@ extern "C" { -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../world/footpath.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../world/footpath.h" } static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi); diff --git a/src/openrct2/windows/EditorObjectSelection.cpp b/src/openrct2/windows/EditorObjectSelection.cpp index a24658a8fe..58a0c6f93b 100644 --- a/src/openrct2/windows/EditorObjectSelection.cpp +++ b/src/openrct2/windows/EditorObjectSelection.cpp @@ -24,20 +24,20 @@ extern "C" { -#include -#include "../audio/audio.h" -#include "../game.h" -#include "../editor.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../object_list.h" -#include "../rct1.h" -#include "../ride/ride_data.h" -#include "../util/util.h" -#include "dropdown.h" -#include "error.h" -#include "../sprites.h" -#include "_legacy.h" + #include + #include "../audio/audio.h" + #include "../game.h" + #include "../editor.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../object_list.h" + #include "../rct1.h" + #include "../ride/ride_data.h" + #include "../util/util.h" + #include "dropdown.h" + #include "error.h" + #include "../sprites.h" + #include "_legacy.h" } enum { diff --git a/src/openrct2/windows/EditorObjectiveOptions.cpp b/src/openrct2/windows/EditorObjectiveOptions.cpp index 7c148100fa..31602a5a1d 100644 --- a/src/openrct2/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2/windows/EditorObjectiveOptions.cpp @@ -19,14 +19,14 @@ extern "C" { -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "../util/util.h" -#include "dropdown.h" -#include "error.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/date.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "../util/util.h" + #include "dropdown.h" + #include "error.h" } #pragma region Widgets diff --git a/src/openrct2/windows/EditorScenarioOptions.cpp b/src/openrct2/windows/EditorScenarioOptions.cpp index 3749cff558..39032fee76 100644 --- a/src/openrct2/windows/EditorScenarioOptions.cpp +++ b/src/openrct2/windows/EditorScenarioOptions.cpp @@ -19,13 +19,13 @@ extern "C" { -#include "../editor.h" -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "dropdown.h" -#include "error.h" + #include "../editor.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "dropdown.h" + #include "error.h" } #pragma region Widgets diff --git a/src/openrct2/windows/Error.cpp b/src/openrct2/windows/Error.cpp index 830ce35d7e..fe5025bbf8 100644 --- a/src/openrct2/windows/Error.cpp +++ b/src/openrct2/windows/Error.cpp @@ -20,10 +20,10 @@ extern "C" { -#include "../audio/audio.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "error.h" + #include "../audio/audio.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "error.h" } bool gDisableErrorWindowSound = false; diff --git a/src/openrct2/windows/Finances.cpp b/src/openrct2/windows/Finances.cpp index d86b239f8d..30474cd9a1 100644 --- a/src/openrct2/windows/Finances.cpp +++ b/src/openrct2/windows/Finances.cpp @@ -19,14 +19,14 @@ extern "C" { -#include "../game.h" -#include "../interface/graph.h" -#include "../interface/widget.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../ride/ride_data.h" -#include "../sprites.h" -#include "dropdown.h" + #include "../game.h" + #include "../interface/graph.h" + #include "../interface/widget.h" + #include "../localisation/date.h" + #include "../localisation/localisation.h" + #include "../ride/ride_data.h" + #include "../sprites.h" + #include "dropdown.h" } enum { diff --git a/src/openrct2/windows/Footpath.cpp b/src/openrct2/windows/Footpath.cpp index 8115ae9096..fe6d547e02 100644 --- a/src/openrct2/windows/Footpath.cpp +++ b/src/openrct2/windows/Footpath.cpp @@ -18,16 +18,16 @@ extern "C" { -#include "../audio/audio.h" -#include "../cheats.h" -#include "../game.h" -#include "../input.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "../world/footpath.h" -#include "dropdown.h" + #include "../audio/audio.h" + #include "../cheats.h" + #include "../game.h" + #include "../input.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "../world/footpath.h" + #include "dropdown.h" } enum { diff --git a/src/openrct2/windows/GameBottomToolbar.cpp b/src/openrct2/windows/GameBottomToolbar.cpp index a732858e2d..e4f13a2058 100644 --- a/src/openrct2/windows/GameBottomToolbar.cpp +++ b/src/openrct2/windows/GameBottomToolbar.cpp @@ -22,14 +22,14 @@ extern "C" { -#include "../game.h" -#include "../input.h" -#include "../interface/widget.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../management/news_item.h" -#include "../peep/staff.h" -#include "../sprites.h" + #include "../game.h" + #include "../input.h" + #include "../interface/widget.h" + #include "../localisation/date.h" + #include "../localisation/localisation.h" + #include "../management/news_item.h" + #include "../peep/staff.h" + #include "../sprites.h" } enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX { diff --git a/src/openrct2/windows/Guest.cpp b/src/openrct2/windows/Guest.cpp index a1c6aa5427..8981ab0c7d 100644 --- a/src/openrct2/windows/Guest.cpp +++ b/src/openrct2/windows/Guest.cpp @@ -19,17 +19,17 @@ extern "C" { -#include "../game.h" -#include "../input.h" -#include "../management/marketing.h" -#include "../peep/staff.h" -#include "../ride/ride_data.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../util/util.h" -#include "../world/footpath.h" + #include "../game.h" + #include "../input.h" + #include "../management/marketing.h" + #include "../peep/staff.h" + #include "../ride/ride_data.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../util/util.h" + #include "../world/footpath.h" } enum WINDOW_GUEST_PAGE { diff --git a/src/openrct2/windows/GuestList.cpp b/src/openrct2/windows/GuestList.cpp index 686b06ed0d..18a3a4a12b 100644 --- a/src/openrct2/windows/GuestList.cpp +++ b/src/openrct2/windows/GuestList.cpp @@ -18,11 +18,11 @@ extern "C" { -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "dropdown.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "dropdown.h" } enum { diff --git a/src/openrct2/windows/InstallTrack.cpp b/src/openrct2/windows/InstallTrack.cpp index da0603494e..89c6b87017 100644 --- a/src/openrct2/windows/InstallTrack.cpp +++ b/src/openrct2/windows/InstallTrack.cpp @@ -22,13 +22,13 @@ extern "C" { -#include "../audio/audio.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../platform/platform.h" -#include "../sprites.h" -#include "../util/util.h" -#include "error.h" + #include "../audio/audio.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../platform/platform.h" + #include "../sprites.h" + #include "../util/util.h" + #include "error.h" } enum { diff --git a/src/openrct2/windows/Land.cpp b/src/openrct2/windows/Land.cpp index f0e0bb6c47..9266eb82c3 100644 --- a/src/openrct2/windows/Land.cpp +++ b/src/openrct2/windows/Land.cpp @@ -19,10 +19,10 @@ extern "C" { -#include "../interface/land_tool.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "dropdown.h" + #include "../interface/land_tool.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "dropdown.h" } enum WINDOW_LAND_WIDGET_IDX { diff --git a/src/openrct2/windows/LoadSave.cpp b/src/openrct2/windows/LoadSave.cpp index 896d7c3f91..44df6a791b 100644 --- a/src/openrct2/windows/LoadSave.cpp +++ b/src/openrct2/windows/LoadSave.cpp @@ -20,15 +20,15 @@ extern "C" { -#include -#include "../core/Guard.hpp" -#include "../editor.h" -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../platform/platform.h" -#include "../util/util.h" -#include "../windows/error.h" + #include + #include "../core/Guard.hpp" + #include "../editor.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../platform/platform.h" + #include "../util/util.h" + #include "../windows/error.h" } #pragma region Widgets diff --git a/src/openrct2/windows/Main.cpp b/src/openrct2/windows/Main.cpp index 8d3a748609..eab06494d6 100644 --- a/src/openrct2/windows/Main.cpp +++ b/src/openrct2/windows/Main.cpp @@ -18,9 +18,9 @@ extern "C" { -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../world/footpath.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../world/footpath.h" } rct_widget window_main_widgets[] = { diff --git a/src/openrct2/windows/Map.cpp b/src/openrct2/windows/Map.cpp index 961e7b4461..f4cc23a52f 100644 --- a/src/openrct2/windows/Map.cpp +++ b/src/openrct2/windows/Map.cpp @@ -22,18 +22,18 @@ extern "C" { -#include "../audio/audio.h" -#include "../cheats.h" -#include "../game.h" -#include "../input.h" -#include "../interface/land_tool.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../world/entrance.h" -#include "../world/footpath.h" -#include "../world/scenery.h" -#include "error.h" + #include "../audio/audio.h" + #include "../cheats.h" + #include "../game.h" + #include "../input.h" + #include "../interface/land_tool.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../world/entrance.h" + #include "../world/footpath.h" + #include "../world/scenery.h" + #include "error.h" } #define MAP_COLOUR_2(colourA, colourB) ((colourA << 8) | colourB) diff --git a/src/openrct2/windows/MapTooltip.cpp b/src/openrct2/windows/MapTooltip.cpp index ad00cf2356..4c1d7dbcb9 100644 --- a/src/openrct2/windows/MapTooltip.cpp +++ b/src/openrct2/windows/MapTooltip.cpp @@ -18,9 +18,9 @@ extern "C" { -#include "../input.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" + #include "../input.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" } static rct_widget window_map_tooltip_widgets[] = { diff --git a/src/openrct2/windows/MazeConstruction.cpp b/src/openrct2/windows/MazeConstruction.cpp index 45680532f1..e4e4f65e4f 100644 --- a/src/openrct2/windows/MazeConstruction.cpp +++ b/src/openrct2/windows/MazeConstruction.cpp @@ -17,15 +17,15 @@ extern "C" { -#include "../audio/audio.h" -#include "../drawing/drawing.h" -#include "../game.h" -#include "../input.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../ride/track.h" -#include "../sprites.h" + #include "../audio/audio.h" + #include "../drawing/drawing.h" + #include "../game.h" + #include "../input.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../ride/track.h" + #include "../sprites.h" } #pragma region Widgets diff --git a/src/openrct2/windows/NetworkStatus.cpp b/src/openrct2/windows/NetworkStatus.cpp index ad942f3be7..973c8b5058 100644 --- a/src/openrct2/windows/NetworkStatus.cpp +++ b/src/openrct2/windows/NetworkStatus.cpp @@ -18,9 +18,9 @@ extern "C" { -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../util/util.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../util/util.h" } static char _password[33]; diff --git a/src/openrct2/windows/NewCampaign.cpp b/src/openrct2/windows/NewCampaign.cpp index 5ec07c7e68..7295b39cd9 100644 --- a/src/openrct2/windows/NewCampaign.cpp +++ b/src/openrct2/windows/NewCampaign.cpp @@ -19,11 +19,11 @@ extern "C" { -#include "../game.h" -#include "../localisation/localisation.h" -#include "../interface/widget.h" -#include "../ride/ride_data.h" -#include "dropdown.h" + #include "../game.h" + #include "../localisation/localisation.h" + #include "../interface/widget.h" + #include "../ride/ride_data.h" + #include "dropdown.h" } #define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF) diff --git a/src/openrct2/windows/NewRide.cpp b/src/openrct2/windows/NewRide.cpp index 0c5581f8bf..e9e016c52d 100644 --- a/src/openrct2/windows/NewRide.cpp +++ b/src/openrct2/windows/NewRide.cpp @@ -24,16 +24,16 @@ extern "C" { -#include "../audio/audio.h" -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../management/news_item.h" -#include "../rct1.h" -#include "../ride/ride_data.h" -#include "../ride/track_data.h" -#include "../sprites.h" -#include "../util/util.h" + #include "../audio/audio.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../management/news_item.h" + #include "../rct1.h" + #include "../ride/ride_data.h" + #include "../ride/track_data.h" + #include "../sprites.h" + #include "../util/util.h" } static uint8 _windowNewRideCurrentTab; diff --git a/src/openrct2/windows/ObjectLoadError.cpp b/src/openrct2/windows/ObjectLoadError.cpp index b33191bfc7..bf33e235bd 100644 --- a/src/openrct2/windows/ObjectLoadError.cpp +++ b/src/openrct2/windows/ObjectLoadError.cpp @@ -19,9 +19,9 @@ extern "C" { -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../platform/platform.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../platform/platform.h" } enum WINDOW_OBJECT_LOAD_ERROR_WIDGET_IDX { diff --git a/src/openrct2/windows/Park.cpp b/src/openrct2/windows/Park.cpp index 50e2c4cf01..c7d2b40d14 100644 --- a/src/openrct2/windows/Park.cpp +++ b/src/openrct2/windows/Park.cpp @@ -20,19 +20,19 @@ extern "C" { -#include "../game.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../input.h" -#include "../interface/graph.h" -#include "../interface/land_tool.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../management/award.h" -#include "../util/util.h" -#include "../world/entrance.h" -#include "dropdown.h" -#include "../interface/themes.h" + #include "../game.h" + #include "../localisation/date.h" + #include "../localisation/localisation.h" + #include "../input.h" + #include "../interface/graph.h" + #include "../interface/land_tool.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../management/award.h" + #include "../util/util.h" + #include "../world/entrance.h" + #include "dropdown.h" + #include "../interface/themes.h" } enum WINDOW_PARK_PAGE { diff --git a/src/openrct2/windows/Player.cpp b/src/openrct2/windows/Player.cpp index 6ec9304a43..76c212b3cf 100644 --- a/src/openrct2/windows/Player.cpp +++ b/src/openrct2/windows/Player.cpp @@ -19,14 +19,14 @@ extern "C" { -#include "../game.h" -#include "../input.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../util/util.h" -#include "dropdown.h" + #include "../game.h" + #include "../input.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../util/util.h" + #include "dropdown.h" } enum WINDOW_PLAYER_PAGE { diff --git a/src/openrct2/windows/Research.cpp b/src/openrct2/windows/Research.cpp index 5eef3b4694..94f6d0fe5c 100644 --- a/src/openrct2/windows/Research.cpp +++ b/src/openrct2/windows/Research.cpp @@ -16,13 +16,13 @@ extern "C" { -#include "../game.h" -#include "../localisation/localisation.h" -#include "../interface/widget.h" -#include "../management/news_item.h" -#include "../sprites.h" -#include "../world/scenery.h" -#include "dropdown.h" + #include "../game.h" + #include "../localisation/localisation.h" + #include "../interface/widget.h" + #include "../management/news_item.h" + #include "../sprites.h" + #include "../world/scenery.h" + #include "dropdown.h" } enum { diff --git a/src/openrct2/windows/Ride.cpp b/src/openrct2/windows/Ride.cpp index 597048551d..96a955c389 100644 --- a/src/openrct2/windows/Ride.cpp +++ b/src/openrct2/windows/Ride.cpp @@ -25,23 +25,23 @@ extern "C" { -#include "../audio/audio.h" -#include "../cheats.h" -#include "../game.h" -#include "../input.h" -#include "../interface/themes.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/date.h" -#include "../localisation/localisation.h" -#include "../peep/staff.h" -#include "../rct1.h" -#include "../ride/ride_data.h" -#include "../ride/track.h" -#include "../ride/track_data.h" -#include "../sprites.h" -#include "../windows/error.h" -#include "dropdown.h" + #include "../audio/audio.h" + #include "../cheats.h" + #include "../game.h" + #include "../input.h" + #include "../interface/themes.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/date.h" + #include "../localisation/localisation.h" + #include "../peep/staff.h" + #include "../rct1.h" + #include "../ride/ride_data.h" + #include "../ride/track.h" + #include "../ride/track_data.h" + #include "../sprites.h" + #include "../windows/error.h" + #include "dropdown.h" } diff --git a/src/openrct2/windows/RideConstruction.cpp b/src/openrct2/windows/RideConstruction.cpp index a51763a472..66797e808f 100644 --- a/src/openrct2/windows/RideConstruction.cpp +++ b/src/openrct2/windows/RideConstruction.cpp @@ -23,20 +23,20 @@ extern "C" { -#include "../audio/audio.h" -#include "../cheats.h" -#include "../game.h" -#include "../input.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../ride/ride_data.h" -#include "../ride/track.h" -#include "../ride/track_data.h" -#include "../world/footpath.h" -#include "dropdown.h" -#include "../sprites.h" -#include "../world/entrance.h" + #include "../audio/audio.h" + #include "../cheats.h" + #include "../game.h" + #include "../input.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../ride/ride_data.h" + #include "../ride/track.h" + #include "../ride/track_data.h" + #include "../world/footpath.h" + #include "dropdown.h" + #include "../sprites.h" + #include "../world/entrance.h" } #pragma region Widgets diff --git a/src/openrct2/windows/RideList.cpp b/src/openrct2/windows/RideList.cpp index 6f4168363f..f172ce11b7 100644 --- a/src/openrct2/windows/RideList.cpp +++ b/src/openrct2/windows/RideList.cpp @@ -20,12 +20,12 @@ extern "C" { -#include "../game.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "../interface/widget.h" -#include "dropdown.h" -#include "../interface/themes.h" + #include "../game.h" + #include "../localisation/localisation.h" + #include "../sprites.h" + #include "../interface/widget.h" + #include "dropdown.h" + #include "../interface/themes.h" } enum { diff --git a/src/openrct2/windows/Scenery.cpp b/src/openrct2/windows/Scenery.cpp index 94f3a2b68a..e22b1471cd 100644 --- a/src/openrct2/windows/Scenery.cpp +++ b/src/openrct2/windows/Scenery.cpp @@ -20,15 +20,15 @@ extern "C" { -#include "../audio/audio.h" -#include "../input.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../world/scenery.h" -#include "dropdown.h" -#include "error.h" -#include "../sprites.h" + #include "../audio/audio.h" + #include "../input.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../world/scenery.h" + #include "dropdown.h" + #include "error.h" + #include "../sprites.h" } #define WINDOW_SCENERY_WIDTH 634 diff --git a/src/openrct2/windows/Sign.cpp b/src/openrct2/windows/Sign.cpp index 28e7e5b5d6..01f1168ea4 100644 --- a/src/openrct2/windows/Sign.cpp +++ b/src/openrct2/windows/Sign.cpp @@ -18,13 +18,13 @@ extern "C" { -#include "../game.h" -#include "../localisation/localisation.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../world/scenery.h" -#include "dropdown.h" -#include "../sprites.h" + #include "../game.h" + #include "../localisation/localisation.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../world/scenery.h" + #include "dropdown.h" + #include "../sprites.h" } #define WW 113 diff --git a/src/openrct2/windows/Staff.cpp b/src/openrct2/windows/Staff.cpp index bae588d8b1..a4a71b5410 100644 --- a/src/openrct2/windows/Staff.cpp +++ b/src/openrct2/windows/Staff.cpp @@ -18,16 +18,16 @@ extern "C" { -#include "../game.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../peep/staff.h" -#include "../sprites.h" -#include "../world/footpath.h" -#include "../input.h" -#include "dropdown.h" -#include "../interface/themes.h" + #include "../game.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../peep/staff.h" + #include "../sprites.h" + #include "../world/footpath.h" + #include "../input.h" + #include "dropdown.h" + #include "../interface/themes.h" } #define WW 190 diff --git a/src/openrct2/windows/StaffFirePrompt.cpp b/src/openrct2/windows/StaffFirePrompt.cpp index 7e53501982..c06984d2de 100644 --- a/src/openrct2/windows/StaffFirePrompt.cpp +++ b/src/openrct2/windows/StaffFirePrompt.cpp @@ -16,9 +16,9 @@ extern "C" { -#include "../game.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" + #include "../game.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" } #define WW 200 diff --git a/src/openrct2/windows/StaffList.cpp b/src/openrct2/windows/StaffList.cpp index bcbc2debfc..f42247845b 100644 --- a/src/openrct2/windows/StaffList.cpp +++ b/src/openrct2/windows/StaffList.cpp @@ -18,18 +18,18 @@ extern "C" { -#include "../drawing/drawing.h" -#include "../game.h" -#include "../input.h" -#include "../interface/viewport.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../peep/staff.h" -#include "../sprites.h" -#include "../util/util.h" -#include "../world/footpath.h" -#include "dropdown.h" -#include "error.h" + #include "../drawing/drawing.h" + #include "../game.h" + #include "../input.h" + #include "../interface/viewport.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../peep/staff.h" + #include "../sprites.h" + #include "../util/util.h" + #include "../world/footpath.h" + #include "dropdown.h" + #include "error.h" } enum { diff --git a/src/openrct2/windows/TextInput.cpp b/src/openrct2/windows/TextInput.cpp index 4282ff438a..8cb8050cf4 100644 --- a/src/openrct2/windows/TextInput.cpp +++ b/src/openrct2/windows/TextInput.cpp @@ -27,9 +27,9 @@ extern "C" { -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../util/util.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../util/util.h" } #define WW 250 diff --git a/src/openrct2/windows/TileInspector.cpp b/src/openrct2/windows/TileInspector.cpp index 5e4bc718d5..6b1001f3d6 100644 --- a/src/openrct2/windows/TileInspector.cpp +++ b/src/openrct2/windows/TileInspector.cpp @@ -20,19 +20,19 @@ extern "C" { -#include "../common.h" -#include "../game.h" -#include "../input.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../ride/ride_data.h" -#include "../ride/track.h" -#include "../sprites.h" -#include "../world/footpath.h" -#include "../world/scenery.h" -#include "../world/tile_inspector.h" -#include "dropdown.h" -#include "tile_inspector.h" + #include "../common.h" + #include "../game.h" + #include "../input.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../ride/ride_data.h" + #include "../ride/track.h" + #include "../sprites.h" + #include "../world/footpath.h" + #include "../world/scenery.h" + #include "../world/tile_inspector.h" + #include "dropdown.h" + #include "tile_inspector.h" } static const rct_string_id TerrainTypeStringIds[] = { diff --git a/src/openrct2/windows/TitleEditor.cpp b/src/openrct2/windows/TitleEditor.cpp index a5f310d86a..e93d317d61 100644 --- a/src/openrct2/windows/TitleEditor.cpp +++ b/src/openrct2/windows/TitleEditor.cpp @@ -26,13 +26,13 @@ extern "C" { -#include "../game.h" + #include "../game.h" #include "../input.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" + #include "../interface/widget.h" + #include "../localisation/localisation.h" + #include "../sprites.h" #include "../util/util.h" -#include "dropdown.h" + #include "dropdown.h" #include "error.h" } diff --git a/src/openrct2/windows/TitleScenarioSelect.cpp b/src/openrct2/windows/TitleScenarioSelect.cpp index 98fc159798..914d5812a7 100644 --- a/src/openrct2/windows/TitleScenarioSelect.cpp +++ b/src/openrct2/windows/TitleScenarioSelect.cpp @@ -26,7 +26,7 @@ extern "C" #include "../localisation/localisation.h" #include "../sprites.h" #include "../interface/widget.h" -#include "../interface/themes.h" + #include "../interface/themes.h" #include "../util/util.h" } diff --git a/src/openrct2/windows/Tooltip.cpp b/src/openrct2/windows/Tooltip.cpp index 71821b60c9..e8c16ea243 100644 --- a/src/openrct2/windows/Tooltip.cpp +++ b/src/openrct2/windows/Tooltip.cpp @@ -19,10 +19,10 @@ extern "C" { -#include "../localisation/localisation.h" + #include "../localisation/localisation.h" #include "../input.h" #include "../interface/widget.h" -#include "tooltip.h" + #include "tooltip.h" } enum { @@ -242,4 +242,4 @@ extern "C" { _window_tooltip_close(); } -} \ No newline at end of file +} diff --git a/src/openrct2/windows/TopToolbar.cpp b/src/openrct2/windows/TopToolbar.cpp index f8517b8ee9..f8b7b8614e 100644 --- a/src/openrct2/windows/TopToolbar.cpp +++ b/src/openrct2/windows/TopToolbar.cpp @@ -28,15 +28,15 @@ extern "C" #include "../audio/audio.h" #include "../cheats.h" #include "../editor.h" -#include "../input.h" + #include "../input.h" #include "../interface/console.h" #include "../interface/land_tool.h" #include "../interface/viewport.h" #include "../interface/widget.h" -#include "../network/twitch.h" + #include "../network/twitch.h" #include "../peep/staff.h" -#include "../util/util.h" -#include "../world/footpath.h" + #include "../util/util.h" + #include "../world/footpath.h" #include "../world/scenery.h" #include "dropdown.h" } diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c index 5430866b36..4d41f1b533 100644 --- a/src/openrct2/windows/_legacy.c +++ b/src/openrct2/windows/_legacy.c @@ -60,4 +60,4 @@ const rct_object_entry DefaultSelectedObjects[26] = { { 0x00000087, { "SCGJUNGL" }, 0 }, // Jungle Theming { 0x00000087, { "SCGSNOW " }, 0 }, // Snow and Ice Theming { 0x00000087, { "SCGWATER" }, 0 } // Water Feature Theming -}; \ No newline at end of file +};