diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index ef68feefc9..cadf06829b 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -13,7 +13,6 @@ #include "interface/InGameConsole.h" #include -#include #include #include #include diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp index 7b48bd698c..7dfa271b1b 100644 --- a/src/openrct2-ui/UiContext.Linux.cpp +++ b/src/openrct2-ui/UiContext.Linux.cpp @@ -12,6 +12,7 @@ # include "UiContext.h" # include +# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Win32.cpp b/src/openrct2-ui/UiContext.Win32.cpp index a19a8d564e..588dbd5d73 100644 --- a/src/openrct2-ui/UiContext.Win32.cpp +++ b/src/openrct2-ui/UiContext.Win32.cpp @@ -21,7 +21,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index de1e93c9e0..dd87767c91 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -21,7 +21,6 @@ #include "title/TitleSequencePlayer.h" #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/BitmapReader.cpp b/src/openrct2-ui/drawing/BitmapReader.cpp index 242d5b8fb6..e3379f355c 100644 --- a/src/openrct2-ui/drawing/BitmapReader.cpp +++ b/src/openrct2-ui/drawing/BitmapReader.cpp @@ -10,7 +10,6 @@ #include "BitmapReader.h" #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 80abd9dc44..fc83719683 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -22,7 +22,6 @@ # include "TransparencyDepth.h" # include -# include # include # include # include diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h index 097e4f98b9..331148256d 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h @@ -13,7 +13,6 @@ #include "OpenGLAPI.h" #include -#include #include #include #include diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index dddd437c94..d3774fd69f 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/interface/InGameConsole.cpp b/src/openrct2-ui/interface/InGameConsole.cpp index 9e483837b6..12843d568c 100644 --- a/src/openrct2-ui/interface/InGameConsole.cpp +++ b/src/openrct2-ui/interface/InGameConsole.cpp @@ -11,7 +11,6 @@ #include "Theme.h" -#include #include #include #include diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp index 350c38ab94..c57bfa333a 100644 --- a/src/openrct2-ui/interface/Theme.cpp +++ b/src/openrct2-ui/interface/Theme.cpp @@ -13,7 +13,6 @@ #include "Window.h" -#include #include #include #include diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 1f25734068..b11b6b54ea 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -11,7 +11,6 @@ #include "Viewport.h" #include "Window.h" -#include #include #include #include diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 5b467f4ecb..1860570802 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -11,7 +11,6 @@ #include "Window.h" -#include #include #include #include diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 3ae2a9ed1f..edb04c2542 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -14,7 +14,6 @@ #include "openrct2/world/Location.hpp" #include -#include #include #include #include diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index f77003dfab..7e736914bc 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -18,7 +18,6 @@ # include "ScViewport.hpp" # include "ScWindow.hpp" -# include # include # include # include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index 4e0c24a4f5..b342074e86 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -11,7 +11,6 @@ #include "../interface/Window.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 0425c07c18..2dc3ea20d6 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index b790d1d088..4b5e9e881b 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 5589f8a3ea..51ec43a0a0 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 42627d6003..b408cfc2e9 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index 1d796f5390..2c42f47436 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 3901f2e0d4..b2c945d4f8 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 99b7795ccb..4d59238c87 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -12,7 +12,6 @@ #include "../interface/Window.h" #include "Window.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index c029f7c247..ef42cfa3c1 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -12,7 +12,6 @@ #include "../interface/Window.h" #include "Window.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 192492711f..fb6273f752 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 7d0f851d93..a35712ceb7 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 3df6533d12..6b76cc1708 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -9,7 +9,6 @@ #include "../interface/Theme.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 2e6e1dd513..c6bc924b8e 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index b4201b2591..925c774ee0 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 0bd215d791..499bb913e4 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 84e9397ca2..37d98482ec 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 56a5ddd44c..d1ceca87c1 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 7fe8428455..ec6986bad6 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index ca64284f5e..5d2bfd2cfb 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 1ff5cb675f..11ccc0c555 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 01c31d0cf9..7960e6605a 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -14,7 +14,6 @@ #include "../interface/Theme.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index dc0d20b49c..7c8d7a554b 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -9,7 +9,6 @@ #include "../interface/Theme.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index 4b6d01b0ce..9a88f99e07 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 4833c7ef7c..e48dca60f9 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -9,7 +9,6 @@ #include "../interface/Theme.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 02741d3855..b5a9dedf36 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -9,7 +9,6 @@ #include "../ride/Construction.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 327573e92a..038bf74f89 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index b108f952f3..43e61be79f 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index c99c94e3e8..84eb33b92e 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index 8417ba037b..b9bd764502 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index b764939718..b5f4492d07 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -11,7 +11,6 @@ #include "../interface/InGameConsole.h" #include "../scripting/CustomMenu.h" -#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 0e552236fc..1a83ff86f7 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 27416bf4ea..6c2874b1ac 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index b6fa8ff905..19a050b57e 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 5d8c50fd76..6b817e6bbf 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 4c653da6d3..513e5c463d 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index c2d145da40..3ac71ea62c 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2/AssetPack.cpp b/src/openrct2/AssetPack.cpp index b06a4f58d5..051b6b0b1a 100644 --- a/src/openrct2/AssetPack.cpp +++ b/src/openrct2/AssetPack.cpp @@ -17,8 +17,6 @@ #include "localisation/LocalisationService.h" #include "object/Object.h" -#include - using namespace OpenRCT2; constexpr std::string_view ManifestFileName = "manifest.json"; diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 0198f476d8..466ba761d7 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -77,7 +77,6 @@ #include "util/Util.h" #include "world/Park.h" -#include #include #include #include diff --git a/src/openrct2/Date.cpp b/src/openrct2/Date.cpp index 5c81321702..b753756493 100644 --- a/src/openrct2/Date.cpp +++ b/src/openrct2/Date.cpp @@ -15,8 +15,6 @@ #include "GameState.h" #include "core/Guard.hpp" -#include - using namespace OpenRCT2; constexpr int32_t kMonthTicksIncrement = 4; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index fd52e4e5f5..b1ee1b7b8b 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -48,7 +48,6 @@ #include "world/Park.h" #include "world/Scenery.h" -#include #include #include diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index e5166ace0e..7645933d94 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -70,7 +70,6 @@ #include "world/Scenery.h" #include "world/Surface.h" -#include #include #include #include diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 16b916e2e3..91ee2bc5de 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -44,7 +44,6 @@ #include "world/Park.h" #include "world/Scenery.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/actions/ClearAction.cpp b/src/openrct2/actions/ClearAction.cpp index 366d1661da..b079f08374 100644 --- a/src/openrct2/actions/ClearAction.cpp +++ b/src/openrct2/actions/ClearAction.cpp @@ -22,8 +22,6 @@ #include "SmallSceneryRemoveAction.h" #include "WallRemoveAction.h" -#include - ClearAction::ClearAction(MapRange range, ClearableItems itemsToClear) : _range(range) , _itemsToClear(itemsToClear) diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 2db04d6d86..9402100080 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -30,7 +30,6 @@ #include "../world/Park.h" #include "../world/Scenery.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/actions/GameActionResult.cpp b/src/openrct2/actions/GameActionResult.cpp index 1d1d92fc4c..7bee0864ab 100644 --- a/src/openrct2/actions/GameActionResult.cpp +++ b/src/openrct2/actions/GameActionResult.cpp @@ -2,6 +2,8 @@ #include "../localisation/Localisation.h" +#include + namespace GameActions { Result::Result(GameActions::Status error, StringId title, StringId message, uint8_t* args /*= nullptr*/) diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 9eafd8009e..756ec806c8 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -26,8 +26,6 @@ #include "../scenario/Scenario.h" #include "../world/Park.h" -#include - using namespace OpenRCT2; RideCreateAction::RideCreateAction( diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index 3e972ae68d..0db80078e3 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -18,8 +18,6 @@ #include "../util/Util.h" #include "../world/Park.h" -#include - using namespace OpenRCT2; void ScenarioSetSettingAction::Serialise(DataSerialiser& stream) diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 753c469532..d3bb5947ea 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -33,7 +33,6 @@ #include "AudioContext.h" #include "AudioMixer.h" -#include #include #include #include diff --git a/src/openrct2/command_line/CommandLine.cpp b/src/openrct2/command_line/CommandLine.cpp index 060f1ca608..3a204a7eb4 100644 --- a/src/openrct2/command_line/CommandLine.cpp +++ b/src/openrct2/command_line/CommandLine.cpp @@ -14,7 +14,6 @@ #include "../core/String.hpp" #include "../platform/Platform.h" -#include #include #pragma region CommandLineArgEnumerator diff --git a/src/openrct2/core/Algorithm.hpp b/src/openrct2/core/Algorithm.hpp index a245a345b6..a7072ca1e3 100644 --- a/src/openrct2/core/Algorithm.hpp +++ b/src/openrct2/core/Algorithm.hpp @@ -9,7 +9,6 @@ #pragma once -#include #include template> diff --git a/src/openrct2/core/BitSet.hpp b/src/openrct2/core/BitSet.hpp index ee0d1c1ae4..db8bd1c06b 100644 --- a/src/openrct2/core/BitSet.hpp +++ b/src/openrct2/core/BitSet.hpp @@ -8,7 +8,6 @@ *****************************************************************************/ #pragma once -#include #include #include #include diff --git a/src/openrct2/core/Crypt.OpenRCT2.cpp b/src/openrct2/core/Crypt.OpenRCT2.cpp index 6a4574641b..03b7405d2c 100644 --- a/src/openrct2/core/Crypt.OpenRCT2.cpp +++ b/src/openrct2/core/Crypt.OpenRCT2.cpp @@ -9,7 +9,6 @@ #include "Crypt.h" -#include #include #include #include diff --git a/src/openrct2/core/FileStream.cpp b/src/openrct2/core/FileStream.cpp index 8f911ef8fc..ea82218932 100644 --- a/src/openrct2/core/FileStream.cpp +++ b/src/openrct2/core/FileStream.cpp @@ -12,7 +12,6 @@ #include "Path.hpp" #include "String.hpp" -#include #include #ifndef _WIN32 diff --git a/src/openrct2/core/FileWatcher.cpp b/src/openrct2/core/FileWatcher.cpp index b3c24db6c6..afb9177c18 100644 --- a/src/openrct2/core/FileWatcher.cpp +++ b/src/openrct2/core/FileWatcher.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2/core/Imaging.cpp b/src/openrct2/core/Imaging.cpp index a0b3f351e8..7a7bc3f6b6 100644 --- a/src/openrct2/core/Imaging.cpp +++ b/src/openrct2/core/Imaging.cpp @@ -19,7 +19,6 @@ #include "Memory.hpp" #include "String.hpp" -#include #include #include #include diff --git a/src/openrct2/core/JobPool.cpp b/src/openrct2/core/JobPool.cpp index fa46039036..e4038663ab 100644 --- a/src/openrct2/core/JobPool.cpp +++ b/src/openrct2/core/JobPool.cpp @@ -9,7 +9,6 @@ #include "JobPool.h" -#include #include JobPool::TaskData::TaskData(std::function workFn, std::function completionFn) diff --git a/src/openrct2/core/MemoryStream.cpp b/src/openrct2/core/MemoryStream.cpp index acacd5e3ba..a0da18d123 100644 --- a/src/openrct2/core/MemoryStream.cpp +++ b/src/openrct2/core/MemoryStream.cpp @@ -11,7 +11,6 @@ #include "Memory.hpp" -#include #include namespace OpenRCT2 diff --git a/src/openrct2/core/OrcaStream.hpp b/src/openrct2/core/OrcaStream.hpp index 19d957aafd..00e42c6f69 100644 --- a/src/openrct2/core/OrcaStream.hpp +++ b/src/openrct2/core/OrcaStream.hpp @@ -15,7 +15,6 @@ #include "Identifier.hpp" #include "MemoryStream.h" -#include #include #include #include diff --git a/src/openrct2/core/Path.cpp b/src/openrct2/core/Path.cpp index c35b5f62c7..c329c6b588 100644 --- a/src/openrct2/core/Path.cpp +++ b/src/openrct2/core/Path.cpp @@ -17,7 +17,6 @@ #include "Memory.hpp" #include "String.hpp" -#include #include namespace Path diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 9800f8d0bf..bc1f7b34f6 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include #include #include #include diff --git a/src/openrct2/core/StringBuilder.cpp b/src/openrct2/core/StringBuilder.cpp index f5fa2c64d4..1a10d12485 100644 --- a/src/openrct2/core/StringBuilder.cpp +++ b/src/openrct2/core/StringBuilder.cpp @@ -11,7 +11,6 @@ #include "String.hpp" -#include #include StringBuilder::StringBuilder(size_t capacity) diff --git a/src/openrct2/core/Zip.cpp b/src/openrct2/core/Zip.cpp index b94f23a45a..84bcb1be85 100644 --- a/src/openrct2/core/Zip.cpp +++ b/src/openrct2/core/Zip.cpp @@ -11,7 +11,6 @@ #include "IStream.hpp" -#include #ifndef __ANDROID__ # include #endif diff --git a/src/openrct2/drawing/Drawing.Sprite.RLE.cpp b/src/openrct2/drawing/Drawing.Sprite.RLE.cpp index cfc05d0a49..c4baf88ffa 100644 --- a/src/openrct2/drawing/Drawing.Sprite.RLE.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.RLE.cpp @@ -9,7 +9,6 @@ #include "Drawing.h" -#include #include template diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index d691286a0f..b1eaee7d9f 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -22,7 +22,6 @@ #include "../util/Util.h" #include "ScrollingText.h" -#include #include #include #include diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index e8c484da69..9d97a8fa9f 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -23,8 +23,6 @@ #include "../sprites.h" #include "TTF.h" -#include - using namespace OpenRCT2; static int32_t TTFGetStringWidth(std::string_view text, FontStyle fontStyle, bool noFormatting); diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 73b8b3e58a..f68407b33b 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -25,7 +25,6 @@ #include "../world/Map.h" #include "Drawing.h" -#include #include #include diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index a6d3604630..be176b72ef 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -21,7 +21,6 @@ #include "Drawing.h" #include "TTF.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/drawing/TTFSDLPort.cpp b/src/openrct2/drawing/TTFSDLPort.cpp index 1bc216c0ea..58a02b21d3 100644 --- a/src/openrct2/drawing/TTFSDLPort.cpp +++ b/src/openrct2/drawing/TTFSDLPort.cpp @@ -35,7 +35,6 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -# include # include # include # include diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index ca0ef40a26..667445e001 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -24,7 +24,6 @@ #include "LightFX.h" #include "Weather.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp index ee35c71350..f08bc1ffc0 100644 --- a/src/openrct2/entity/Duck.cpp +++ b/src/openrct2/entity/Duck.cpp @@ -20,7 +20,6 @@ #include "../world/Surface.h" #include "EntityRegistry.h" -#include #include #include diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index 2567d24e76..bacebf07f0 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -31,7 +31,6 @@ #include "MoneyEffect.h" #include "Particle.h" -#include #include #include #include diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 01132f0057..d5446cc109 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -61,7 +61,6 @@ #include "Peep.h" #include "Staff.h" -#include #include #include diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index c3e5e7c8c4..18bb860f1d 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -58,7 +58,6 @@ #include "PatrolArea.h" #include "Staff.h" -#include #include #include #include diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h index 109493088c..23e1eda2af 100644 --- a/src/openrct2/entity/Peep.h +++ b/src/openrct2/entity/Peep.h @@ -17,7 +17,6 @@ #include "../util/Util.h" #include "../world/Location.hpp" -#include #include #include diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 977e9befa5..c1e58ba9f7 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -47,7 +47,6 @@ #include "PatrolArea.h" #include "Peep.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index 0189d69472..88ec236bc8 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -21,8 +21,6 @@ #include "../util/Util.h" #include "../world/Location.hpp" -#include - using namespace OpenRCT2; using namespace OpenRCT2::Audio; diff --git a/src/openrct2/interface/Colour.cpp b/src/openrct2/interface/Colour.cpp index 97dec8f039..7829b74167 100644 --- a/src/openrct2/interface/Colour.cpp +++ b/src/openrct2/interface/Colour.cpp @@ -13,7 +13,6 @@ #include "../drawing/Drawing.h" #include "../sprites.h" -#include #include ColourShadeMap ColourMapA[COLOUR_COUNT] = {}; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index b54d54fc86..8783cc5e78 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -64,7 +64,6 @@ #include "../world/Scenery.h" #include "Viewport.h" -#include #include #include #include diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index b3214d9161..be4a36bb98 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -33,7 +33,6 @@ #include "../world/Surface.h" #include "Viewport.h" -#include #include #include #include diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 2045ea3450..55026bd566 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -41,7 +41,6 @@ #include "Window.h" #include "Window_internal.h" -#include #include #include #include diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index b62b44dae3..45a7263ad8 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -34,7 +34,6 @@ #include "Widget.h" #include "Window_internal.h" -#include #include #include #include diff --git a/src/openrct2/localisation/Convert.cpp b/src/openrct2/localisation/Convert.cpp index 7da1615b78..77c50b1853 100644 --- a/src/openrct2/localisation/Convert.cpp +++ b/src/openrct2/localisation/Convert.cpp @@ -11,7 +11,6 @@ #include "ConversionTables.h" #include "Language.h" -#include #include #include diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index 68e260a491..703dafb078 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -21,7 +21,6 @@ #include "Localisation.h" #include "LocalisationService.h" -#include #include #include #include diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 753d5a5271..367c4a5682 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -30,7 +30,6 @@ #include "Formatting.h" #include "Localisation.h" -#include #include #include #include diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 0904b7b451..7eb6facaf2 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -22,8 +22,6 @@ #include "../world/Park.h" #include "NewsItem.h" -#include - using namespace OpenRCT2; constexpr uint8_t NEGATIVE = 0; diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 34544c8066..ac79b73dff 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -39,7 +39,6 @@ #include "Finance.h" #include "NewsItem.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 23da4dcf01..739c10dd11 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -36,7 +36,6 @@ #include "../world/Location.hpp" #include "network.h" -#include #include #include @@ -92,7 +91,6 @@ static constexpr uint32_t MaxPacketsPerUpdate = 100; # include "NetworkUser.h" # include "Socket.h" -# include # include # include # include diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index 8b7c2b79c5..b803fb77da 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -26,7 +26,6 @@ # include "Socket.h" # include "network.h" -# include # include # include diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp index 00abbddc1e..6bac572b7a 100644 --- a/src/openrct2/object/ImageTable.cpp +++ b/src/openrct2/object/ImageTable.cpp @@ -23,7 +23,6 @@ #include "Object.h" #include "ObjectFactory.h" -#include #include #include diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index eda305cd0c..56b85a376f 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -20,7 +20,6 @@ #include "../world/Banner.h" #include "../world/Location.hpp" -#include #include static RCTLargeSceneryText ReadLegacy3DFont(OpenRCT2::IStream& stream) diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index ca2b46ee51..ada421bd26 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -23,7 +23,6 @@ #include "ObjectLimits.h" #include "ObjectRepository.h" -#include #include #include diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 01d6646924..2ad3336d19 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -44,7 +44,6 @@ #include "WallObject.h" #include "WaterObject.h" -#include #include #include diff --git a/src/openrct2/object/ObjectList.cpp b/src/openrct2/object/ObjectList.cpp index 7c542b30b6..a00b69a829 100644 --- a/src/openrct2/object/ObjectList.cpp +++ b/src/openrct2/object/ObjectList.cpp @@ -18,7 +18,6 @@ #include "ObjectManager.h" #include "ObjectRepository.h" -#include #include #include diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 9c0157798a..d7b4d35287 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -30,7 +30,6 @@ #include "SmallSceneryObject.h" #include "WallObject.h" -#include #include #include #include diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 060f399ac0..471dcf6562 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -41,7 +41,6 @@ #include "ObjectManager.h" #include "RideObject.h" -#include #include #include #include diff --git a/src/openrct2/object/ObjectTypes.cpp b/src/openrct2/object/ObjectTypes.cpp index af6aa715bd..0d7d6a3a16 100644 --- a/src/openrct2/object/ObjectTypes.cpp +++ b/src/openrct2/object/ObjectTypes.cpp @@ -12,8 +12,6 @@ #include "../util/Util.h" #include "Object.h" -#include - constexpr std::array kAllObjectTypes = { ObjectType::Ride, ObjectType::SmallScenery, diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 5dd997e63a..b4e9982820 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -31,7 +31,6 @@ #include "../ride/Vehicle.h" #include "ObjectRepository.h" -#include #include #include diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index 0067615077..7c07041125 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -20,8 +20,6 @@ #include "../localisation/Language.h" #include "../world/Scenery.h" -#include - void SmallSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream) { stream->Seek(6, OpenRCT2::STREAM_SEEK_CURRENT); diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index e8760ee84b..6130c4b3c6 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -18,8 +18,6 @@ #include "../localisation/LocalisationService.h" #include "Object.h" -#include - static constexpr uint8_t RCT2ToOpenRCT2LanguageId[] = { LANGUAGE_ENGLISH_UK, LANGUAGE_ENGLISH_US, diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 76ddd1c0ee..0fb4b9745a 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -25,7 +25,6 @@ #include "Paint.Entity.h" #include "tile_element/Paint.TileElement.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index aa031803f2..416fa59aff 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -24,7 +24,6 @@ #include "VirtualFloor.h" #include "tile_element/Paint.TileElement.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index ee04200a74..7ba00c73ea 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -32,7 +32,6 @@ #include "../Paint.SessionFlags.h" #include "Paint.TileElement.h" -#include #include #include diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index 0d4760f876..6ddd206c32 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -33,8 +33,6 @@ #include "../support/WoodenSupports.h" #include "Paint.Surface.h" -#include - static void BlankTilesPaint(PaintSession& session, int32_t x, int32_t y); static void PaintTileElementBase(PaintSession& session, const CoordsXY& origCoords); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index a425d72471..e2e41e6fba 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -71,7 +71,6 @@ #include "RCT1.h" #include "Tables.h" -#include #include #include #include diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 5be87cebeb..eb9592f5ba 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -75,8 +75,6 @@ #include "../world/Surface.h" #include "../world/TilePointerIndex.hpp" -#include - using namespace OpenRCT2; namespace RCT2 diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 11e0c6a332..50868a82ea 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -19,8 +19,6 @@ #include "Vehicle.h" #include "VehicleData.h" -#include - Vehicle* CableLiftSegmentCreate( Ride& ride, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance, bool head) { diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 8b5e6cf175..72bb089536 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -76,7 +76,6 @@ #include "TrainManager.h" #include "Vehicle.h" -#include #include #include #include diff --git a/src/openrct2/ride/RideAudio.cpp b/src/openrct2/ride/RideAudio.cpp index 62c48faad3..1ee1711c0b 100644 --- a/src/openrct2/ride/RideAudio.cpp +++ b/src/openrct2/ride/RideAudio.cpp @@ -23,7 +23,6 @@ #include "Ride.h" #include "RideData.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index d8f0f40231..501e51bd30 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -25,7 +25,6 @@ #include "Station.h" #include "Track.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 5b562f4cd4..b44bd1d774 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -66,7 +66,6 @@ #include "TrackDesignRepository.h" #include "Vehicle.h" -#include #include #include diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 40340e2a0c..f353513202 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -25,7 +25,6 @@ #include "../util/Util.h" #include "TrackDesign.h" -#include #include #include diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index b3a567ad06..c7dd604c9d 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -34,8 +34,6 @@ #include "TrackDesign.h" #include "TrackDesignRepository.h" -#include - constexpr size_t TRACK_MAX_SAVED_TILE_ELEMENTS = 1500; constexpr int32_t TRACK_NEARBY_SCENERY_DISTANCE = 1; diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 667c75c353..a81d0e8b65 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -55,7 +55,6 @@ #include "VehicleData.h" #include "VehicleSubpositionData.h" -#include #include using namespace OpenRCT2; diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 4531329270..7b740e9481 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -19,8 +19,6 @@ #include "../TrackData.h" #include "../TrackPaint.h" -#include - enum class JuniorRCSubType : uint8_t { Junior = 1, diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 490bf766e7..6c31c7b02b 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -58,8 +58,6 @@ #include "ScenarioRepository.h" #include "ScenarioSources.h" -#include - using namespace OpenRCT2; const StringId ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT] = { diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 4ad2f901ad..a7e3d5af2b 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -32,7 +32,6 @@ #include "Scenario.h" #include "ScenarioSources.h" -#include #include #include #include diff --git a/src/openrct2/scenes/title/Command/Wait.cpp b/src/openrct2/scenes/title/Command/Wait.cpp index 1915b0c5d4..a4f9ddcb4f 100644 --- a/src/openrct2/scenes/title/Command/Wait.cpp +++ b/src/openrct2/scenes/title/Command/Wait.cpp @@ -11,8 +11,6 @@ #include "../../../Context.h" -#include - namespace OpenRCT2::Title { int16_t WaitCommand::operator()(int16_t timer) diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index 3b42732c55..45bddbd18c 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -26,7 +26,6 @@ #include "../../scenario/ScenarioSources.h" #include "../../util/Util.h" -#include #include #include #include diff --git a/src/openrct2/scenes/title/TitleSequenceManager.cpp b/src/openrct2/scenes/title/TitleSequenceManager.cpp index ccbd9131e9..f4ff56ffb6 100644 --- a/src/openrct2/scenes/title/TitleSequenceManager.cpp +++ b/src/openrct2/scenes/title/TitleSequenceManager.cpp @@ -22,7 +22,6 @@ #include "../../platform/Platform.h" #include "TitleSequence.h" -#include #include #include diff --git a/src/openrct2/scripting/Plugin.cpp b/src/openrct2/scripting/Plugin.cpp index 07b94551ad..81a199dad9 100644 --- a/src/openrct2/scripting/Plugin.cpp +++ b/src/openrct2/scripting/Plugin.cpp @@ -17,7 +17,6 @@ # include "Duktape.hpp" # include "ScriptEngine.h" -# include # include # include diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index bfe46b8d24..cf1cf6bd2c 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -20,7 +20,6 @@ # include "../../Duktape.hpp" # include "../../ScriptEngine.h" -# include # include # include diff --git a/src/openrct2/scripting/bindings/network/ScSocket.hpp b/src/openrct2/scripting/bindings/network/ScSocket.hpp index cd4f710f6e..ca570629ec 100644 --- a/src/openrct2/scripting/bindings/network/ScSocket.hpp +++ b/src/openrct2/scripting/bindings/network/ScSocket.hpp @@ -18,7 +18,6 @@ # include "../../Duktape.hpp" # include "../../ScriptEngine.h" -# include # include # include diff --git a/src/openrct2/scripting/bindings/world/ScPark.cpp b/src/openrct2/scripting/bindings/world/ScPark.cpp index 79c6eb7e2a..71b4cde7c2 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.cpp +++ b/src/openrct2/scripting/bindings/world/ScPark.cpp @@ -24,8 +24,6 @@ # include "../../ScriptEngine.h" # include "ScParkMessage.hpp" -# include - namespace OpenRCT2::Scripting { static const DukEnumMap ParkFlagMap({ diff --git a/src/openrct2/scripting/bindings/world/ScPark.hpp b/src/openrct2/scripting/bindings/world/ScPark.hpp index cfc6a92864..a8f9454805 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.hpp +++ b/src/openrct2/scripting/bindings/world/ScPark.hpp @@ -17,7 +17,6 @@ # include "ScParkMessage.hpp" # include "ScResearch.hpp" -# include # include namespace OpenRCT2::Scripting diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp index 6f0f49849c..407cbdcdb1 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp @@ -23,8 +23,6 @@ # include "../../Duktape.hpp" # include "../../ScriptEngine.h" -# include - namespace OpenRCT2::Scripting { ScParkMessage::ScParkMessage(size_t index) diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.hpp b/src/openrct2/scripting/bindings/world/ScParkMessage.hpp index 7b2048ca1e..8a38a04185 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.hpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.hpp @@ -17,7 +17,6 @@ # include "../../Duktape.hpp" # include "../../ScriptEngine.h" -# include # include namespace OpenRCT2::Scripting diff --git a/src/openrct2/scripting/bindings/world/ScScenario.hpp b/src/openrct2/scripting/bindings/world/ScScenario.hpp index edcd034b2b..cdd0fd61e7 100644 --- a/src/openrct2/scripting/bindings/world/ScScenario.hpp +++ b/src/openrct2/scripting/bindings/world/ScScenario.hpp @@ -20,8 +20,6 @@ # include "../../Duktape.hpp" # include "../../ScriptEngine.h" -# include - namespace OpenRCT2::Scripting { static const DukEnumMap ScenarioObjectiveTypeMap({ diff --git a/src/openrct2/util/SawyerCoding.cpp b/src/openrct2/util/SawyerCoding.cpp index df88408d2c..30ffb110df 100644 --- a/src/openrct2/util/SawyerCoding.cpp +++ b/src/openrct2/util/SawyerCoding.cpp @@ -14,7 +14,6 @@ #include "../scenario/Scenario.h" #include "Util.h" -#include #include #include diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index 996337b923..2b2b366d8a 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -18,7 +18,6 @@ #include "../scenes/title/TitleScene.h" #include "zlib.h" -#include #include #include #include diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index d116973d67..e7412cf981 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -32,7 +32,6 @@ #include "Park.h" #include "Scenery.h" -#include #include #include #include diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 469a9b5f86..262830c05a 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -27,7 +27,6 @@ #include "../util/Util.h" #include "../windows/Intent.h" -#include #include #include diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index a05a8e55b5..e5ed5e23c9 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -31,8 +31,6 @@ #include "MapAnimation.h" #include "Park.h" -#include - using namespace OpenRCT2; bool gParkEntranceGhostExists = false; diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 69f02d8560..73088ab1d8 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -44,7 +44,6 @@ #include "Surface.h" #include "TileElement.h" -#include #include using namespace OpenRCT2::TrackMetaData; diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 9afde7f703..4c28730c5a 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -54,7 +54,6 @@ #include "TileInspector.h" #include "Wall.h" -#include #include #include diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index e2eecd7d1a..55943d898d 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -31,7 +31,6 @@ #include "Scenery.h" #include "Surface.h" -#include #include #include #include diff --git a/src/openrct2/world/MapHelpers.cpp b/src/openrct2/world/MapHelpers.cpp index 60ced0ec8d..ebe9fedc2f 100644 --- a/src/openrct2/world/MapHelpers.cpp +++ b/src/openrct2/world/MapHelpers.cpp @@ -12,8 +12,6 @@ #include "Map.h" #include "Surface.h" -#include - static uint8_t GetBaseHeightOrZero(int32_t x, int32_t y) { auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ x, y }); diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index fd83c022f3..98a3f5e07b 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -41,7 +41,6 @@ #include "Map.h" #include "Surface.h" -#include #include #include diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 307e540116..d8bb5a8559 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -32,7 +32,6 @@ #include "Scenery.h" #include "Surface.h" -#include #include TileCoordsXY windowTileInspectorTile; diff --git a/src/thirdparty/filesystem.hpp b/src/thirdparty/filesystem.hpp index 56b2f7180d..6d05f601ba 100644 --- a/src/thirdparty/filesystem.hpp +++ b/src/thirdparty/filesystem.hpp @@ -114,7 +114,6 @@ #include #endif -#include #include #include #include