From b5ef2693b092c22c332ff70d75c91f042ef17e3a Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 9 Jul 2024 16:45:19 +0200 Subject: [PATCH] Remove common.h include from all units --- src/openrct2-ui/CursorRepository.cpp | 1 - src/openrct2-ui/TextComposition.cpp | 1 - src/openrct2-ui/TextComposition.h | 1 - src/openrct2-ui/UiContext.Android.cpp | 1 - src/openrct2-ui/UiContext.Linux.cpp | 1 - src/openrct2-ui/UiContext.Win32.cpp | 1 - src/openrct2-ui/UiContext.h | 1 - src/openrct2-ui/UiContext.macOS.mm | 1 - src/openrct2-ui/WindowManager.h | 1 - src/openrct2-ui/audio/AudioChannel.cpp | 1 - src/openrct2-ui/audio/AudioContext.cpp | 1 - src/openrct2-ui/audio/AudioContext.h | 1 - src/openrct2-ui/audio/MemoryAudioSource.cpp | 1 - .../drawing/engines/DrawingEngineFactory.hpp | 1 - .../engines/HardwareDisplayDrawingEngine.cpp | 1 - .../drawing/engines/SoftwareDrawingEngine.cpp | 1 - .../drawing/engines/opengl/DrawCommands.h | 1 - .../drawing/engines/opengl/GLSLTypes.h | 2 -- .../drawing/engines/opengl/OpenGLAPI.h | 1 - .../engines/opengl/OpenGLFramebuffer.cpp | 1 - .../drawing/engines/opengl/OpenGLFramebuffer.h | 1 - .../engines/opengl/OpenGLShaderProgram.h | 1 - .../drawing/engines/opengl/SwapFramebuffer.h | 1 - .../drawing/engines/opengl/TextureCache.h | 1 - .../drawing/engines/opengl/TransparencyDepth.h | 2 -- src/openrct2-ui/interface/Dropdown.h | 1 - src/openrct2-ui/interface/LandTool.h | 1 - src/openrct2-ui/interface/Theme.cpp | 1 - src/openrct2-ui/interface/Theme.h | 1 - src/openrct2-ui/scripting/ScTileSelection.hpp | 1 - src/openrct2-ui/scripting/ScUi.hpp | 1 - src/openrct2-ui/scripting/ScViewport.hpp | 1 - src/openrct2-ui/scripting/ScWidget.hpp | 1 - src/openrct2-ui/scripting/ScWindow.hpp | 1 - src/openrct2-ui/title/TitleSequencePlayer.cpp | 1 - src/openrct2-ui/title/TitleSequencePlayer.h | 1 - src/openrct2-ui/windows/TileInspector.cpp | 1 - src/openrct2-ui/windows/Window.h | 1 - src/openrct2/CommandLineSprite.h | 1 - src/openrct2/Date.h | 2 -- src/openrct2/Editor.h | 1 - src/openrct2/EditorObjectSelectionSession.h | 1 - src/openrct2/FileClassifier.h | 1 - src/openrct2/Game.h | 1 - src/openrct2/GameStateSnapshots.h | 1 - src/openrct2/Identifiers.h | 1 - src/openrct2/OpenRCT2.h | 1 - src/openrct2/ParkImporter.h | 1 - src/openrct2/PlatformEnvironment.h | 1 - src/openrct2/ReplayManager.h | 2 -- src/openrct2/TrackImporter.h | 1 - src/openrct2/Version.h | 2 -- src/openrct2/actions/GameAction.h | 1 - .../actions/LargeSceneryRemoveAction.cpp | 1 - .../actions/RideSetColourSchemeAction.cpp | 1 - src/openrct2/actions/RideSetPriceAction.cpp | 1 - src/openrct2/actions/RideSetStatusAction.cpp | 1 - src/openrct2/actions/SignSetNameAction.cpp | 1 - .../actions/SmallSceneryPlaceAction.cpp | 1 - .../actions/SmallSceneryRemoveAction.cpp | 1 - .../actions/SmallScenerySetColourAction.cpp | 1 - src/openrct2/audio/AudioChannel.h | 1 - src/openrct2/audio/AudioContext.h | 1 - src/openrct2/audio/AudioSource.h | 1 - src/openrct2/audio/audio.h | 1 - src/openrct2/command_line/CommandLine.hpp | 2 -- src/openrct2/command_line/ConvertCommand.cpp | 1 - src/openrct2/common.h | 18 ------------------ src/openrct2/config/IniReader.cpp | 1 - src/openrct2/config/IniReader.hpp | 1 - src/openrct2/config/IniWriter.hpp | 1 - src/openrct2/core/ChecksumStream.h | 1 - src/openrct2/core/Collections.hpp | 1 - src/openrct2/core/Console.hpp | 1 - src/openrct2/core/Endianness.h | 2 -- src/openrct2/core/File.h | 1 - src/openrct2/core/FileIndex.hpp | 1 - src/openrct2/core/FileScanner.cpp | 2 -- src/openrct2/core/FileScanner.h | 1 - src/openrct2/core/FileStream.h | 1 - src/openrct2/core/Guard.cpp | 1 - src/openrct2/core/Http.h | 2 -- src/openrct2/core/IStream.hpp | 1 - src/openrct2/core/Imaging.h | 1 - src/openrct2/core/Json.hpp | 1 - src/openrct2/core/Memory.hpp | 1 - src/openrct2/core/MemoryStream.h | 1 - src/openrct2/core/Path.hpp | 1 - src/openrct2/core/String.hpp | 2 -- src/openrct2/core/StringBuilder.h | 1 - src/openrct2/core/StringReader.h | 1 - src/openrct2/core/Zip.h | 2 -- src/openrct2/drawing/AVX2Drawing.cpp | 1 - src/openrct2/drawing/Drawing.String.cpp | 1 - src/openrct2/drawing/Drawing.cpp | 1 - src/openrct2/drawing/Font.h | 1 - src/openrct2/drawing/IDrawingContext.h | 1 - src/openrct2/drawing/IDrawingEngine.h | 1 - src/openrct2/drawing/LightFX.cpp | 1 - src/openrct2/drawing/LightFX.h | 2 -- src/openrct2/drawing/Rect.cpp | 1 - src/openrct2/drawing/SSE41Drawing.cpp | 1 - src/openrct2/drawing/Weather.h | 2 -- src/openrct2/entity/EntityBase.h | 1 - src/openrct2/entity/EntityList.h | 1 - src/openrct2/entity/EntityRegistry.h | 1 - src/openrct2/entity/Fountain.h | 1 - src/openrct2/entity/Staff.h | 1 - src/openrct2/interface/Chat.h | 1 - src/openrct2/interface/Colour.h | 1 - src/openrct2/interface/Cursors.h | 2 -- src/openrct2/interface/InteractiveConsole.h | 1 - src/openrct2/interface/Screenshot.h | 1 - src/openrct2/interface/Window.h | 1 - src/openrct2/libopenrct2.vcxproj | 1 - src/openrct2/localisation/ConversionTables.h | 2 -- src/openrct2/localisation/Formatting.h | 1 - src/openrct2/localisation/LanguagePack.cpp | 1 - .../localisation/Localisation.Date.cpp | 1 - src/openrct2/localisation/Localisation.cpp | 1 - src/openrct2/management/Award.h | 2 -- src/openrct2/management/Marketing.h | 1 - src/openrct2/network/DiscordService.h | 1 - src/openrct2/network/NetworkConnection.h | 2 +- src/openrct2/network/NetworkGroup.h | 1 - src/openrct2/network/NetworkKey.h | 2 -- src/openrct2/network/NetworkPacket.h | 1 - src/openrct2/network/NetworkPlayer.h | 1 - src/openrct2/network/NetworkServerAdvertiser.h | 2 -- src/openrct2/network/NetworkTypes.h | 1 - src/openrct2/network/NetworkUser.h | 1 - src/openrct2/network/Socket.cpp | 2 +- src/openrct2/network/Socket.h | 2 -- src/openrct2/object/BannerSceneryEntry.h | 1 - src/openrct2/object/EntranceEntry.h | 1 - src/openrct2/object/FootpathEntry.h | 1 - src/openrct2/object/ImageTable.h | 1 - src/openrct2/object/Object.h | 1 - src/openrct2/object/ObjectFactory.h | 1 - src/openrct2/object/ObjectManager.h | 1 - src/openrct2/object/ObjectRepository.cpp | 1 - src/openrct2/object/ObjectRepository.h | 1 - src/openrct2/object/SceneryGroupEntry.h | 1 - src/openrct2/object/StringTable.h | 1 - src/openrct2/object/WaterEntry.h | 1 - src/openrct2/object/WaterObject.cpp | 1 - src/openrct2/openrct2_pch.h | 1 - src/openrct2/paint/Paint.SessionFlags.h | 2 -- src/openrct2/paint/Paint.h | 1 - src/openrct2/paint/Painter.h | 1 - src/openrct2/paint/VirtualFloor.h | 2 -- .../paint/tile_element/Paint.TileElement.h | 1 - src/openrct2/paint/tile_element/Paint.Wall.cpp | 1 - src/openrct2/peep/GuestPathfinding.h | 1 - src/openrct2/platform/Platform.Common.cpp | 1 - src/openrct2/platform/Platform.Win32.cpp | 1 - src/openrct2/platform/Platform.h | 1 - src/openrct2/rct1/Tables.cpp | 1 - src/openrct2/rct1/Tables.h | 1 - src/openrct2/rct12/RCT12.h | 1 - src/openrct2/rct12/SawyerChunk.h | 2 -- src/openrct2/rct12/SawyerChunkReader.h | 1 - src/openrct2/rct12/SawyerChunkWriter.h | 1 - src/openrct2/rct2/RCT2.h | 1 - src/openrct2/rct2/SeaDecrypt.cpp | 1 - src/openrct2/rct2/T6Exporter.h | 1 - src/openrct2/ride/Ride.cpp | 1 - src/openrct2/ride/Ride.h | 1 - src/openrct2/ride/RideConstruction.cpp | 1 - src/openrct2/ride/RideConstruction.h | 1 - src/openrct2/ride/RideData.h | 1 - src/openrct2/ride/RideRatings.h | 1 - src/openrct2/ride/ShopItem.cpp | 1 - src/openrct2/ride/ShopItem.h | 1 - src/openrct2/ride/Station.h | 1 - src/openrct2/ride/Track.h | 1 - src/openrct2/ride/TrackData.h | 1 - src/openrct2/ride/TrackDesign.h | 1 - src/openrct2/ride/TrackDesignRepository.h | 1 - src/openrct2/ride/TrackPaint.h | 1 - src/openrct2/ride/Vehicle.h | 1 - src/openrct2/ride/VehicleColour.h | 2 -- src/openrct2/ride/VehicleData.h | 2 -- src/openrct2/ride/VehiclePaint.h | 2 -- src/openrct2/ride/coaster/VirginiaReel.cpp | 1 - src/openrct2/ride/gentle/CarRide.cpp | 1 - src/openrct2/ride/gentle/MonorailCycles.cpp | 1 - src/openrct2/ride/gentle/ObservationTower.cpp | 1 - src/openrct2/ride/gentle/SpaceRings.cpp | 1 - src/openrct2/ride/thrill/Enterprise.cpp | 1 - src/openrct2/ride/thrill/GoKarts.cpp | 1 - src/openrct2/ride/thrill/LaunchedFreefall.cpp | 1 - src/openrct2/ride/thrill/RotoDrop.cpp | 1 - src/openrct2/ride/thrill/Twist.cpp | 1 - src/openrct2/ride/transport/Lift.cpp | 1 - .../ride/transport/MiniatureRailway.cpp | 1 - src/openrct2/ride/transport/Monorail.cpp | 1 - src/openrct2/ride/water/BoatHire.cpp | 1 - src/openrct2/scenario/Scenario.h | 1 - src/openrct2/scenario/ScenarioRepository.h | 1 - src/openrct2/scenario/ScenarioSources.h | 1 - src/openrct2/scenes/Scene.h | 2 -- src/openrct2/scenes/game/GameScene.h | 1 - src/openrct2/scenes/intro/IntroScene.h | 1 - src/openrct2/scenes/title/TitleScene.h | 1 - src/openrct2/scenes/title/TitleSequence.cpp | 1 - src/openrct2/scenes/title/TitleSequence.h | 1 - .../scenes/title/TitleSequenceManager.h | 2 +- .../scenes/title/TitleSequencePlayer.h | 2 -- src/openrct2/scripting/HookEngine.h | 1 - src/openrct2/scripting/ScriptEngine.h | 1 - .../scripting/bindings/entity/ScEntity.hpp | 1 - .../bindings/object/ScInstalledObject.hpp | 1 - .../scripting/bindings/object/ScObject.hpp | 1 - .../scripting/bindings/ride/ScRide.cpp | 1 - .../scripting/bindings/ride/ScRide.hpp | 1 - .../scripting/bindings/ride/ScRideStation.cpp | 1 - .../scripting/bindings/ride/ScRideStation.hpp | 1 - .../scripting/bindings/world/ScClimate.hpp | 1 - .../scripting/bindings/world/ScDate.hpp | 1 - .../scripting/bindings/world/ScMap.cpp | 1 - .../scripting/bindings/world/ScMap.hpp | 1 - .../scripting/bindings/world/ScPark.cpp | 1 - .../scripting/bindings/world/ScPark.hpp | 1 - .../scripting/bindings/world/ScParkMessage.cpp | 1 - .../scripting/bindings/world/ScParkMessage.hpp | 1 - .../scripting/bindings/world/ScResearch.cpp | 1 - .../scripting/bindings/world/ScScenario.hpp | 1 - .../scripting/bindings/world/ScTile.cpp | 1 - .../scripting/bindings/world/ScTile.hpp | 1 - .../scripting/bindings/world/ScTileElement.cpp | 1 - .../scripting/bindings/world/ScTileElement.hpp | 1 - src/openrct2/ui/UiContext.h | 1 - src/openrct2/ui/WindowManager.h | 1 - src/openrct2/util/SawyerCoding.h | 2 -- src/openrct2/util/Util.cpp | 1 - src/openrct2/windows/Intent.h | 1 - src/openrct2/world/Banner.h | 1 - src/openrct2/world/Climate.h | 1 - src/openrct2/world/ConstructionClearance.h | 1 - src/openrct2/world/Entrance.h | 1 - src/openrct2/world/Footpath.h | 1 - src/openrct2/world/LargeScenery.cpp | 1 - src/openrct2/world/Location.hpp | 1 - src/openrct2/world/Map.h | 1 - src/openrct2/world/MapGen.cpp | 1 - src/openrct2/world/MapGen.h | 1 - src/openrct2/world/MapHelpers.h | 1 - src/openrct2/world/Park.h | 1 - src/openrct2/world/Scenery.cpp | 1 - src/openrct2/world/Surface.h | 1 - src/openrct2/world/TileElement.h | 1 - src/openrct2/world/TileInspector.cpp | 1 - src/openrct2/world/TileInspector.h | 1 - src/openrct2/world/Wall.cpp | 1 - src/openrct2/world/Wall.h | 1 - 256 files changed, 3 insertions(+), 301 deletions(-) delete mode 100644 src/openrct2/common.h diff --git a/src/openrct2-ui/CursorRepository.cpp b/src/openrct2-ui/CursorRepository.cpp index eb4261faf0..3d06f1e42b 100644 --- a/src/openrct2-ui/CursorRepository.cpp +++ b/src/openrct2-ui/CursorRepository.cpp @@ -10,7 +10,6 @@ #include "CursorRepository.h" #include -#include #include #include #include diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 1306940c0d..da08505389 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/src/openrct2-ui/TextComposition.h b/src/openrct2-ui/TextComposition.h index a509c330b4..895e5e38ce 100644 --- a/src/openrct2-ui/TextComposition.h +++ b/src/openrct2-ui/TextComposition.h @@ -10,7 +10,6 @@ #pragma once #include -#include #include union SDL_Event; diff --git a/src/openrct2-ui/UiContext.Android.cpp b/src/openrct2-ui/UiContext.Android.cpp index 4d022f4d1f..0293c151a0 100644 --- a/src/openrct2-ui/UiContext.Android.cpp +++ b/src/openrct2-ui/UiContext.Android.cpp @@ -15,7 +15,6 @@ # include # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp index cbcb5cdea6..bf5f0158e3 100644 --- a/src/openrct2-ui/UiContext.Linux.cpp +++ b/src/openrct2-ui/UiContext.Linux.cpp @@ -17,7 +17,6 @@ # include # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.Win32.cpp b/src/openrct2-ui/UiContext.Win32.cpp index e5ac27e073..317c96a200 100644 --- a/src/openrct2-ui/UiContext.Win32.cpp +++ b/src/openrct2-ui/UiContext.Win32.cpp @@ -25,7 +25,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/UiContext.h b/src/openrct2-ui/UiContext.h index 9e7bd702f7..831c80f686 100644 --- a/src/openrct2-ui/UiContext.h +++ b/src/openrct2-ui/UiContext.h @@ -10,7 +10,6 @@ #pragma once #include -#include #include #include diff --git a/src/openrct2-ui/UiContext.macOS.mm b/src/openrct2-ui/UiContext.macOS.mm index 2e0e1c33ca..f3c5f42181 100644 --- a/src/openrct2-ui/UiContext.macOS.mm +++ b/src/openrct2-ui/UiContext.macOS.mm @@ -12,7 +12,6 @@ # include "UiContext.h" # include -# include # include # include diff --git a/src/openrct2-ui/WindowManager.h b/src/openrct2-ui/WindowManager.h index db26590ffa..b0b2f4c6ad 100644 --- a/src/openrct2-ui/WindowManager.h +++ b/src/openrct2-ui/WindowManager.h @@ -10,7 +10,6 @@ #pragma once #include -#include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/audio/AudioChannel.cpp b/src/openrct2-ui/audio/AudioChannel.cpp index 2bcb170b67..ea26da4603 100644 --- a/src/openrct2-ui/audio/AudioChannel.cpp +++ b/src/openrct2-ui/audio/AudioChannel.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include namespace OpenRCT2::Audio diff --git a/src/openrct2-ui/audio/AudioContext.cpp b/src/openrct2-ui/audio/AudioContext.cpp index f28a4a1538..32d563591b 100644 --- a/src/openrct2-ui/audio/AudioContext.cpp +++ b/src/openrct2-ui/audio/AudioContext.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include namespace OpenRCT2::Audio diff --git a/src/openrct2-ui/audio/AudioContext.h b/src/openrct2-ui/audio/AudioContext.h index 8cd7e0df7d..2febf3d346 100644 --- a/src/openrct2-ui/audio/AudioContext.h +++ b/src/openrct2-ui/audio/AudioContext.h @@ -12,7 +12,6 @@ #include #include #include -#include #include struct SDL_RWops; diff --git a/src/openrct2-ui/audio/MemoryAudioSource.cpp b/src/openrct2-ui/audio/MemoryAudioSource.cpp index 978310cdd8..f6082b4708 100644 --- a/src/openrct2-ui/audio/MemoryAudioSource.cpp +++ b/src/openrct2-ui/audio/MemoryAudioSource.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp b/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp index f852816c87..918785bbc0 100644 --- a/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp +++ b/src/openrct2-ui/drawing/engines/DrawingEngineFactory.hpp @@ -10,7 +10,6 @@ #pragma once #include -#include #include namespace OpenRCT2::Ui diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 4491c5442f..8732944473 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp index 931db35bc1..3776d8d9ca 100644 --- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h b/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h index e53baea7d3..425dece2d5 100644 --- a/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h +++ b/src/openrct2-ui/drawing/engines/opengl/DrawCommands.h @@ -13,7 +13,6 @@ #include "OpenGLAPI.h" #include "TextureCache.h" -#include #include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h b/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h index 624c295550..2aef1c79e7 100644 --- a/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h +++ b/src/openrct2-ui/drawing/engines/opengl/GLSLTypes.h @@ -11,8 +11,6 @@ #include "OpenGLAPI.h" -#include - namespace OpenRCT2::Ui { #pragma pack(push, 1) diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h index 73a8406e46..185a81463d 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h @@ -10,7 +10,6 @@ #pragma once #include -#include #ifdef OPENGL_NO_LINK diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp index eba9a3fbb0..f9b458df35 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.cpp @@ -15,7 +15,6 @@ # include # include # include -# include using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h index 6999f997d9..11eac77ef8 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLFramebuffer.h @@ -11,7 +11,6 @@ #include "OpenGLAPI.h" -#include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h index 141276f7cc..e03e56a117 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLShaderProgram.h @@ -12,7 +12,6 @@ #include "OpenGLAPI.h" #include -#include #include namespace OpenRCT2::Ui { diff --git a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h index cfc23ded77..7f3c150554 100644 --- a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h +++ b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.h @@ -13,7 +13,6 @@ #include "OpenGLAPI.h" #include "OpenGLFramebuffer.h" -#include namespace OpenRCT2::Ui { /** diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h index 8b8e087e40..608418b91a 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.h +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h index 3ae4bb017b..d43add764e 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h +++ b/src/openrct2-ui/drawing/engines/opengl/TransparencyDepth.h @@ -11,8 +11,6 @@ #include "DrawCommands.h" -#include - namespace OpenRCT2::Ui { /* diff --git a/src/openrct2-ui/interface/Dropdown.h b/src/openrct2-ui/interface/Dropdown.h index 7b79d1dc80..47133f6ee0 100644 --- a/src/openrct2-ui/interface/Dropdown.h +++ b/src/openrct2-ui/interface/Dropdown.h @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/src/openrct2-ui/interface/LandTool.h b/src/openrct2-ui/interface/LandTool.h index db1e3145d7..5df7d42a1e 100644 --- a/src/openrct2-ui/interface/LandTool.h +++ b/src/openrct2-ui/interface/LandTool.h @@ -10,7 +10,6 @@ #pragma once #include -#include #include constexpr uint16_t kLandToolMinimumSize = 1; diff --git a/src/openrct2-ui/interface/Theme.cpp b/src/openrct2-ui/interface/Theme.cpp index 78e4a04e7b..3ee9e3951a 100644 --- a/src/openrct2-ui/interface/Theme.cpp +++ b/src/openrct2-ui/interface/Theme.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/interface/Theme.h b/src/openrct2-ui/interface/Theme.h index 8c5bf8d6f5..963ba8c23a 100644 --- a/src/openrct2-ui/interface/Theme.h +++ b/src/openrct2-ui/interface/Theme.h @@ -9,7 +9,6 @@ #pragma once -#include #include #include diff --git a/src/openrct2-ui/scripting/ScTileSelection.hpp b/src/openrct2-ui/scripting/ScTileSelection.hpp index bae3da56d1..9be4723d6e 100644 --- a/src/openrct2-ui/scripting/ScTileSelection.hpp +++ b/src/openrct2-ui/scripting/ScTileSelection.hpp @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include # include # include diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index 2b3356de01..76aaeee54d 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -21,7 +21,6 @@ # include # include # include -# include # include # include # include diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp index 828e9639fe..12110787e5 100644 --- a/src/openrct2-ui/scripting/ScViewport.hpp +++ b/src/openrct2-ui/scripting/ScViewport.hpp @@ -15,7 +15,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp index 7caabd8997..5e71b5ee8e 100644 --- a/src/openrct2-ui/scripting/ScWidget.hpp +++ b/src/openrct2-ui/scripting/ScWidget.hpp @@ -19,7 +19,6 @@ # include # include -# include # include # include # include diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp index c24803b167..af4d0f2307 100644 --- a/src/openrct2-ui/scripting/ScWindow.hpp +++ b/src/openrct2-ui/scripting/ScWindow.hpp @@ -13,7 +13,6 @@ # include "ScWidget.hpp" -# include # include # include # include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index 27c88c38ad..322de14941 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.h b/src/openrct2-ui/title/TitleSequencePlayer.h index d43fe983bd..9fd78f70e8 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.h +++ b/src/openrct2-ui/title/TitleSequencePlayer.h @@ -10,7 +10,6 @@ #pragma once #include -#include struct ITitleSequencePlayer; struct IScenarioRepository; diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index d7f92efb2a..c19ab052db 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 66cd1e03fc..95e861019d 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -11,7 +11,6 @@ #include #include -#include #include #include #include diff --git a/src/openrct2/CommandLineSprite.h b/src/openrct2/CommandLineSprite.h index 726722ec10..a56967fdf8 100644 --- a/src/openrct2/CommandLineSprite.h +++ b/src/openrct2/CommandLineSprite.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "drawing/ImageImporter.h" int32_t CommandLineForSprite(const char** argv, int32_t argc); diff --git a/src/openrct2/Date.h b/src/openrct2/Date.h index a300d981b2..59128511fc 100644 --- a/src/openrct2/Date.h +++ b/src/openrct2/Date.h @@ -9,8 +9,6 @@ #pragma once -#include "common.h" - constexpr int32_t kMaxYear = 8192; constexpr int32_t kTicksPerMonth = 0x10000; diff --git a/src/openrct2/Editor.h b/src/openrct2/Editor.h index e10843fdb2..0d4fd571a7 100644 --- a/src/openrct2/Editor.h +++ b/src/openrct2/Editor.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "object/Object.h" struct ResultWithMessage; diff --git a/src/openrct2/EditorObjectSelectionSession.h b/src/openrct2/EditorObjectSelectionSession.h index aa05d05b03..f9235ef1f3 100644 --- a/src/openrct2/EditorObjectSelectionSession.h +++ b/src/openrct2/EditorObjectSelectionSession.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "object/Object.h" #include "util/Util.h" diff --git a/src/openrct2/FileClassifier.h b/src/openrct2/FileClassifier.h index 448f104fbe..f8edde8584 100644 --- a/src/openrct2/FileClassifier.h +++ b/src/openrct2/FileClassifier.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" enum class FileExtension diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h index 876de954bc..fb6ac71fa0 100644 --- a/src/openrct2/Game.h +++ b/src/openrct2/Game.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include diff --git a/src/openrct2/GameStateSnapshots.h b/src/openrct2/GameStateSnapshots.h index 44614dae0a..aca9b92ec5 100644 --- a/src/openrct2/GameStateSnapshots.h +++ b/src/openrct2/GameStateSnapshots.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/DataSerialiser.h" #include diff --git a/src/openrct2/Identifiers.h b/src/openrct2/Identifiers.h index edf8d53522..423605851a 100644 --- a/src/openrct2/Identifiers.h +++ b/src/openrct2/Identifiers.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/Identifier.hpp" #include diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h index d82315e205..25fa529c63 100644 --- a/src/openrct2/OpenRCT2.h +++ b/src/openrct2/OpenRCT2.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include diff --git a/src/openrct2/ParkImporter.h b/src/openrct2/ParkImporter.h index 436b54ab8c..5f41f93884 100644 --- a/src/openrct2/ParkImporter.h +++ b/src/openrct2/ParkImporter.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/String.hpp" #include "object/Object.h" #include "object/ObjectList.h" diff --git a/src/openrct2/PlatformEnvironment.h b/src/openrct2/PlatformEnvironment.h index 9576d0fcb0..b716da22df 100644 --- a/src/openrct2/PlatformEnvironment.h +++ b/src/openrct2/PlatformEnvironment.h @@ -10,7 +10,6 @@ #pragma once #include "Diagnostic.h" -#include "common.h" #include "core/String.hpp" #include diff --git a/src/openrct2/ReplayManager.h b/src/openrct2/ReplayManager.h index 9cfec548d6..ee5d8844d0 100644 --- a/src/openrct2/ReplayManager.h +++ b/src/openrct2/ReplayManager.h @@ -9,8 +9,6 @@ #pragma once -#include "common.h" - #include #include #include diff --git a/src/openrct2/TrackImporter.h b/src/openrct2/TrackImporter.h index b5962d8b2f..9b72c25b73 100644 --- a/src/openrct2/TrackImporter.h +++ b/src/openrct2/TrackImporter.h @@ -9,7 +9,6 @@ #pragma once -#include "common.h" #include "core/IStream.hpp" #include "ride/TrackDesign.h" diff --git a/src/openrct2/Version.h b/src/openrct2/Version.h index 030baf0ec0..4fb96ec223 100644 --- a/src/openrct2/Version.h +++ b/src/openrct2/Version.h @@ -9,8 +9,6 @@ #pragma once -#include "common.h" - #include #define OPENRCT2_NAME "OpenRCT2" diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index 23f358fd86..3c3079924f 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -10,7 +10,6 @@ #pragma once #include "../Game.h" -#include "../common.h" #include "../core/DataSerialiser.h" #include "../core/Identifier.hpp" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index 3620196380..08be9d4613 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/RideSetColourSchemeAction.cpp b/src/openrct2/actions/RideSetColourSchemeAction.cpp index d0fe301bca..339dd381c7 100644 --- a/src/openrct2/actions/RideSetColourSchemeAction.cpp +++ b/src/openrct2/actions/RideSetColourSchemeAction.cpp @@ -10,7 +10,6 @@ #include "RideSetColourSchemeAction.h" #include "../Cheats.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index 871f195e5a..0e0e278c70 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -11,7 +11,6 @@ #include "../Cheats.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index a395a083c1..2c1c6db763 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -11,7 +11,6 @@ #include "../Cheats.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Formatter.h" diff --git a/src/openrct2/actions/SignSetNameAction.cpp b/src/openrct2/actions/SignSetNameAction.cpp index 0761bd6a06..d1adbaa793 100644 --- a/src/openrct2/actions/SignSetNameAction.cpp +++ b/src/openrct2/actions/SignSetNameAction.cpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../Diagnostic.h" -#include "../common.h" #include "../drawing/Drawing.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 89a601e88f..ca6570b8e1 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index ee728e0cc9..88d06061b8 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/actions/SmallScenerySetColourAction.cpp b/src/openrct2/actions/SmallScenerySetColourAction.cpp index d7f7fa2730..e1959aab79 100644 --- a/src/openrct2/actions/SmallScenerySetColourAction.cpp +++ b/src/openrct2/actions/SmallScenerySetColourAction.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/audio/AudioChannel.h b/src/openrct2/audio/AudioChannel.h index 910158e455..cc81f4d1ed 100644 --- a/src/openrct2/audio/AudioChannel.h +++ b/src/openrct2/audio/AudioChannel.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "AudioMixer.h" namespace OpenRCT2::Audio diff --git a/src/openrct2/audio/AudioContext.h b/src/openrct2/audio/AudioContext.h index b926a0e86f..b105f7ad13 100644 --- a/src/openrct2/audio/AudioContext.h +++ b/src/openrct2/audio/AudioContext.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/IStream.hpp" #include diff --git a/src/openrct2/audio/AudioSource.h b/src/openrct2/audio/AudioSource.h index 8f684726ea..9b6705eee4 100644 --- a/src/openrct2/audio/AudioSource.h +++ b/src/openrct2/audio/AudioSource.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "AudioMixer.h" namespace OpenRCT2::Audio diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index 2946739e38..f151262012 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "AudioMixer.h" diff --git a/src/openrct2/command_line/CommandLine.hpp b/src/openrct2/command_line/CommandLine.hpp index 67d1fb6088..2995d7557d 100644 --- a/src/openrct2/command_line/CommandLine.hpp +++ b/src/openrct2/command_line/CommandLine.hpp @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - /** * Class for enumerating and retrieving values for a set of command line arguments. */ diff --git a/src/openrct2/command_line/ConvertCommand.cpp b/src/openrct2/command_line/ConvertCommand.cpp index e93a5459ec..cb0d22119e 100644 --- a/src/openrct2/command_line/ConvertCommand.cpp +++ b/src/openrct2/command_line/ConvertCommand.cpp @@ -12,7 +12,6 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../ParkImporter.h" -#include "../common.h" #include "../core/Console.hpp" #include "../core/Path.hpp" #include "../interface/Window.h" diff --git a/src/openrct2/common.h b/src/openrct2/common.h deleted file mode 100644 index 2b6b7fc03a..0000000000 --- a/src/openrct2/common.h +++ /dev/null @@ -1,18 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2014-2024 OpenRCT2 developers - * - * For a complete list of all authors, please refer to contributors.md - * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 - * - * OpenRCT2 is licensed under the GNU General Public License version 3. - *****************************************************************************/ - -#pragma once - -// Ignore isatty warning on WIN32 -#ifndef _CRT_NONSTDC_NO_WARNINGS -# define _CRT_NONSTDC_NO_WARNINGS -#endif - -#include -#include diff --git a/src/openrct2/config/IniReader.cpp b/src/openrct2/config/IniReader.cpp index 08926ec680..e701b4a40e 100644 --- a/src/openrct2/config/IniReader.cpp +++ b/src/openrct2/config/IniReader.cpp @@ -9,7 +9,6 @@ #include "IniReader.hpp" -#include "../common.h" #include "../core/IStream.hpp" #include "../core/String.hpp" #include "../core/StringBuilder.h" diff --git a/src/openrct2/config/IniReader.hpp b/src/openrct2/config/IniReader.hpp index c96a51b4a6..38e8dccf82 100644 --- a/src/openrct2/config/IniReader.hpp +++ b/src/openrct2/config/IniReader.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/config/IniWriter.hpp b/src/openrct2/config/IniWriter.hpp index c10d4b1d4d..0de0d8aa0b 100644 --- a/src/openrct2/config/IniWriter.hpp +++ b/src/openrct2/config/IniWriter.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/ChecksumStream.h b/src/openrct2/core/ChecksumStream.h index cd7c2278b4..a6629a2671 100644 --- a/src/openrct2/core/ChecksumStream.h +++ b/src/openrct2/core/ChecksumStream.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "IStream.hpp" #include diff --git a/src/openrct2/core/Collections.hpp b/src/openrct2/core/Collections.hpp index f7670624fe..084626011d 100644 --- a/src/openrct2/core/Collections.hpp +++ b/src/openrct2/core/Collections.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Memory.hpp" #include "String.hpp" diff --git a/src/openrct2/core/Console.hpp b/src/openrct2/core/Console.hpp index 241cac8d50..ac146890b2 100644 --- a/src/openrct2/core/Console.hpp +++ b/src/openrct2/core/Console.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/Endianness.h b/src/openrct2/core/Endianness.h index 2dda33abcb..e395a45d8e 100644 --- a/src/openrct2/core/Endianness.h +++ b/src/openrct2/core/Endianness.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include diff --git a/src/openrct2/core/File.h b/src/openrct2/core/File.h index 7b8dc078e3..e7c748217b 100644 --- a/src/openrct2/core/File.h +++ b/src/openrct2/core/File.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp index 4934173b8c..92b66b065a 100644 --- a/src/openrct2/core/FileIndex.hpp +++ b/src/openrct2/core/FileIndex.hpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../Diagnostic.h" -#include "../common.h" #include "Console.hpp" #include "DataSerialiser.h" #include "File.h" diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index 05af6ca7ab..9a27c99646 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -7,8 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" - #ifdef _WIN32 # include #endif diff --git a/src/openrct2/core/FileScanner.h b/src/openrct2/core/FileScanner.h index dab468edf9..d68e9346eb 100644 --- a/src/openrct2/core/FileScanner.h +++ b/src/openrct2/core/FileScanner.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/FileStream.h b/src/openrct2/core/FileStream.h index 195a0fe68c..e4a8981faf 100644 --- a/src/openrct2/core/FileStream.h +++ b/src/openrct2/core/FileStream.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "FileSystem.hpp" #include "IStream.hpp" diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp index 844bbd03d8..8db96d80f8 100644 --- a/src/openrct2/core/Guard.cpp +++ b/src/openrct2/core/Guard.cpp @@ -13,7 +13,6 @@ #endif #include "../Version.h" -#include "../common.h" #include "Console.hpp" #include "Diagnostics.hpp" #include "Guard.hpp" diff --git a/src/openrct2/core/Http.h b/src/openrct2/core/Http.h index aab5336fd6..5c0be551f8 100644 --- a/src/openrct2/core/Http.h +++ b/src/openrct2/core/Http.h @@ -11,8 +11,6 @@ #ifndef DISABLE_HTTP -# include "../common.h" - # include # include # include diff --git a/src/openrct2/core/IStream.hpp b/src/openrct2/core/IStream.hpp index d1163d8356..3db2a154e4 100644 --- a/src/openrct2/core/IStream.hpp +++ b/src/openrct2/core/IStream.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include "Memory.hpp" diff --git a/src/openrct2/core/Imaging.h b/src/openrct2/core/Imaging.h index fb60016cc6..99adb55e20 100644 --- a/src/openrct2/core/Imaging.h +++ b/src/openrct2/core/Imaging.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../drawing/Drawing.h" #include diff --git a/src/openrct2/core/Json.hpp b/src/openrct2/core/Json.hpp index a33fd9c79a..d97338fb75 100644 --- a/src/openrct2/core/Json.hpp +++ b/src/openrct2/core/Json.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp index cf5711d5a5..e5db502599 100644 --- a/src/openrct2/core/Memory.hpp +++ b/src/openrct2/core/Memory.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Guard.hpp" #include diff --git a/src/openrct2/core/MemoryStream.h b/src/openrct2/core/MemoryStream.h index 3510be6ce9..33363a52fe 100644 --- a/src/openrct2/core/MemoryStream.h +++ b/src/openrct2/core/MemoryStream.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "IStream.hpp" #include diff --git a/src/openrct2/core/Path.hpp b/src/openrct2/core/Path.hpp index 160acba358..6cc7c0bf43 100644 --- a/src/openrct2/core/Path.hpp +++ b/src/openrct2/core/Path.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp index 64c94e490e..21d47019fe 100644 --- a/src/openrct2/core/String.hpp +++ b/src/openrct2/core/String.hpp @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include #include diff --git a/src/openrct2/core/StringBuilder.h b/src/openrct2/core/StringBuilder.h index 4c2469f26d..2df78f2cb7 100644 --- a/src/openrct2/core/StringBuilder.h +++ b/src/openrct2/core/StringBuilder.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/core/StringReader.h b/src/openrct2/core/StringReader.h index 08d34ccc8a..b9ede8e4a2 100644 --- a/src/openrct2/core/StringReader.h +++ b/src/openrct2/core/StringReader.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" struct IStringReader diff --git a/src/openrct2/core/Zip.h b/src/openrct2/core/Zip.h index 0010a41b4a..a590a67df3 100644 --- a/src/openrct2/core/Zip.h +++ b/src/openrct2/core/Zip.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include #include diff --git a/src/openrct2/drawing/AVX2Drawing.cpp b/src/openrct2/drawing/AVX2Drawing.cpp index e6de48d4dc..39b2d1e55b 100644 --- a/src/openrct2/drawing/AVX2Drawing.cpp +++ b/src/openrct2/drawing/AVX2Drawing.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../core/Guard.hpp" #include "Drawing.h" diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index 583e7b7bd8..3fb1cc6284 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -8,7 +8,6 @@ *****************************************************************************/ #include "../Context.h" -#include "../common.h" #include "../config/Config.h" #include "../core/String.hpp" #include "../core/UTF8.h" diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 206587c921..e1e0f20e43 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -14,7 +14,6 @@ #include "../Game.h" #include "../GameState.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../config/Config.h" #include "../core/Guard.hpp" #include "../object/Object.h" diff --git a/src/openrct2/drawing/Font.h b/src/openrct2/drawing/Font.h index b264895047..ee53a76623 100644 --- a/src/openrct2/drawing/Font.h +++ b/src/openrct2/drawing/Font.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "../drawing/ImageId.hpp" diff --git a/src/openrct2/drawing/IDrawingContext.h b/src/openrct2/drawing/IDrawingContext.h index e918ef2a47..0efe8df7df 100644 --- a/src/openrct2/drawing/IDrawingContext.h +++ b/src/openrct2/drawing/IDrawingContext.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Drawing.h" #include "TTF.h" diff --git a/src/openrct2/drawing/IDrawingEngine.h b/src/openrct2/drawing/IDrawingEngine.h index 2f42735919..3f8751af56 100644 --- a/src/openrct2/drawing/IDrawingEngine.h +++ b/src/openrct2/drawing/IDrawingEngine.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "./Weather.h" #include diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 321c83f114..a563b96b5a 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -12,7 +12,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" -#include "../common.h" #include "../config/Config.h" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h index 48eb01d57c..146445cf75 100644 --- a/src/openrct2/drawing/LightFX.h +++ b/src/openrct2/drawing/LightFX.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct CoordsXY; struct Vehicle; struct DrawPixelInfo; diff --git a/src/openrct2/drawing/Rect.cpp b/src/openrct2/drawing/Rect.cpp index 501e9fde68..57a191ffae 100644 --- a/src/openrct2/drawing/Rect.cpp +++ b/src/openrct2/drawing/Rect.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../interface/Colour.h" #include "../world/Location.hpp" #include "Drawing.h" diff --git a/src/openrct2/drawing/SSE41Drawing.cpp b/src/openrct2/drawing/SSE41Drawing.cpp index 65552a95f9..3276634b1c 100644 --- a/src/openrct2/drawing/SSE41Drawing.cpp +++ b/src/openrct2/drawing/SSE41Drawing.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../core/Guard.hpp" #include "Drawing.h" diff --git a/src/openrct2/drawing/Weather.h b/src/openrct2/drawing/Weather.h index 692c4ae5f8..011635925b 100644 --- a/src/openrct2/drawing/Weather.h +++ b/src/openrct2/drawing/Weather.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct DrawPixelInfo; namespace OpenRCT2::Drawing diff --git a/src/openrct2/entity/EntityBase.h b/src/openrct2/entity/EntityBase.h index 89ba30b514..9c43108192 100644 --- a/src/openrct2/entity/EntityBase.h +++ b/src/openrct2/entity/EntityBase.h @@ -1,7 +1,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../world/Location.hpp" enum class EntityType : uint8_t diff --git a/src/openrct2/entity/EntityList.h b/src/openrct2/entity/EntityList.h index 4e65795a6e..e0368d507b 100644 --- a/src/openrct2/entity/EntityList.h +++ b/src/openrct2/entity/EntityList.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../rct12/RCT12.h" #include "../world/Location.hpp" #include "EntityBase.h" diff --git a/src/openrct2/entity/EntityRegistry.h b/src/openrct2/entity/EntityRegistry.h index e17c08be8f..68affac7e7 100644 --- a/src/openrct2/entity/EntityRegistry.h +++ b/src/openrct2/entity/EntityRegistry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "EntityBase.h" #include diff --git a/src/openrct2/entity/Fountain.h b/src/openrct2/entity/Fountain.h index 02b1a06e48..dc44252ce0 100644 --- a/src/openrct2/entity/Fountain.h +++ b/src/openrct2/entity/Fountain.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../world/Map.h" #include "EntityBase.h" diff --git a/src/openrct2/entity/Staff.h b/src/openrct2/entity/Staff.h index 871dafc993..92daf85551 100644 --- a/src/openrct2/entity/Staff.h +++ b/src/openrct2/entity/Staff.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../world/Map.h" #include "Peep.h" diff --git a/src/openrct2/interface/Chat.h b/src/openrct2/interface/Chat.h index 9612acdbbe..e341fb2dc6 100644 --- a/src/openrct2/interface/Chat.h +++ b/src/openrct2/interface/Chat.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "Colour.h" diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 7c1bd123d4..6cdc50385c 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/interface/Cursors.h b/src/openrct2/interface/Cursors.h index 4ee93edd2e..c8030070fd 100644 --- a/src/openrct2/interface/Cursors.h +++ b/src/openrct2/interface/Cursors.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include enum class CursorID : uint8_t diff --git a/src/openrct2/interface/InteractiveConsole.h b/src/openrct2/interface/InteractiveConsole.h index 99d38d3996..7d62f3843a 100644 --- a/src/openrct2/interface/InteractiveConsole.h +++ b/src/openrct2/interface/InteractiveConsole.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/FormatCodes.h" #include diff --git a/src/openrct2/interface/Screenshot.h b/src/openrct2/interface/Screenshot.h index 8cc470fb4d..667c7022bd 100644 --- a/src/openrct2/interface/Screenshot.h +++ b/src/openrct2/interface/Screenshot.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/FileSystem.hpp" #include "../world/Climate.h" #include "../world/Location.hpp" diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index a14a524ee6..d434b3641e 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../drawing/ImageId.hpp" #include "../localisation/Formatter.h" #include "../ride/RideTypes.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 3c01685fc6..76a0ec26bb 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -173,7 +173,6 @@ - diff --git a/src/openrct2/localisation/ConversionTables.h b/src/openrct2/localisation/ConversionTables.h index c9f015ee73..ce2e7538b2 100644 --- a/src/openrct2/localisation/ConversionTables.h +++ b/src/openrct2/localisation/ConversionTables.h @@ -9,6 +9,4 @@ #pragma once -#include "../common.h" - wchar_t EncodingConvertRCT2ToUnicode(wchar_t rct2str); diff --git a/src/openrct2/localisation/Formatting.h b/src/openrct2/localisation/Formatting.h index 32f96580bf..ccf59bc84b 100644 --- a/src/openrct2/localisation/Formatting.h +++ b/src/openrct2/localisation/Formatting.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "FormatCodes.h" #include "Language.h" diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index 3d5c963d58..22bd415fa5 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -11,7 +11,6 @@ #include "../Context.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/FileStream.h" #include "../core/Memory.hpp" #include "../core/RTL.h" diff --git a/src/openrct2/localisation/Localisation.Date.cpp b/src/openrct2/localisation/Localisation.Date.cpp index d924a43d74..1b3fa404d4 100644 --- a/src/openrct2/localisation/Localisation.Date.cpp +++ b/src/openrct2/localisation/Localisation.Date.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "Date.h" #include "StringIds.h" diff --git a/src/openrct2/localisation/Localisation.cpp b/src/openrct2/localisation/Localisation.cpp index 0a9175c399..23e3030c02 100644 --- a/src/openrct2/localisation/Localisation.cpp +++ b/src/openrct2/localisation/Localisation.cpp @@ -11,7 +11,6 @@ #include "../Diagnostic.h" #include "../Game.h" -#include "../common.h" #include "../config/Config.h" #include "../core/Guard.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/management/Award.h b/src/openrct2/management/Award.h index e73e3de6d9..9181c42637 100644 --- a/src/openrct2/management/Award.h +++ b/src/openrct2/management/Award.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include enum class AwardType : uint16_t diff --git a/src/openrct2/management/Marketing.h b/src/openrct2/management/Marketing.h index 6013a609c9..62be7325ca 100644 --- a/src/openrct2/management/Marketing.h +++ b/src/openrct2/management/Marketing.h @@ -10,7 +10,6 @@ #pragma once #include "../Cheats.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "../ride/ShopItem.h" diff --git a/src/openrct2/network/DiscordService.h b/src/openrct2/network/DiscordService.h index 07c06060e3..ab496b4055 100644 --- a/src/openrct2/network/DiscordService.h +++ b/src/openrct2/network/DiscordService.h @@ -11,7 +11,6 @@ #ifdef __ENABLE_DISCORD__ -# include "../common.h" # include "../core/Timer.hpp" # include diff --git a/src/openrct2/network/NetworkConnection.h b/src/openrct2/network/NetworkConnection.h index 35b94c8d04..ad65de39af 100644 --- a/src/openrct2/network/NetworkConnection.h +++ b/src/openrct2/network/NetworkConnection.h @@ -10,7 +10,7 @@ #pragma once #ifndef DISABLE_NETWORK -# include "../common.h" + # include "NetworkKey.h" # include "NetworkPacket.h" # include "NetworkTypes.h" diff --git a/src/openrct2/network/NetworkGroup.h b/src/openrct2/network/NetworkGroup.h index 78e298f02e..241445dac8 100644 --- a/src/openrct2/network/NetworkGroup.h +++ b/src/openrct2/network/NetworkGroup.h @@ -10,7 +10,6 @@ #pragma once #include "../Game.h" -#include "../common.h" #include "NetworkPacket.h" #include diff --git a/src/openrct2/network/NetworkKey.h b/src/openrct2/network/NetworkKey.h index 47044388e3..a0f64c5a67 100644 --- a/src/openrct2/network/NetworkKey.h +++ b/src/openrct2/network/NetworkKey.h @@ -11,8 +11,6 @@ #ifndef DISABLE_NETWORK -# include "../common.h" - # include # include # include diff --git a/src/openrct2/network/NetworkPacket.h b/src/openrct2/network/NetworkPacket.h index 4d9ef70dcc..1bf26372b7 100644 --- a/src/openrct2/network/NetworkPacket.h +++ b/src/openrct2/network/NetworkPacket.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/DataSerialiser.h" #include "NetworkTypes.h" diff --git a/src/openrct2/network/NetworkPlayer.h b/src/openrct2/network/NetworkPlayer.h index 00c253d03a..94e75fdcc8 100644 --- a/src/openrct2/network/NetworkPlayer.h +++ b/src/openrct2/network/NetworkPlayer.h @@ -10,7 +10,6 @@ #pragma once #include "../Game.h" -#include "../common.h" #include "../world/Map.h" #include diff --git a/src/openrct2/network/NetworkServerAdvertiser.h b/src/openrct2/network/NetworkServerAdvertiser.h index 8ab80e428c..e7b971ad19 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.h +++ b/src/openrct2/network/NetworkServerAdvertiser.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include enum class ADVERTISE_STATUS diff --git a/src/openrct2/network/NetworkTypes.h b/src/openrct2/network/NetworkTypes.h index 07a8684219..3ce6496d3c 100644 --- a/src/openrct2/network/NetworkTypes.h +++ b/src/openrct2/network/NetworkTypes.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Endianness.h" #include "../ride/RideTypes.h" #include "../util/Util.h" diff --git a/src/openrct2/network/NetworkUser.h b/src/openrct2/network/NetworkUser.h index 27384d6294..fdcf76813a 100644 --- a/src/openrct2/network/NetworkUser.h +++ b/src/openrct2/network/NetworkUser.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index a05b0ff846..4772a54484 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -56,7 +56,7 @@ #include #include #include - #include "../common.h" + using SOCKET = int32_t; #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 diff --git a/src/openrct2/network/Socket.h b/src/openrct2/network/Socket.h index 29a9b2eedf..c1f1207f08 100644 --- a/src/openrct2/network/Socket.h +++ b/src/openrct2/network/Socket.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include #include #include diff --git a/src/openrct2/object/BannerSceneryEntry.h b/src/openrct2/object/BannerSceneryEntry.h index 61b38ab474..555bafce99 100644 --- a/src/openrct2/object/BannerSceneryEntry.h +++ b/src/openrct2/object/BannerSceneryEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Money.hpp" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/EntranceEntry.h b/src/openrct2/object/EntranceEntry.h index d886cfb000..82a8499cbd 100644 --- a/src/openrct2/object/EntranceEntry.h +++ b/src/openrct2/object/EntranceEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/FootpathEntry.h b/src/openrct2/object/FootpathEntry.h index f5fbe7b1e5..8bfb92ca5d 100644 --- a/src/openrct2/object/FootpathEntry.h +++ b/src/openrct2/object/FootpathEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/ImageTable.h b/src/openrct2/object/ImageTable.h index 88853b4fc6..0ad344072c 100644 --- a/src/openrct2/object/ImageTable.h +++ b/src/openrct2/object/ImageTable.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../drawing/Drawing.h" diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 33121caea8..1616c39c57 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../core/String.hpp" #include "../util/Util.h" diff --git a/src/openrct2/object/ObjectFactory.h b/src/openrct2/object/ObjectFactory.h index db488b9086..d4e95aa913 100644 --- a/src/openrct2/object/ObjectFactory.h +++ b/src/openrct2/object/ObjectFactory.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h index 00dd92d649..7e8a57c6f0 100644 --- a/src/openrct2/object/ObjectManager.h +++ b/src/openrct2/object/ObjectManager.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 871f9a0405..de12b3b337 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" -#include "../common.h" #include "../core/Console.hpp" #include "../core/DataSerialiser.h" #include "../core/FileIndex.hpp" diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index e02ae6a04a..f55b98ac7c 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include "RideObject.h" diff --git a/src/openrct2/object/SceneryGroupEntry.h b/src/openrct2/object/SceneryGroupEntry.h index f8d742b34d..fdfdb0978d 100644 --- a/src/openrct2/object/SceneryGroupEntry.h +++ b/src/openrct2/object/SceneryGroupEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "../world/ScenerySelection.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/StringTable.h b/src/openrct2/object/StringTable.h index ed9d09b874..db42539dd8 100644 --- a/src/openrct2/object/StringTable.h +++ b/src/openrct2/object/StringTable.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/JsonFwd.hpp" #include "../localisation/Language.h" diff --git a/src/openrct2/object/WaterEntry.h b/src/openrct2/object/WaterEntry.h index 7c5372b881..b4709fec0f 100644 --- a/src/openrct2/object/WaterEntry.h +++ b/src/openrct2/object/WaterEntry.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../localisation/StringIdType.h" #include "ObjectTypes.h" diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp index cff3ed0086..f34f0a204f 100644 --- a/src/openrct2/object/WaterObject.cpp +++ b/src/openrct2/object/WaterObject.cpp @@ -12,7 +12,6 @@ #include "WaterObject.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../core/IStream.hpp" #include "../core/Json.hpp" #include "../localisation/Formatter.h" diff --git a/src/openrct2/openrct2_pch.h b/src/openrct2/openrct2_pch.h index 58c125034e..655dac226e 100644 --- a/src/openrct2/openrct2_pch.h +++ b/src/openrct2/openrct2_pch.h @@ -2,7 +2,6 @@ // Include some expensive headers here to improve compilation speed -#include "common.h" #include "core/FileSystem.hpp" #include "object/Object.h" #include "rct2/RCT2.h" diff --git a/src/openrct2/paint/Paint.SessionFlags.h b/src/openrct2/paint/Paint.SessionFlags.h index 873864d0ba..c1dadefd31 100644 --- a/src/openrct2/paint/Paint.SessionFlags.h +++ b/src/openrct2/paint/Paint.SessionFlags.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - namespace PaintSessionFlags { constexpr uint8_t PassedSurface = 1u << 0; diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index 55ea930ea3..c8a9d16e50 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../drawing/Drawing.h" #include "../interface/Colour.h" #include "../world/Location.hpp" diff --git a/src/openrct2/paint/Painter.h b/src/openrct2/paint/Painter.h index 54a119fd0c..7d2d896ced 100644 --- a/src/openrct2/paint/Painter.h +++ b/src/openrct2/paint/Painter.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Paint.h" #include diff --git a/src/openrct2/paint/VirtualFloor.h b/src/openrct2/paint/VirtualFloor.h index 4038366ba4..1c9c372398 100644 --- a/src/openrct2/paint/VirtualFloor.h +++ b/src/openrct2/paint/VirtualFloor.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct CoordsXY; enum class VirtualFloorStyles : int32_t diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.h b/src/openrct2/paint/tile_element/Paint.TileElement.h index 99a7d5e9e1..0ca26bf9ba 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.h +++ b/src/openrct2/paint/tile_element/Paint.TileElement.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../../world/Map.h" struct PaintSession; diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 71d4a66a75..d5b39bc1db 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -11,7 +11,6 @@ #include "../../Game.h" #include "../../GameState.h" -#include "../../common.h" #include "../../config/Config.h" #include "../../drawing/Drawing.h" #include "../../interface/Colour.h" diff --git a/src/openrct2/peep/GuestPathfinding.h b/src/openrct2/peep/GuestPathfinding.h index 199e774123..7b691ee384 100644 --- a/src/openrct2/peep/GuestPathfinding.h +++ b/src/openrct2/peep/GuestPathfinding.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../ride/RideTypes.h" #include "../world/Location.hpp" diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp index b4dbe62b63..5a1cf6c380 100644 --- a/src/openrct2/platform/Platform.Common.cpp +++ b/src/openrct2/platform/Platform.Common.cpp @@ -8,7 +8,6 @@ *****************************************************************************/ #include "../Date.h" -#include "../common.h" #ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index 6fb8390306..b22db8b07d 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -29,7 +29,6 @@ # include "../Date.h" # include "../OpenRCT2.h" -# include "../common.h" # include "../core/Path.hpp" # include "../core/String.hpp" # include "../localisation/Date.h" diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h index 7bb22d4909..55248a2db3 100644 --- a/src/openrct2/platform/Platform.h +++ b/src/openrct2/platform/Platform.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../config/ConfigTypes.h" #include "../core/DateTime.h" #include "../core/String.hpp" diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index cb9ca70424..73ceed76f1 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -10,7 +10,6 @@ #include "Tables.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../interface/Colour.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/rct1/Tables.h b/src/openrct2/rct1/Tables.h index bbcf180d06..bf4cc70674 100644 --- a/src/openrct2/rct1/Tables.h +++ b/src/openrct2/rct1/Tables.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../entity/Peep.h" #include "RCT1.h" diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index 9dd96900b5..f26cb808f7 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -11,7 +11,6 @@ // Structures shared between both RCT1 and RCT2. -#include "../common.h" #include "../management/Research.h" #include "../object/Object.h" #include "../ride/RideTypes.h" diff --git a/src/openrct2/rct12/SawyerChunk.h b/src/openrct2/rct12/SawyerChunk.h index 05e8bc2d7a..4da6f864b5 100644 --- a/src/openrct2/rct12/SawyerChunk.h +++ b/src/openrct2/rct12/SawyerChunk.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include /** diff --git a/src/openrct2/rct12/SawyerChunkReader.h b/src/openrct2/rct12/SawyerChunkReader.h index 5bbdc3a79b..b42b549116 100644 --- a/src/openrct2/rct12/SawyerChunkReader.h +++ b/src/openrct2/rct12/SawyerChunkReader.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/IStream.hpp" #include "../util/SawyerCoding.h" #include "SawyerChunk.h" diff --git a/src/openrct2/rct12/SawyerChunkWriter.h b/src/openrct2/rct12/SawyerChunkWriter.h index 9cc1fc44df..0b14bb413c 100644 --- a/src/openrct2/rct12/SawyerChunkWriter.h +++ b/src/openrct2/rct12/SawyerChunkWriter.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "SawyerChunk.h" #include diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 0c1a0c7bcc..ddec8d53eb 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/FileSystem.hpp" #include "../core/FixedPoint.hpp" #include "../rct12/RCT12.h" diff --git a/src/openrct2/rct2/SeaDecrypt.cpp b/src/openrct2/rct2/SeaDecrypt.cpp index 4ce0465f9e..263efe3832 100644 --- a/src/openrct2/rct2/SeaDecrypt.cpp +++ b/src/openrct2/rct2/SeaDecrypt.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../common.h" #include "../core/File.h" #include "../core/Numerics.hpp" #include "../core/Path.hpp" diff --git a/src/openrct2/rct2/T6Exporter.h b/src/openrct2/rct2/T6Exporter.h index 200f4a43d9..19dde280e3 100644 --- a/src/openrct2/rct2/T6Exporter.h +++ b/src/openrct2/rct2/T6Exporter.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../ride/TrackDesign.h" #include diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 5393af7bbb..0fe57ba38a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -23,7 +23,6 @@ #include "../actions/RideSetVehicleAction.h" #include "../audio/AudioMixer.h" #include "../audio/audio.h" -#include "../common.h" #include "../config/Config.h" #include "../core/BitSet.hpp" #include "../core/FixedVector.h" diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index fed69a499d..ca1ea5b8ff 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -11,7 +11,6 @@ #include "../Limits.h" #include "../actions/ResultWithMessage.h" -#include "../common.h" #include "../core/BitSet.hpp" #include "../core/FixedPoint.hpp" #include "../object/MusicObject.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index a8cc31c680..d38e10272b 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -18,7 +18,6 @@ #include "../actions/RideSetStatusAction.h" #include "../actions/RideSetVehicleAction.h" #include "../actions/TrackRemoveAction.h" -#include "../common.h" #include "../core/FixedVector.h" #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/ride/RideConstruction.h b/src/openrct2/ride/RideConstruction.h index fbfead2504..d802c4bea6 100644 --- a/src/openrct2/ride/RideConstruction.h +++ b/src/openrct2/ride/RideConstruction.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../world/Location.hpp" #include "Station.h" #include "Track.h" diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 400f8c3f01..04d79e825f 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -20,7 +20,6 @@ #define DEFAULT_STALL_COLOUR_PRESET TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }) #include "../audio/audio.h" -#include "../common.h" #include "../core/BitSet.hpp" #include "../entity/Guest.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 0c50bc65bd..466ce43331 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/FixedPoint.hpp" #include "../world/Location.hpp" #include "RideTypes.h" diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp index f85620c1a2..da3c360e28 100644 --- a/src/openrct2/ride/ShopItem.cpp +++ b/src/openrct2/ride/ShopItem.cpp @@ -10,7 +10,6 @@ #include "ShopItem.h" #include "../GameState.h" -#include "../common.h" #include "../entity/Guest.h" #include "../localisation/StringIds.h" #include "../ride/RideEntry.h" diff --git a/src/openrct2/ride/ShopItem.h b/src/openrct2/ride/ShopItem.h index 078084e4be..23c706b7b3 100644 --- a/src/openrct2/ride/ShopItem.h +++ b/src/openrct2/ride/ShopItem.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Money.hpp" #include "../entity/Litter.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/Station.h b/src/openrct2/ride/Station.h index 94ddb4aa94..b697f98e21 100644 --- a/src/openrct2/ride/Station.h +++ b/src/openrct2/ride/Station.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" struct Ride; struct TileCoordsXYZD; diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index fd67b01ed3..b0da909979 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../object/Object.h" #include "../world/Map.h" #include "../world/TileElement.h" diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h index bd5594b03f..8d1306b1d5 100644 --- a/src/openrct2/ride/TrackData.h +++ b/src/openrct2/ride/TrackData.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Track.h" constexpr uint8_t MaxSequencesPerPiece = 16; diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index cc820d310a..d020c2f31e 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -11,7 +11,6 @@ #include "../Limits.h" #include "../actions/GameActionResult.h" -#include "../common.h" #include "../object/Object.h" #include "../ride/RideColour.h" #include "../world/Map.h" diff --git a/src/openrct2/ride/TrackDesignRepository.h b/src/openrct2/ride/TrackDesignRepository.h index 318dbbcee7..ad4fcea532 100644 --- a/src/openrct2/ride/TrackDesignRepository.h +++ b/src/openrct2/ride/TrackDesignRepository.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "RideTypes.h" diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index a1f758f4f2..9e8c0b2028 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../paint/Paint.h" #include "../paint/support/MetalSupports.h" #include "../paint/tile_element/Paint.TileElement.h" diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 15db70bd94..d1b2aa21c7 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -11,7 +11,6 @@ #include "../Identifiers.h" #include "../audio/audio.h" -#include "../common.h" #include "../entity/EntityBase.h" #include "../ride/RideTypes.h" #include "../world/Location.hpp" diff --git a/src/openrct2/ride/VehicleColour.h b/src/openrct2/ride/VehicleColour.h index 9fcced291c..1caa257aea 100644 --- a/src/openrct2/ride/VehicleColour.h +++ b/src/openrct2/ride/VehicleColour.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct VehicleColour { uint8_t Body; diff --git a/src/openrct2/ride/VehicleData.h b/src/openrct2/ride/VehicleData.h index 225c7eb575..180295aff3 100644 --- a/src/openrct2/ride/VehicleData.h +++ b/src/openrct2/ride/VehicleData.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - extern const uint8_t* Rotation1TimeToSpriteMaps[]; extern const uint8_t* Rotation2TimeToSpriteMaps[]; extern const uint8_t* Rotation3TimeToSpriteMaps[]; diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h index 19e8f731dc..9a3005c069 100644 --- a/src/openrct2/ride/VehiclePaint.h +++ b/src/openrct2/ride/VehiclePaint.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - struct PaintSession; struct CarEntry; struct Vehicle; diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 9030a469aa..eead2ce601 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 01202d6ec9..8aad741081 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/MetalSupports.h" diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index b1a8857744..266cbcff23 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/MetalSupports.h" diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 0c55e1a95c..d0f8b4e30b 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index dbe01df865..5dfaac3257 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../entity/EntityRegistry.h" #include "../../entity/Guest.h" #include "../../interface/Viewport.h" diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index d8a9e2f47d..acc8eab691 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../entity/EntityRegistry.h" #include "../../interface/Viewport.h" #include "../../paint/Boundbox.h" diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index b9643c8baf..9735781f05 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 15e414dbb2..050a313843 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 6b479fc0aa..2258418c0f 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index f61e8074d5..e3497b9d5f 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../entity/EntityRegistry.h" #include "../../interface/Viewport.h" #include "../../paint/Boundbox.h" diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 76bd70e186..c31a19d584 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index a058bb12d8..deca87636b 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/support/WoodenSupports.h" diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index c5774d2f9e..917501d43b 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -7,7 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../object/StationObject.h" #include "../../paint/Boundbox.h" diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index 53cd4d9ff7..2783597755 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -8,7 +8,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../../common.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/tile_element/Segment.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index ce82e5d489..2f500e1d69 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Random.hpp" #include "../entity/EntityList.h" #include "../management/Finance.h" diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index 92cfab93d3..b814c616ae 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -10,7 +10,6 @@ #pragma once -#include "../common.h" #include "../core/DateTime.h" #include "../core/String.hpp" #include "../scenario/Scenario.h" diff --git a/src/openrct2/scenario/ScenarioSources.h b/src/openrct2/scenario/ScenarioSources.h index 0e4aa6d359..deabfa28d1 100644 --- a/src/openrct2/scenario/ScenarioSources.h +++ b/src/openrct2/scenario/ScenarioSources.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" struct SourceDescriptor diff --git a/src/openrct2/scenes/Scene.h b/src/openrct2/scenes/Scene.h index fce0571ad9..5515a3ff61 100644 --- a/src/openrct2/scenes/Scene.h +++ b/src/openrct2/scenes/Scene.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #include namespace OpenRCT2 diff --git a/src/openrct2/scenes/game/GameScene.h b/src/openrct2/scenes/game/GameScene.h index c0b39ca89c..8921ab40a4 100644 --- a/src/openrct2/scenes/game/GameScene.h +++ b/src/openrct2/scenes/game/GameScene.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../Scene.h" namespace OpenRCT2 diff --git a/src/openrct2/scenes/intro/IntroScene.h b/src/openrct2/scenes/intro/IntroScene.h index df6f3da349..2980026fc0 100644 --- a/src/openrct2/scenes/intro/IntroScene.h +++ b/src/openrct2/scenes/intro/IntroScene.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../Scene.h" struct DrawPixelInfo; diff --git a/src/openrct2/scenes/title/TitleScene.h b/src/openrct2/scenes/title/TitleScene.h index 6cdf914d73..5a92fed19f 100644 --- a/src/openrct2/scenes/title/TitleScene.h +++ b/src/openrct2/scenes/title/TitleScene.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../../drawing/Drawing.h" #include "../Scene.h" diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index ba6578eee0..5a218823e7 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -10,7 +10,6 @@ #include "TitleSequence.h" #include "../../Diagnostic.h" -#include "../../common.h" #include "../../core/Collections.hpp" #include "../../core/Console.hpp" #include "../../core/File.h" diff --git a/src/openrct2/scenes/title/TitleSequence.h b/src/openrct2/scenes/title/TitleSequence.h index c786de1ae3..38bbdac5e1 100644 --- a/src/openrct2/scenes/title/TitleSequence.h +++ b/src/openrct2/scenes/title/TitleSequence.h @@ -9,7 +9,6 @@ #pragma once -#include "../../common.h" #include "../../core/IStream.hpp" #include "Command/End.h" #include "Command/FollowEntity.h" diff --git a/src/openrct2/scenes/title/TitleSequenceManager.h b/src/openrct2/scenes/title/TitleSequenceManager.h index 98912f9969..fa72615a19 100644 --- a/src/openrct2/scenes/title/TitleSequenceManager.h +++ b/src/openrct2/scenes/title/TitleSequenceManager.h @@ -8,7 +8,7 @@ *****************************************************************************/ #pragma once -#include "../../common.h" + #include "../../core/String.hpp" #include diff --git a/src/openrct2/scenes/title/TitleSequencePlayer.h b/src/openrct2/scenes/title/TitleSequencePlayer.h index f3058f86e3..59cf54ff83 100644 --- a/src/openrct2/scenes/title/TitleSequencePlayer.h +++ b/src/openrct2/scenes/title/TitleSequencePlayer.h @@ -9,8 +9,6 @@ #pragma once -#include "../../common.h" - struct ITitleSequencePlayer { virtual ~ITitleSequencePlayer() = default; diff --git a/src/openrct2/scripting/HookEngine.h b/src/openrct2/scripting/HookEngine.h index d737ca13da..3b78481f25 100644 --- a/src/openrct2/scripting/HookEngine.h +++ b/src/openrct2/scripting/HookEngine.h @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include "../common.h" # include "Duktape.hpp" # include diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h index f9d890c48a..139a90d040 100644 --- a/src/openrct2/scripting/ScriptEngine.h +++ b/src/openrct2/scripting/ScriptEngine.h @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../actions/CustomAction.h" -# include "../common.h" # include "../core/FileWatcher.h" # include "../management/Finance.h" # include "../world/Location.hpp" diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index cf1cf6bd2c..1f5010d436 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../entity/EntityList.h" # include "../../../entity/EntityRegistry.h" # include "../../../entity/Peep.h" diff --git a/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp b/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp index 3b6a06fd11..7590eba2ee 100644 --- a/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScInstalledObject.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../object/ObjectRepository.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/object/ScObject.hpp b/src/openrct2/scripting/bindings/object/ScObject.hpp index 688cf5bc68..bca553c6a0 100644 --- a/src/openrct2/scripting/bindings/object/ScObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScObject.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../object/ObjectManager.h" # include "../../../object/RideObject.h" # include "../../../object/SceneryGroupObject.h" diff --git a/src/openrct2/scripting/bindings/ride/ScRide.cpp b/src/openrct2/scripting/bindings/ride/ScRide.cpp index 334c56f88a..cade909ad1 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.cpp @@ -12,7 +12,6 @@ # include "ScRide.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../../ride/RideData.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/ride/ScRide.hpp b/src/openrct2/scripting/bindings/ride/ScRide.hpp index 4ee2f3d9bd..6aded20cb9 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.hpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/ride/ScRideStation.cpp b/src/openrct2/scripting/bindings/ride/ScRideStation.cpp index 529a5ff447..18a4c9e8b4 100644 --- a/src/openrct2/scripting/bindings/ride/ScRideStation.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRideStation.cpp @@ -12,7 +12,6 @@ # include "ScRideStation.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/ride/ScRideStation.hpp b/src/openrct2/scripting/bindings/ride/ScRideStation.hpp index 70b44217bf..9dd604290e 100644 --- a/src/openrct2/scripting/bindings/ride/ScRideStation.hpp +++ b/src/openrct2/scripting/bindings/ride/ScRideStation.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../ride/Ride.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScClimate.hpp b/src/openrct2/scripting/bindings/world/ScClimate.hpp index 699625d21c..4fc3ab8c05 100644 --- a/src/openrct2/scripting/bindings/world/ScClimate.hpp +++ b/src/openrct2/scripting/bindings/world/ScClimate.hpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../world/Climate.h" # include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScDate.hpp b/src/openrct2/scripting/bindings/world/ScDate.hpp index 7f4ca98786..b36ee2f8e2 100644 --- a/src/openrct2/scripting/bindings/world/ScDate.hpp +++ b/src/openrct2/scripting/bindings/world/ScDate.hpp @@ -15,7 +15,6 @@ # include "../../../Date.h" # include "../../../Game.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../localisation/Date.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScMap.cpp b/src/openrct2/scripting/bindings/world/ScMap.cpp index bd14c9bf81..ba3dd30bdb 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.cpp +++ b/src/openrct2/scripting/bindings/world/ScMap.cpp @@ -12,7 +12,6 @@ # include "ScMap.hpp" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../entity/Balloon.h" # include "../../../entity/Duck.h" # include "../../../entity/EntityList.h" diff --git a/src/openrct2/scripting/bindings/world/ScMap.hpp b/src/openrct2/scripting/bindings/world/ScMap.hpp index d6236721f3..dcae067c71 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.hpp +++ b/src/openrct2/scripting/bindings/world/ScMap.hpp @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include "../../../common.h" # include "../../Duktape.hpp" # include "../ride/ScRide.hpp" # include "../ride/ScTrackIterator.h" diff --git a/src/openrct2/scripting/bindings/world/ScPark.cpp b/src/openrct2/scripting/bindings/world/ScPark.cpp index 4c1dadf217..8c28008717 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.cpp +++ b/src/openrct2/scripting/bindings/world/ScPark.cpp @@ -14,7 +14,6 @@ # include "../../../Context.h" # include "../../../Date.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../entity/Guest.h" # include "../../../management/Finance.h" diff --git a/src/openrct2/scripting/bindings/world/ScPark.hpp b/src/openrct2/scripting/bindings/world/ScPark.hpp index 2ffa992b40..10a41b528d 100644 --- a/src/openrct2/scripting/bindings/world/ScPark.hpp +++ b/src/openrct2/scripting/bindings/world/ScPark.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../Duktape.hpp" # include "ScParkMessage.hpp" # include "ScResearch.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp index 407cbdcdb1..1274b29721 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.cpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.cpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../entity/Peep.h" # include "../../../management/Finance.h" diff --git a/src/openrct2/scripting/bindings/world/ScParkMessage.hpp b/src/openrct2/scripting/bindings/world/ScParkMessage.hpp index 3464669341..80f61af825 100644 --- a/src/openrct2/scripting/bindings/world/ScParkMessage.hpp +++ b/src/openrct2/scripting/bindings/world/ScParkMessage.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../management/NewsItem.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScResearch.cpp b/src/openrct2/scripting/bindings/world/ScResearch.cpp index efb6b28204..ed0ec5beaf 100644 --- a/src/openrct2/scripting/bindings/world/ScResearch.cpp +++ b/src/openrct2/scripting/bindings/world/ScResearch.cpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../management/Research.h" # include "../../../ride/RideData.h" diff --git a/src/openrct2/scripting/bindings/world/ScScenario.hpp b/src/openrct2/scripting/bindings/world/ScScenario.hpp index cdd0fd61e7..152efb4c71 100644 --- a/src/openrct2/scripting/bindings/world/ScScenario.hpp +++ b/src/openrct2/scripting/bindings/world/ScScenario.hpp @@ -13,7 +13,6 @@ # include "../../../Context.h" # include "../../../GameState.h" -# include "../../../common.h" # include "../../../core/String.hpp" # include "../../../scenario/Scenario.h" # include "../../../world/Park.h" diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 913a7a5c93..3113592e72 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -12,7 +12,6 @@ # include "ScTile.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../core/Guard.hpp" # include "../../../entity/EntityRegistry.h" # include "../../../object/LargeSceneryEntry.h" diff --git a/src/openrct2/scripting/bindings/world/ScTile.hpp b/src/openrct2/scripting/bindings/world/ScTile.hpp index 35784a6e31..ff5c2b0271 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.hpp +++ b/src/openrct2/scripting/bindings/world/ScTile.hpp @@ -11,7 +11,6 @@ #ifdef ENABLE_SCRIPTING -# include "../../../common.h" # include "../../Duktape.hpp" # include "ScTileElement.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index 3166a68c49..c858452ab8 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -12,7 +12,6 @@ # include "ScTileElement.hpp" # include "../../../Context.h" -# include "../../../common.h" # include "../../../core/Guard.hpp" # include "../../../entity/EntityRegistry.h" # include "../../../object/LargeSceneryEntry.h" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.hpp b/src/openrct2/scripting/bindings/world/ScTileElement.hpp index a5bcddc084..9ac6a6a0c5 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.hpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.hpp @@ -12,7 +12,6 @@ #ifdef ENABLE_SCRIPTING # include "../../../Context.h" -# include "../../../common.h" # include "../../../core/Guard.hpp" # include "../../../entity/EntityRegistry.h" # include "../../../ride/Track.h" diff --git a/src/openrct2/ui/UiContext.h b/src/openrct2/ui/UiContext.h index ba6ab32949..8ede8f67d5 100644 --- a/src/openrct2/ui/UiContext.h +++ b/src/openrct2/ui/UiContext.h @@ -10,7 +10,6 @@ #pragma once #include "../Context.h" -#include "../common.h" #include "../config/ConfigTypes.h" #include "../interface/Cursors.h" diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h index 8138d93b11..3ed656ce39 100644 --- a/src/openrct2/ui/WindowManager.h +++ b/src/openrct2/ui/WindowManager.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../interface/Window.h" #include "../windows/Intent.h" diff --git a/src/openrct2/util/SawyerCoding.h b/src/openrct2/util/SawyerCoding.h index adc6714b65..d8240cb983 100644 --- a/src/openrct2/util/SawyerCoding.h +++ b/src/openrct2/util/SawyerCoding.h @@ -9,8 +9,6 @@ #pragma once -#include "../common.h" - #pragma pack(push, 1) struct SawyerCodingChunkHeader { diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index f43d234c53..c8fe259be4 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -10,7 +10,6 @@ #include "Util.h" #include "../Diagnostic.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../core/Path.hpp" #include "../core/UTF8.h" diff --git a/src/openrct2/windows/Intent.h b/src/openrct2/windows/Intent.h index 3707b6d96b..69cb3c9bfd 100644 --- a/src/openrct2/windows/Intent.h +++ b/src/openrct2/windows/Intent.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/Identifier.hpp" #include "../interface/Window.h" diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h index ade42af3ab..287e8cb172 100644 --- a/src/openrct2/world/Banner.h +++ b/src/openrct2/world/Banner.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "Location.hpp" diff --git a/src/openrct2/world/Climate.h b/src/openrct2/world/Climate.h index 78190b3551..d8bb1354df 100644 --- a/src/openrct2/world/Climate.h +++ b/src/openrct2/world/Climate.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../drawing/Drawing.h" #include "../util/Util.h" diff --git a/src/openrct2/world/ConstructionClearance.h b/src/openrct2/world/ConstructionClearance.h index d7b0c62a68..a9ab2da454 100644 --- a/src/openrct2/world/ConstructionClearance.h +++ b/src/openrct2/world/ConstructionClearance.h @@ -10,7 +10,6 @@ #pragma once #include "../actions/GameActionResult.h" -#include "../common.h" #include "Map.h" #include diff --git a/src/openrct2/world/Entrance.h b/src/openrct2/world/Entrance.h index 8bb4de0b9c..9b475642d9 100644 --- a/src/openrct2/world/Entrance.h +++ b/src/openrct2/world/Entrance.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "Location.hpp" #include "Map.h" diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index 30869b7faf..6368edb347 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../interface/Viewport.h" #include "../object/Object.h" diff --git a/src/openrct2/world/LargeScenery.cpp b/src/openrct2/world/LargeScenery.cpp index 77ba5cdc7b..f53c595fd7 100644 --- a/src/openrct2/world/LargeScenery.cpp +++ b/src/openrct2/world/LargeScenery.cpp @@ -10,7 +10,6 @@ #include "LargeScenery.h" #include "../Context.h" -#include "../common.h" #include "../object/LargeSceneryObject.h" #include "../object/ObjectEntryManager.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index df22877063..0562232dee 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../util/Math.hpp" constexpr int16_t LOCATION_NULL = -32768; diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 9a684bfdbc..1af21d8db4 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Location.hpp" #include "TileElement.h" diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 95d59d4a27..ceeb6cb0a7 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../core/Imaging.h" #include "../core/String.hpp" diff --git a/src/openrct2/world/MapGen.h b/src/openrct2/world/MapGen.h index 2050624217..fe57ff121e 100644 --- a/src/openrct2/world/MapGen.h +++ b/src/openrct2/world/MapGen.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../core/String.hpp" #include "Location.hpp" diff --git a/src/openrct2/world/MapHelpers.h b/src/openrct2/world/MapHelpers.h index 91d15e951b..e953445800 100644 --- a/src/openrct2/world/MapHelpers.h +++ b/src/openrct2/world/MapHelpers.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Location.hpp" enum diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h index 5a7814b753..737c87775a 100644 --- a/src/openrct2/world/Park.h +++ b/src/openrct2/world/Park.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "../management/Finance.h" #include "Map.h" diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 73ed9b9424..195ad6bae9 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -19,7 +19,6 @@ #include "../actions/LargeSceneryRemoveAction.h" #include "../actions/SmallSceneryRemoveAction.h" #include "../actions/WallRemoveAction.h" -#include "../common.h" #include "../core/String.hpp" #include "../entity/Fountain.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/world/Surface.h b/src/openrct2/world/Surface.h index 578a8992e8..d2d48698da 100644 --- a/src/openrct2/world/Surface.h +++ b/src/openrct2/world/Surface.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "TileElement.h" enum diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index 183253eac7..ec5a46fb5a 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -10,7 +10,6 @@ #pragma once #include "../Identifiers.h" -#include "../common.h" #include "../ride/RideTypes.h" #include "../ride/Station.h" #include "Banner.h" diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 217ba1ef59..52c69db755 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../actions/GameAction.h" -#include "../common.h" #include "../core/Guard.hpp" #include "../interface/Window.h" #include "../interface/Window_internal.h" diff --git a/src/openrct2/world/TileInspector.h b/src/openrct2/world/TileInspector.h index 3ba6ba3463..421beeb3e1 100644 --- a/src/openrct2/world/TileInspector.h +++ b/src/openrct2/world/TileInspector.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "Map.h" namespace GameActions diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 8b735c5bcf..f8b9871ce0 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -12,7 +12,6 @@ #include "../Cheats.h" #include "../Game.h" #include "../OpenRCT2.h" -#include "../common.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../network/network.h" diff --git a/src/openrct2/world/Wall.h b/src/openrct2/world/Wall.h index 8ea639d0cf..354c5bafc2 100644 --- a/src/openrct2/world/Wall.h +++ b/src/openrct2/world/Wall.h @@ -9,7 +9,6 @@ #pragma once -#include "../common.h" #include "TileElement.h" enum