From 5b8fedd5b2ee8528c97a90cb233e550425ae456d Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Thu, 4 Sep 2025 21:57:41 +0200 Subject: [PATCH] Rework Map.h includes (remove transitive header includes) --- src/openrct2-ui/input/MouseInput.cpp | 1 + src/openrct2-ui/interface/ViewportInteraction.cpp | 1 + src/openrct2-ui/ride/Construction.cpp | 1 + src/openrct2-ui/ride/VehicleSounds.cpp | 1 + src/openrct2-ui/scripting/CustomMenu.cpp | 1 + src/openrct2-ui/scripting/ScViewport.hpp | 1 + src/openrct2-ui/windows/Banner.cpp | 1 + src/openrct2-ui/windows/EditorParkEntrance.cpp | 1 + src/openrct2-ui/windows/Footpath.cpp | 1 + src/openrct2-ui/windows/LandRights.cpp | 1 + src/openrct2-ui/windows/Map.cpp | 1 + src/openrct2-ui/windows/MapGen.cpp | 1 - src/openrct2-ui/windows/MazeConstruction.cpp | 1 + src/openrct2-ui/windows/Ride.cpp | 1 + src/openrct2-ui/windows/RideConstruction.cpp | 1 + src/openrct2-ui/windows/Scenery.cpp | 1 + src/openrct2-ui/windows/TileInspector.cpp | 1 + src/openrct2-ui/windows/TrackDesignPlace.cpp | 1 + src/openrct2/Cheats.cpp | 1 - src/openrct2/Editor.cpp | 1 + src/openrct2/EditorObjectSelectionSession.cpp | 1 + src/openrct2/GameState.cpp | 1 + src/openrct2/GameState.h | 2 ++ src/openrct2/actions/BannerPlaceAction.cpp | 1 + src/openrct2/actions/BannerRemoveAction.cpp | 1 + src/openrct2/actions/BannerSetColourAction.cpp | 1 + src/openrct2/actions/BannerSetNameAction.cpp | 1 + src/openrct2/actions/BannerSetStyleAction.cpp | 1 + src/openrct2/actions/FootpathAdditionPlaceAction.cpp | 1 + src/openrct2/actions/FootpathAdditionRemoveAction.cpp | 1 + src/openrct2/actions/FootpathLayoutPlaceAction.cpp | 1 + src/openrct2/actions/FootpathPlaceAction.cpp | 1 + src/openrct2/actions/FootpathRemoveAction.cpp | 1 + src/openrct2/actions/GameAction.cpp | 1 + src/openrct2/actions/LandBuyRightsAction.cpp | 1 + src/openrct2/actions/LandLowerAction.cpp | 1 + src/openrct2/actions/LandRaiseAction.cpp | 1 + src/openrct2/actions/LandSetHeightAction.cpp | 1 + src/openrct2/actions/LandSetRightsAction.cpp | 1 + src/openrct2/actions/LandSmoothAction.cpp | 1 + src/openrct2/actions/LargeSceneryPlaceAction.cpp | 1 + src/openrct2/actions/LargeSceneryRemoveAction.cpp | 1 + src/openrct2/actions/LargeScenerySetColourAction.cpp | 1 + src/openrct2/actions/MapChangeSizeAction.cpp | 1 + src/openrct2/actions/MazePlaceTrackAction.cpp | 1 + src/openrct2/actions/MazeSetTrackAction.cpp | 1 + src/openrct2/actions/ParkEntrancePlaceAction.cpp | 1 + src/openrct2/actions/ParkEntranceRemoveAction.cpp | 1 + src/openrct2/actions/PeepSpawnPlaceAction.cpp | 1 + src/openrct2/actions/RideDemolishAction.cpp | 1 + src/openrct2/actions/RideEntranceExitPlaceAction.cpp | 1 + src/openrct2/actions/RideEntranceExitRemoveAction.cpp | 1 + src/openrct2/actions/RideSetAppearanceAction.cpp | 1 + src/openrct2/actions/RideSetColourSchemeAction.cpp | 1 + src/openrct2/actions/RideSetNameAction.cpp | 1 + src/openrct2/actions/RideSetPriceAction.cpp | 1 + src/openrct2/actions/RideSetSettingAction.cpp | 1 + src/openrct2/actions/RideSetStatusAction.cpp | 1 + src/openrct2/actions/RideSetVehicleAction.cpp | 1 + src/openrct2/actions/SignSetNameAction.cpp | 1 + src/openrct2/actions/SignSetStyleAction.cpp | 1 + src/openrct2/actions/SmallSceneryPlaceAction.cpp | 1 + src/openrct2/actions/SmallSceneryRemoveAction.cpp | 1 + src/openrct2/actions/SmallScenerySetColourAction.cpp | 1 + src/openrct2/actions/StaffHireNewAction.cpp | 1 + src/openrct2/actions/StaffSetPatrolAreaAction.cpp | 1 + src/openrct2/actions/SurfaceSetStyleAction.cpp | 1 + src/openrct2/actions/TileModifyAction.cpp | 1 + src/openrct2/actions/TrackPlaceAction.cpp | 1 + src/openrct2/actions/TrackRemoveAction.cpp | 1 + src/openrct2/actions/TrackSetBrakeSpeedAction.cpp | 1 + src/openrct2/actions/WallPlaceAction.cpp | 1 + src/openrct2/actions/WallRemoveAction.cpp | 1 + src/openrct2/actions/WallSetColourAction.cpp | 1 + src/openrct2/actions/WaterLowerAction.cpp | 1 + src/openrct2/actions/WaterRaiseAction.cpp | 1 + src/openrct2/actions/WaterSetHeightAction.cpp | 1 + src/openrct2/audio/Audio.cpp | 1 + src/openrct2/drawing/LightFX.cpp | 1 - src/openrct2/entity/Balloon.cpp | 1 + src/openrct2/entity/Duck.cpp | 1 + src/openrct2/entity/EntityRegistry.cpp | 1 + src/openrct2/entity/Particle.cpp | 1 + src/openrct2/entity/Staff.cpp | 1 + src/openrct2/interface/InteractiveConsole.cpp | 1 + src/openrct2/interface/Viewport.cpp | 2 +- src/openrct2/interface/Window.cpp | 1 + src/openrct2/management/NewsItem.cpp | 1 + src/openrct2/network/NetworkServerAdvertiser.cpp | 1 - src/openrct2/paint/Paint.Entity.cpp | 1 + src/openrct2/paint/VirtualFloor.cpp | 1 + src/openrct2/paint/support/WoodenSupports.cpp | 1 - src/openrct2/paint/tile_element/Paint.LargeScenery.cpp | 1 - src/openrct2/paint/tile_element/Paint.SmallScenery.cpp | 1 - src/openrct2/paint/tile_element/Paint.Surface.cpp | 1 + src/openrct2/paint/tile_element/Paint.TileElement.cpp | 1 + src/openrct2/paint/tile_element/Paint.Wall.cpp | 1 - .../paint/track/coaster/AirPoweredVerticalCoaster.cpp | 1 - src/openrct2/paint/track/coaster/AlpineCoaster.cpp | 1 - src/openrct2/paint/track/coaster/BobsleighCoaster.cpp | 1 - .../paint/track/coaster/ClassicWoodenRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/CompactInvertedCoaster.cpp | 1 - src/openrct2/paint/track/coaster/CorkscrewRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/FlyingRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/HeartlineTwisterCoaster.cpp | 1 - src/openrct2/paint/track/coaster/HybridCoaster.cpp | 1 - src/openrct2/paint/track/coaster/InvertedHairpinCoaster.cpp | 1 - src/openrct2/paint/track/coaster/InvertedImpulseCoaster.cpp | 1 - src/openrct2/paint/track/coaster/InvertedRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/JuniorRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp | 1 - src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp | 1 - .../paint/track/coaster/LayDownRollerCoasterInverted.cpp | 1 - src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/LoopingRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/MineRide.cpp | 1 - src/openrct2/paint/track/coaster/MineTrainCoaster.cpp | 1 - src/openrct2/paint/track/coaster/MiniRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/MiniSuspendedCoaster.cpp | 1 - .../paint/track/coaster/MultiDimensionRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/ReverseFreefallCoaster.cpp | 1 - src/openrct2/paint/track/coaster/ReverserRollerCoaster.cpp | 1 - .../paint/track/coaster/SideFrictionRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/SingleRailRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/StandUpRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/Steeplechase.cpp | 1 - src/openrct2/paint/track/coaster/SuspendedSwingingCoaster.cpp | 1 - src/openrct2/paint/track/coaster/TwisterRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/WildMouse.cpp | 1 - src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp | 1 - src/openrct2/paint/track/coaster/WoodenWildMouse.cpp | 1 - src/openrct2/paint/track/gentle/CarRide.cpp | 1 - src/openrct2/paint/track/gentle/GhostTrain.cpp | 1 - src/openrct2/paint/track/gentle/Maze.cpp | 1 - src/openrct2/paint/track/gentle/MiniGolf.cpp | 1 - src/openrct2/paint/track/gentle/MiniHelicopters.cpp | 1 - src/openrct2/paint/track/gentle/MonorailCycles.cpp | 1 - src/openrct2/paint/track/gentle/ObservationTower.cpp | 1 - src/openrct2/paint/track/shops/Facility.cpp | 1 - src/openrct2/paint/track/shops/Shop.cpp | 1 - src/openrct2/paint/track/thrill/GoKarts.cpp | 1 - src/openrct2/paint/track/thrill/TopSpin.cpp | 1 - src/openrct2/paint/track/transport/MiniatureRailway.cpp | 1 - src/openrct2/paint/track/transport/Monorail.cpp | 1 - src/openrct2/paint/track/transport/SuspendedMonorail.cpp | 1 - src/openrct2/paint/track/water/RiverRapids.cpp | 1 - src/openrct2/park/ParkPreview.cpp | 1 + src/openrct2/peep/GuestPathfinding.cpp | 1 + src/openrct2/rct1/S4Importer.cpp | 1 + src/openrct2/rct2/S6Importer.cpp | 1 + src/openrct2/ride/CableLift.cpp | 1 + src/openrct2/ride/MazeCost.cpp | 1 + src/openrct2/ride/Ride.h | 1 - src/openrct2/ride/RideConstruction.cpp | 1 + src/openrct2/ride/RideManager.hpp | 2 ++ src/openrct2/ride/Station.cpp | 1 + src/openrct2/ride/TrackDesign.cpp | 1 + src/openrct2/ride/TrackDesign.h | 1 - src/openrct2/ride/TrackDesignSave.cpp | 1 + src/openrct2/ride/TrackPaint.cpp | 1 - src/openrct2/scenes/preloader/PreloaderScene.cpp | 1 + src/openrct2/scenes/title/TitleScene.cpp | 1 + src/openrct2/scripting/bindings/entity/ScStaff.cpp | 1 + src/openrct2/scripting/bindings/entity/ScVehicle.cpp | 1 + src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp | 1 + src/openrct2/scripting/bindings/world/ScMap.cpp | 1 - src/openrct2/scripting/bindings/world/ScTile.cpp | 1 + src/openrct2/scripting/bindings/world/ScTileElement.cpp | 1 + src/openrct2/world/Banner.cpp | 1 + src/openrct2/world/ConstructionClearance.cpp | 1 + src/openrct2/world/Entrance.cpp | 1 + src/openrct2/world/Footpath.cpp | 1 + src/openrct2/world/Map.h | 2 -- src/openrct2/world/MapAnimation.cpp | 1 + src/openrct2/world/Park.cpp | 1 + src/openrct2/world/Scenery.cpp | 1 + src/openrct2/world/TileElementsView.h | 1 + src/openrct2/world/TileInspector.cpp | 1 + src/openrct2/world/map_generator/MapGen.cpp | 1 + src/openrct2/world/map_generator/MapHelpers.cpp | 4 ++-- src/openrct2/world/tile_element/TileElement.cpp | 1 - 181 files changed, 121 insertions(+), 67 deletions(-) diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 56b571cfcc..7dd06096c0 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 599f043722..3e89975c48 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/ride/Construction.cpp b/src/openrct2-ui/ride/Construction.cpp index 8fd000da6b..06868839f2 100644 --- a/src/openrct2-ui/ride/Construction.cpp +++ b/src/openrct2-ui/ride/Construction.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include using namespace OpenRCT2::TrackMetaData; diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp index 8618ce407a..33d3ee30f7 100644 --- a/src/openrct2-ui/ride/VehicleSounds.cpp +++ b/src/openrct2-ui/ride/VehicleSounds.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/scripting/CustomMenu.cpp b/src/openrct2-ui/scripting/CustomMenu.cpp index b14dafd930..e0d2392695 100644 --- a/src/openrct2-ui/scripting/CustomMenu.cpp +++ b/src/openrct2-ui/scripting/CustomMenu.cpp @@ -18,6 +18,7 @@ #include #include #include + #include using namespace OpenRCT2; using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp index b64f2c2644..f9b387fb8b 100644 --- a/src/openrct2-ui/scripting/ScViewport.hpp +++ b/src/openrct2-ui/scripting/ScViewport.hpp @@ -19,6 +19,7 @@ #include #include #include + #include namespace OpenRCT2::Scripting { diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 254bc3713a..f4a6a6fa71 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index 04ccfa346a..4dcccb28d8 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 834b41d8ed..8b410eaf44 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index ee7fe0ceab..a537ab0367 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 1b6671eb14..97434c6d05 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 683887340a..8cf384c61b 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index fb8c3d605b..5d0be1ecfb 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 0f31f3aa33..ea7992f816 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 4dd74d6b71..e15e71441c 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index b813519ccf..b7edf80c08 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 2882ce3fd1..fe709f8223 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 189452ed24..3464889561 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 9321ac5333..239c1859d4 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -17,7 +17,6 @@ #include "ride/Ride.h" #include "world/Climate.h" #include "world/Footpath.h" -#include "world/Map.h" #include "world/Park.h" #include "world/Scenery.h" diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 5a6a20fa71..079cd7e5ec 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -45,6 +45,7 @@ #include "world/Climate.h" #include "world/Entrance.h" #include "world/Footpath.h" +#include "world/Map.h" #include "world/MapLimits.h" #include "world/Park.h" #include "world/Scenery.h" diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index a6063e2a1b..caec1958b5 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -32,6 +32,7 @@ #include "ride/TrainManager.h" #include "ride/Vehicle.h" #include "windows/Intent.h" +#include "world/Map.h" #include "world/tile_element/BannerElement.h" #include "world/tile_element/EntranceElement.h" #include "world/tile_element/LargeSceneryElement.h" diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index fd13eb4a31..276af360b5 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -28,6 +28,7 @@ #include "scripting/ScriptEngine.h" #include "ui/UiContext.h" #include "windows/Intent.h" +#include "world/Map.h" #include "world/MapAnimation.h" #include "world/Park.h" #include "world/Scenery.h" diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h index ab19384aee..f78e5fba78 100644 --- a/src/openrct2/GameState.h +++ b/src/openrct2/GameState.h @@ -33,6 +33,8 @@ namespace OpenRCT2 { + using PeepSpawn = CoordsXYZD; + struct GameState_t { Park::ParkData park{}; diff --git a/src/openrct2/actions/BannerPlaceAction.cpp b/src/openrct2/actions/BannerPlaceAction.cpp index 0cf7886df6..220a430f92 100644 --- a/src/openrct2/actions/BannerPlaceAction.cpp +++ b/src/openrct2/actions/BannerPlaceAction.cpp @@ -15,6 +15,7 @@ #include "../object/ObjectEntryManager.h" #include "../world/Banner.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Scenery.h" #include "../world/TileElementsView.h" diff --git a/src/openrct2/actions/BannerRemoveAction.cpp b/src/openrct2/actions/BannerRemoveAction.cpp index 201677beed..4273aca20e 100644 --- a/src/openrct2/actions/BannerRemoveAction.cpp +++ b/src/openrct2/actions/BannerRemoveAction.cpp @@ -14,6 +14,7 @@ #include "../object/BannerSceneryEntry.h" #include "../object/ObjectEntryManager.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/Scenery.h" #include "../world/TileElementsView.h" #include "../world/tile_element/BannerElement.h" diff --git a/src/openrct2/actions/BannerSetColourAction.cpp b/src/openrct2/actions/BannerSetColourAction.cpp index 579e22c661..56e1113ad0 100644 --- a/src/openrct2/actions/BannerSetColourAction.cpp +++ b/src/openrct2/actions/BannerSetColourAction.cpp @@ -14,6 +14,7 @@ #include "../management/Finance.h" #include "../windows/Intent.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/tile_element/BannerElement.h" #include "GameAction.h" diff --git a/src/openrct2/actions/BannerSetNameAction.cpp b/src/openrct2/actions/BannerSetNameAction.cpp index 7cd2caf795..aed4d15326 100644 --- a/src/openrct2/actions/BannerSetNameAction.cpp +++ b/src/openrct2/actions/BannerSetNameAction.cpp @@ -16,6 +16,7 @@ #include "../localisation/StringIds.h" #include "../windows/Intent.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/tile_element/BannerElement.h" #include "GameAction.h" diff --git a/src/openrct2/actions/BannerSetStyleAction.cpp b/src/openrct2/actions/BannerSetStyleAction.cpp index 13755265b2..0cea1ce646 100644 --- a/src/openrct2/actions/BannerSetStyleAction.cpp +++ b/src/openrct2/actions/BannerSetStyleAction.cpp @@ -15,6 +15,7 @@ #include "../management/Finance.h" #include "../windows/Intent.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/tile_element/BannerElement.h" #include "GameAction.h" diff --git a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp index 2421678859..49097e4a28 100644 --- a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp +++ b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp @@ -20,6 +20,7 @@ #include "../object/PathAdditionEntry.h" #include "../world/Footpath.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" #include "../world/tile_element/PathElement.h" diff --git a/src/openrct2/actions/FootpathAdditionRemoveAction.cpp b/src/openrct2/actions/FootpathAdditionRemoveAction.cpp index d1645283d4..ee923dfa25 100644 --- a/src/openrct2/actions/FootpathAdditionRemoveAction.cpp +++ b/src/openrct2/actions/FootpathAdditionRemoveAction.cpp @@ -18,6 +18,7 @@ #include "../management/Finance.h" #include "../world/Footpath.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/tile_element/PathElement.h" diff --git a/src/openrct2/actions/FootpathLayoutPlaceAction.cpp b/src/openrct2/actions/FootpathLayoutPlaceAction.cpp index 7a189db203..12cdff4df3 100644 --- a/src/openrct2/actions/FootpathLayoutPlaceAction.cpp +++ b/src/openrct2/actions/FootpathLayoutPlaceAction.cpp @@ -19,6 +19,7 @@ #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/QuarterTile.h" #include "../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/actions/FootpathPlaceAction.cpp b/src/openrct2/actions/FootpathPlaceAction.cpp index 047e4376e6..ce2777d00e 100644 --- a/src/openrct2/actions/FootpathPlaceAction.cpp +++ b/src/openrct2/actions/FootpathPlaceAction.cpp @@ -23,6 +23,7 @@ #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/QuarterTile.h" #include "../world/Scenery.h" diff --git a/src/openrct2/actions/FootpathRemoveAction.cpp b/src/openrct2/actions/FootpathRemoveAction.cpp index 7e644f6777..056106c0d1 100644 --- a/src/openrct2/actions/FootpathRemoveAction.cpp +++ b/src/openrct2/actions/FootpathRemoveAction.cpp @@ -17,6 +17,7 @@ #include "../management/Finance.h" #include "../world/Footpath.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/tile_element/BannerElement.h" #include "../world/tile_element/PathElement.h" diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 2de84c51fa..b4d468630a 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -26,6 +26,7 @@ #include "../scripting/HookEngine.h" #include "../scripting/ScriptEngine.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index bdaf4bcfc1..cffd12afd6 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -20,6 +20,7 @@ #include "../management/Finance.h" #include "../ride/RideData.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/actions/LandLowerAction.cpp b/src/openrct2/actions/LandLowerAction.cpp index 34360e402f..46046f8db8 100644 --- a/src/openrct2/actions/LandLowerAction.cpp +++ b/src/openrct2/actions/LandLowerAction.cpp @@ -19,6 +19,7 @@ #include "../ride/RideConstruction.h" #include "../ride/RideData.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/actions/LandRaiseAction.cpp b/src/openrct2/actions/LandRaiseAction.cpp index 3898bf3406..60eb3f6e2c 100644 --- a/src/openrct2/actions/LandRaiseAction.cpp +++ b/src/openrct2/actions/LandRaiseAction.cpp @@ -20,6 +20,7 @@ #include "../ride/RideConstruction.h" #include "../ride/RideData.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index bc02e6625d..c2bd14cc9e 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -19,6 +19,7 @@ #include "../windows/Intent.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" #include "../world/TileElementsView.h" diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index 27d1b74774..86a54b39f5 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -20,6 +20,7 @@ #include "../management/Finance.h" #include "../ride/RideData.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" #include "../world/TileElementsView.h" diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index a6dfa1f235..58ee554a46 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -20,6 +20,7 @@ #include "../management/Finance.h" #include "../ride/RideData.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index 273bad98c0..0f60e61193 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -21,6 +21,7 @@ #include "../world/Banner.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/QuarterTile.h" #include "../world/Wall.h" diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index 6244b7e71d..286c15a9ba 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -18,6 +18,7 @@ #include "../management/Finance.h" #include "../object/LargeSceneryEntry.h" #include "../ride/Ride.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/TileElementsView.h" #include "../world/tile_element/LargeSceneryElement.h" diff --git a/src/openrct2/actions/LargeScenerySetColourAction.cpp b/src/openrct2/actions/LargeScenerySetColourAction.cpp index 03fad8e6ef..531b6b2360 100644 --- a/src/openrct2/actions/LargeScenerySetColourAction.cpp +++ b/src/openrct2/actions/LargeScenerySetColourAction.cpp @@ -14,6 +14,7 @@ #include "../OpenRCT2.h" #include "../management/Finance.h" #include "../object/LargeSceneryEntry.h" +#include "../world/Map.h" #include "../world/Scenery.h" #include "../world/tile_element/LargeSceneryElement.h" diff --git a/src/openrct2/actions/MapChangeSizeAction.cpp b/src/openrct2/actions/MapChangeSizeAction.cpp index 8f26677725..2181452be5 100644 --- a/src/openrct2/actions/MapChangeSizeAction.cpp +++ b/src/openrct2/actions/MapChangeSizeAction.cpp @@ -15,6 +15,7 @@ #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index 84d42a1a67..24655150a4 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -16,6 +16,7 @@ #include "../ride/TrackData.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Wall.h" #include "../world/tile_element/SurfaceElement.h" #include "../world/tile_element/TrackElement.h" diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index ee29f25876..dba8c9d744 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -21,6 +21,7 @@ #include "../ride/TrackData.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Wall.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/actions/ParkEntrancePlaceAction.cpp b/src/openrct2/actions/ParkEntrancePlaceAction.cpp index 5eb2a9c473..be281b4fd8 100644 --- a/src/openrct2/actions/ParkEntrancePlaceAction.cpp +++ b/src/openrct2/actions/ParkEntrancePlaceAction.cpp @@ -18,6 +18,7 @@ #include "../world/ConstructionClearance.h" #include "../world/Entrance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/actions/ParkEntranceRemoveAction.cpp b/src/openrct2/actions/ParkEntranceRemoveAction.cpp index 453335e58d..aab588bc51 100644 --- a/src/openrct2/actions/ParkEntranceRemoveAction.cpp +++ b/src/openrct2/actions/ParkEntranceRemoveAction.cpp @@ -14,6 +14,7 @@ #include "../OpenRCT2.h" #include "../management/Finance.h" #include "../world/Entrance.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/actions/PeepSpawnPlaceAction.cpp b/src/openrct2/actions/PeepSpawnPlaceAction.cpp index d751022379..27a6f2eada 100644 --- a/src/openrct2/actions/PeepSpawnPlaceAction.cpp +++ b/src/openrct2/actions/PeepSpawnPlaceAction.cpp @@ -16,6 +16,7 @@ #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp index 92b85d7e55..15b10f7fb9 100644 --- a/src/openrct2/actions/RideDemolishAction.cpp +++ b/src/openrct2/actions/RideDemolishAction.cpp @@ -22,6 +22,7 @@ #include "../ride/RideData.h" #include "../ui/WindowManager.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/TileElementsView.h" #include "../world/tile_element/TrackElement.h" diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index b48eb3961d..8b930bffd8 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -16,6 +16,7 @@ #include "../ride/Ride.h" #include "../ride/Station.h" #include "../world/ConstructionClearance.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Wall.h" #include "../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp index b4cfadcb2c..b50328e488 100644 --- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp @@ -13,6 +13,7 @@ #include "../ride/Ride.h" #include "../ride/Station.h" #include "../world/Entrance.h" +#include "../world/Map.h" #include "../world/TileElementsView.h" #include "../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp index caf8ccee0b..c88ce64a07 100644 --- a/src/openrct2/actions/RideSetAppearanceAction.cpp +++ b/src/openrct2/actions/RideSetAppearanceAction.cpp @@ -17,6 +17,7 @@ #include "../localisation/StringIds.h" #include "../ride/Ride.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/RideSetColourSchemeAction.cpp b/src/openrct2/actions/RideSetColourSchemeAction.cpp index bf113918dd..5e31fad0fb 100644 --- a/src/openrct2/actions/RideSetColourSchemeAction.cpp +++ b/src/openrct2/actions/RideSetColourSchemeAction.cpp @@ -15,6 +15,7 @@ #include "../management/Finance.h" #include "../ride/Ride.h" #include "../ride/RideConstruction.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/RideSetNameAction.cpp b/src/openrct2/actions/RideSetNameAction.cpp index ced2f3727c..fc6fc27f61 100644 --- a/src/openrct2/actions/RideSetNameAction.cpp +++ b/src/openrct2/actions/RideSetNameAction.cpp @@ -17,6 +17,7 @@ #include "../localisation/StringIds.h" #include "../ride/Ride.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/RideSetPriceAction.cpp b/src/openrct2/actions/RideSetPriceAction.cpp index cd63243820..ca60740157 100644 --- a/src/openrct2/actions/RideSetPriceAction.cpp +++ b/src/openrct2/actions/RideSetPriceAction.cpp @@ -19,6 +19,7 @@ #include "../ride/RideManager.hpp" #include "../ride/ShopItem.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index f322b70f78..0e9760c14b 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -16,6 +16,7 @@ #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" namespace OpenRCT2::GameActions { diff --git a/src/openrct2/actions/RideSetStatusAction.cpp b/src/openrct2/actions/RideSetStatusAction.cpp index 1823a7512b..43e2bfc685 100644 --- a/src/openrct2/actions/RideSetStatusAction.cpp +++ b/src/openrct2/actions/RideSetStatusAction.cpp @@ -17,6 +17,7 @@ #include "../management/Finance.h" #include "../ride/Ride.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/RideSetVehicleAction.cpp b/src/openrct2/actions/RideSetVehicleAction.cpp index 621e20b0a4..61953c884c 100644 --- a/src/openrct2/actions/RideSetVehicleAction.cpp +++ b/src/openrct2/actions/RideSetVehicleAction.cpp @@ -22,6 +22,7 @@ #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/Park.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/SignSetNameAction.cpp b/src/openrct2/actions/SignSetNameAction.cpp index dbb209d848..f86b902597 100644 --- a/src/openrct2/actions/SignSetNameAction.cpp +++ b/src/openrct2/actions/SignSetNameAction.cpp @@ -15,6 +15,7 @@ #include "../localisation/StringIds.h" #include "../ride/Ride.h" #include "../world/Banner.h" +#include "../world/Map.h" #include diff --git a/src/openrct2/actions/SignSetStyleAction.cpp b/src/openrct2/actions/SignSetStyleAction.cpp index 103bd72451..96cd91149c 100644 --- a/src/openrct2/actions/SignSetStyleAction.cpp +++ b/src/openrct2/actions/SignSetStyleAction.cpp @@ -16,6 +16,7 @@ #include "../localisation/StringIds.h" #include "../windows/Intent.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/Scenery.h" #include "../world/tile_element/LargeSceneryElement.h" #include "../world/tile_element/WallElement.h" diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index cdc1ebe5f3..54ef9fa025 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -22,6 +22,7 @@ #include "../ride/TrackDesign.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/QuarterTile.h" diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index b425bcbb6c..0a8546559f 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -19,6 +19,7 @@ #include "../object/ObjectEntryManager.h" #include "../object/SmallSceneryEntry.h" #include "../ride/Ride.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/TileElementsView.h" #include "../world/tile_element/SmallSceneryElement.h" diff --git a/src/openrct2/actions/SmallScenerySetColourAction.cpp b/src/openrct2/actions/SmallScenerySetColourAction.cpp index 2b35c05754..ba7638f564 100644 --- a/src/openrct2/actions/SmallScenerySetColourAction.cpp +++ b/src/openrct2/actions/SmallScenerySetColourAction.cpp @@ -18,6 +18,7 @@ #include "../management/Finance.h" #include "../ride/Ride.h" #include "../ride/TrackDesign.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/tile_element/SmallSceneryElement.h" diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 2da9417bbe..23a2649206 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -26,6 +26,7 @@ #include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../world/Entrance.h" +#include "../world/Map.h" #include "../world/Park.h" #include diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp index 2aa14504fe..cb4d0ffb68 100644 --- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp +++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp @@ -14,6 +14,7 @@ #include "../entity/PatrolArea.h" #include "../entity/Peep.h" #include "../entity/Staff.h" +#include "../world/Map.h" namespace OpenRCT2::GameActions { diff --git a/src/openrct2/actions/SurfaceSetStyleAction.cpp b/src/openrct2/actions/SurfaceSetStyleAction.cpp index d44effaaf4..5c359ba6e8 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.cpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.cpp @@ -18,6 +18,7 @@ #include "../object/TerrainEdgeObject.h" #include "../object/TerrainSurfaceObject.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/actions/TileModifyAction.cpp b/src/openrct2/actions/TileModifyAction.cpp index d06eb28adf..496dca62eb 100644 --- a/src/openrct2/actions/TileModifyAction.cpp +++ b/src/openrct2/actions/TileModifyAction.cpp @@ -12,6 +12,7 @@ #include "../Context.h" #include "../Diagnostic.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/TileInspector.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 029777559b..e97ef290d9 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -20,6 +20,7 @@ #include "../ride/TrackDesign.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/QuarterTile.h" #include "../world/Wall.h" diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index a0a7f19171..3945f706ec 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -17,6 +17,7 @@ #include "../ride/TrackData.h" #include "../ride/TrackDesign.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "../world/tile_element/TrackElement.h" #include "RideSetSettingAction.h" diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp index ba042387d7..61539c0bfa 100644 --- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp +++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp @@ -12,6 +12,7 @@ #include "../Diagnostic.h" #include "../management/Finance.h" #include "../ride/RideConstruction.h" +#include "../world/Map.h" #include "../world/tile_element/TrackElement.h" namespace OpenRCT2::GameActions diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 295abf18d8..3f24f53c2f 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -21,6 +21,7 @@ #include "../ride/TrackDesign.h" #include "../world/Banner.h" #include "../world/ConstructionClearance.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Wall.h" #include "../world/tile_element/LargeSceneryElement.h" diff --git a/src/openrct2/actions/WallRemoveAction.cpp b/src/openrct2/actions/WallRemoveAction.cpp index 323e5ed467..b5c929dd5d 100644 --- a/src/openrct2/actions/WallRemoveAction.cpp +++ b/src/openrct2/actions/WallRemoveAction.cpp @@ -16,6 +16,7 @@ #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/TileElementsView.h" #include "../world/tile_element/WallElement.h" diff --git a/src/openrct2/actions/WallSetColourAction.cpp b/src/openrct2/actions/WallSetColourAction.cpp index 754de2971f..43ffcf21f4 100644 --- a/src/openrct2/actions/WallSetColourAction.cpp +++ b/src/openrct2/actions/WallSetColourAction.cpp @@ -17,6 +17,7 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../world/Banner.h" +#include "../world/Map.h" #include "../world/Scenery.h" #include "../world/tile_element/WallElement.h" diff --git a/src/openrct2/actions/WaterLowerAction.cpp b/src/openrct2/actions/WaterLowerAction.cpp index 80b2a27fe0..a267ae0c0e 100644 --- a/src/openrct2/actions/WaterLowerAction.cpp +++ b/src/openrct2/actions/WaterLowerAction.cpp @@ -13,6 +13,7 @@ #include "../OpenRCT2.h" #include "../audio/Audio.h" #include "../ride/RideConstruction.h" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "WaterSetHeightAction.h" diff --git a/src/openrct2/actions/WaterRaiseAction.cpp b/src/openrct2/actions/WaterRaiseAction.cpp index edf8e6814e..9ffafe6eac 100644 --- a/src/openrct2/actions/WaterRaiseAction.cpp +++ b/src/openrct2/actions/WaterRaiseAction.cpp @@ -13,6 +13,7 @@ #include "../OpenRCT2.h" #include "../audio/Audio.h" #include "../ride/RideConstruction.h" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "WaterSetHeightAction.h" diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp index 688f5bfb50..9e564c25e0 100644 --- a/src/openrct2/actions/WaterSetHeightAction.cpp +++ b/src/openrct2/actions/WaterSetHeightAction.cpp @@ -15,6 +15,7 @@ #include "../management/Finance.h" #include "../world/ConstructionClearance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Wall.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index fa6db36456..837306a49f 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -30,6 +30,7 @@ #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../world/Climate.h" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "AudioChannel.h" #include "AudioContext.h" diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 9188ac39bd..25b4dc4753 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -22,7 +22,6 @@ #include "../ride/RideData.h" #include "../ride/Vehicle.h" #include "../util/Util.h" -#include "../world/Map.h" #include "../world/tile_element/TileElement.h" #include "Drawing.h" diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp index 8e30c07315..15ce86e22b 100644 --- a/src/openrct2/entity/Balloon.cpp +++ b/src/openrct2/entity/Balloon.cpp @@ -16,6 +16,7 @@ #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" +#include "../world/Map.h" #include "../world/tile_element/TrackElement.h" #include "EntityRegistry.h" diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp index 0f82511d76..adba2e3cd2 100644 --- a/src/openrct2/entity/Duck.cpp +++ b/src/openrct2/entity/Duck.cpp @@ -18,6 +18,7 @@ #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "EntityRegistry.h" diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index 128ef5b26e..89e51e100e 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -26,6 +26,7 @@ #include "../peep/RideUseSystem.h" #include "../profiling/Profiling.h" #include "../ride/Vehicle.h" +#include "../world/Map.h" #include "Balloon.h" #include "Duck.h" #include "EntityTweener.h" diff --git a/src/openrct2/entity/Particle.cpp b/src/openrct2/entity/Particle.cpp index 7fd3c17565..f0cc4cbe7a 100644 --- a/src/openrct2/entity/Particle.cpp +++ b/src/openrct2/entity/Particle.cpp @@ -15,6 +15,7 @@ #include "../profiling/Profiling.h" #include "../ride/VehicleColour.h" #include "../scenario/Scenario.h" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "EntityRegistry.h" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 5cfabe95db..70336f09a0 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -44,6 +44,7 @@ #include "../windows/Intent.h" #include "../world/Entrance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Scenery.h" #include "../world/tile_element/EntranceElement.h" #include "../world/tile_element/PathElement.h" diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 9e290c1604..8ffb06aab3 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -64,6 +64,7 @@ #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../windows/Intent.h" +#include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" #include "Viewport.h" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 22a6d241ef..23ade513bd 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -37,7 +37,7 @@ #include "../ride/Vehicle.h" #include "../ui/WindowManager.h" #include "../world/Climate.h" -// #include "../world/Map.h" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/tile_element/LargeSceneryElement.h" #include "../world/tile_element/SmallSceneryElement.h" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index bcc36d9889..92a4d9eccd 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -23,6 +23,7 @@ #include "../ride/RideAudio.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "Viewport.h" #include "Widget.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index fcfa8bafc5..b71110b203 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -26,6 +26,7 @@ #include "../ui/WindowManager.h" #include "../windows/Intent.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index ec0b5bac17..9474103c4b 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -23,7 +23,6 @@ #include "../localisation/Localisation.Date.h" #include "../management/Finance.h" #include "../platform/Platform.h" - #include "../world/Map.h" #include "../world/Park.h" #include "Network.h" #include "Socket.h" diff --git a/src/openrct2/paint/Paint.Entity.cpp b/src/openrct2/paint/Paint.Entity.cpp index dcbca1aad2..ab76e5f009 100644 --- a/src/openrct2/paint/Paint.Entity.cpp +++ b/src/openrct2/paint/Paint.Entity.cpp @@ -25,6 +25,7 @@ #include "../ride/TrackDesign.h" #include "../ride/Vehicle.h" #include "../world/Climate.h" +#include "../world/Map.h" #include "../world/Park.h" #include "Paint.h" #include "vehicle/VehiclePaint.h" diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index 41c1ce786a..30cf1c2a27 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -18,6 +18,7 @@ #include "../interface/Viewport.h" #include "../profiling/Profiling.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/TileElementsView.h" #include "../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/paint/support/WoodenSupports.cpp b/src/openrct2/paint/support/WoodenSupports.cpp index 580794b379..3be01ea8b0 100644 --- a/src/openrct2/paint/support/WoodenSupports.cpp +++ b/src/openrct2/paint/support/WoodenSupports.cpp @@ -12,7 +12,6 @@ #include "../../SpriteIds.h" #include "../../interface/Viewport.h" #include "../../ride/TrackData.h" -#include "../../world/Map.h" #include "../../world/tile_element/Slope.h" #include "../Boundbox.h" #include "../Paint.SessionFlags.h" diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index d8b91fb0e9..efeabfcf07 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -24,7 +24,6 @@ #include "../../ride/Ride.h" #include "../../ride/TrackDesign.h" #include "../../world/Banner.h" -#include "../../world/Map.h" #include "../../world/Scenery.h" #include "../../world/TileInspector.h" #include "../../world/tile_element/LargeSceneryElement.h" diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index d8eb3f1f85..04a8b6c238 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -16,7 +16,6 @@ #include "../../object/SmallSceneryEntry.h" #include "../../profiling/Profiling.h" #include "../../ride/TrackDesign.h" -#include "../../world/Map.h" #include "../../world/Scenery.h" #include "../../world/TileInspector.h" #include "../../world/tile_element/SmallSceneryElement.h" diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index f9b961d1b5..7022ae1572 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -27,6 +27,7 @@ #include "../../paint/Paint.h" #include "../../profiling/Profiling.h" #include "../../ride/TrackDesign.h" +#include "../../world/Map.h" #include "../../world/MapSelection.h" #include "../../world/tile_element/Slope.h" #include "../../world/tile_element/SurfaceElement.h" diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index 1718eb7367..aa8f2a514d 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -23,6 +23,7 @@ #include "../../world/Banner.h" #include "../../world/Entrance.h" #include "../../world/Footpath.h" +#include "../../world/Map.h" #include "../../world/MapSelection.h" #include "../../world/Scenery.h" #include "../../world/tile_element/Slope.h" diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 43a30016e9..501d251339 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -22,7 +22,6 @@ #include "../../ride/Track.h" #include "../../ride/TrackDesign.h" #include "../../world/Banner.h" -#include "../../world/Map.h" #include "../../world/Scenery.h" #include "../../world/TileInspector.h" #include "../../world/tile_element/WallElement.h" diff --git a/src/openrct2/paint/track/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/paint/track/coaster/AirPoweredVerticalCoaster.cpp index da25723d9c..45348d609a 100644 --- a/src/openrct2/paint/track/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/paint/track/coaster/AirPoweredVerticalCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/AlpineCoaster.cpp b/src/openrct2/paint/track/coaster/AlpineCoaster.cpp index 9a73d65385..961a4e3c9b 100644 --- a/src/openrct2/paint/track/coaster/AlpineCoaster.cpp +++ b/src/openrct2/paint/track/coaster/AlpineCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/BobsleighCoaster.cpp b/src/openrct2/paint/track/coaster/BobsleighCoaster.cpp index 7dc8b3aa2d..f8d4e3eb6f 100644 --- a/src/openrct2/paint/track/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/paint/track/coaster/BobsleighCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/ClassicWoodenRollerCoaster.cpp b/src/openrct2/paint/track/coaster/ClassicWoodenRollerCoaster.cpp index 29ef1264e5..4c5b0d8e07 100644 --- a/src/openrct2/paint/track/coaster/ClassicWoodenRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/ClassicWoodenRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/CompactInvertedCoaster.cpp b/src/openrct2/paint/track/coaster/CompactInvertedCoaster.cpp index 15b149e86a..2e1d973a48 100644 --- a/src/openrct2/paint/track/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/paint/track/coaster/CompactInvertedCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/paint/track/coaster/CorkscrewRollerCoaster.cpp index 42d246c717..d2301e5ca0 100644 --- a/src/openrct2/paint/track/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/CorkscrewRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/FlyingRollerCoaster.cpp b/src/openrct2/paint/track/coaster/FlyingRollerCoaster.cpp index 7fc998b6a0..4c02e98cd1 100644 --- a/src/openrct2/paint/track/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/FlyingRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/paint/track/coaster/HeartlineTwisterCoaster.cpp index cdf96ebc09..96286a0e3d 100644 --- a/src/openrct2/paint/track/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/paint/track/coaster/HeartlineTwisterCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/HybridCoaster.cpp b/src/openrct2/paint/track/coaster/HybridCoaster.cpp index 9c4a48b0bc..7f1cd836d3 100644 --- a/src/openrct2/paint/track/coaster/HybridCoaster.cpp +++ b/src/openrct2/paint/track/coaster/HybridCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/paint/track/coaster/InvertedHairpinCoaster.cpp index dd362a4701..bc415ec3fc 100644 --- a/src/openrct2/paint/track/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/paint/track/coaster/InvertedHairpinCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/paint/track/coaster/InvertedImpulseCoaster.cpp index aee4ac2b69..80da907f15 100644 --- a/src/openrct2/paint/track/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/paint/track/coaster/InvertedImpulseCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/InvertedRollerCoaster.cpp b/src/openrct2/paint/track/coaster/InvertedRollerCoaster.cpp index 9ce23ab15a..eb790d5519 100644 --- a/src/openrct2/paint/track/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/InvertedRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/JuniorRollerCoaster.cpp b/src/openrct2/paint/track/coaster/JuniorRollerCoaster.cpp index 442f263a49..911ef3a4a6 100644 --- a/src/openrct2/paint/track/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/JuniorRollerCoaster.cpp @@ -14,7 +14,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp b/src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp index 549f5f2be7..68026a54ff 100644 --- a/src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp +++ b/src/openrct2/paint/track/coaster/LatticeTriangleTrack.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp b/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp index b85e76c7c9..06a21d3914 100644 --- a/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp +++ b/src/openrct2/paint/track/coaster/LatticeTriangleTrackAlt.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/LayDownRollerCoasterInverted.cpp b/src/openrct2/paint/track/coaster/LayDownRollerCoasterInverted.cpp index 6bbb8f0712..df61be95b2 100644 --- a/src/openrct2/paint/track/coaster/LayDownRollerCoasterInverted.cpp +++ b/src/openrct2/paint/track/coaster/LayDownRollerCoasterInverted.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp index 72427d1647..732133a98a 100644 --- a/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/LimLaunchedRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/LoopingRollerCoaster.cpp b/src/openrct2/paint/track/coaster/LoopingRollerCoaster.cpp index 11bdd78e12..d11b91e685 100644 --- a/src/openrct2/paint/track/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/LoopingRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/MineRide.cpp b/src/openrct2/paint/track/coaster/MineRide.cpp index 50a1542ec2..b96e4db4a8 100644 --- a/src/openrct2/paint/track/coaster/MineRide.cpp +++ b/src/openrct2/paint/track/coaster/MineRide.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/MineTrainCoaster.cpp b/src/openrct2/paint/track/coaster/MineTrainCoaster.cpp index 247b466521..15120c01e5 100644 --- a/src/openrct2/paint/track/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/paint/track/coaster/MineTrainCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/MiniRollerCoaster.cpp b/src/openrct2/paint/track/coaster/MiniRollerCoaster.cpp index ba53016b55..10aaf8ce74 100644 --- a/src/openrct2/paint/track/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/MiniRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/paint/track/coaster/MiniSuspendedCoaster.cpp index 8abcb1d6df..0eecc1f8e0 100644 --- a/src/openrct2/paint/track/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/paint/track/coaster/MiniSuspendedCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp index b96a1e359f..b1d01b7bb5 100644 --- a/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/MultiDimensionRollerCoaster.cpp @@ -14,7 +14,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/paint/track/coaster/ReverseFreefallCoaster.cpp index 6db30c378d..1d569b0ce8 100644 --- a/src/openrct2/paint/track/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/paint/track/coaster/ReverseFreefallCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/ReverserRollerCoaster.cpp b/src/openrct2/paint/track/coaster/ReverserRollerCoaster.cpp index 4941e0fcd0..45e5f9a065 100644 --- a/src/openrct2/paint/track/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/ReverserRollerCoaster.cpp @@ -14,7 +14,6 @@ #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" #include "../../../ride/Vehicle.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/paint/track/coaster/SideFrictionRollerCoaster.cpp index ca7f4e324a..65aa8c588b 100644 --- a/src/openrct2/paint/track/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/SideFrictionRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/SingleRailRollerCoaster.cpp b/src/openrct2/paint/track/coaster/SingleRailRollerCoaster.cpp index 60c4153fdd..09648e5e49 100644 --- a/src/openrct2/paint/track/coaster/SingleRailRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/SingleRailRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/StandUpRollerCoaster.cpp b/src/openrct2/paint/track/coaster/StandUpRollerCoaster.cpp index 77a9e1c9a6..e26c699a21 100644 --- a/src/openrct2/paint/track/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/StandUpRollerCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/Steeplechase.cpp b/src/openrct2/paint/track/coaster/Steeplechase.cpp index eff7090bd6..797783c161 100644 --- a/src/openrct2/paint/track/coaster/Steeplechase.cpp +++ b/src/openrct2/paint/track/coaster/Steeplechase.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/paint/track/coaster/SuspendedSwingingCoaster.cpp index f6f015c989..5b2c120c2f 100644 --- a/src/openrct2/paint/track/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/paint/track/coaster/SuspendedSwingingCoaster.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/TwisterRollerCoaster.cpp b/src/openrct2/paint/track/coaster/TwisterRollerCoaster.cpp index e192745e17..c6b71ef81e 100644 --- a/src/openrct2/paint/track/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/TwisterRollerCoaster.cpp @@ -15,7 +15,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/coaster/WildMouse.cpp b/src/openrct2/paint/track/coaster/WildMouse.cpp index 6bf913af80..15e7632d4f 100644 --- a/src/openrct2/paint/track/coaster/WildMouse.cpp +++ b/src/openrct2/paint/track/coaster/WildMouse.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp b/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp index afbc88a1c6..51c9fad60a 100644 --- a/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp @@ -16,7 +16,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Boundbox.h" #include "../../Paint.h" diff --git a/src/openrct2/paint/track/coaster/WoodenWildMouse.cpp b/src/openrct2/paint/track/coaster/WoodenWildMouse.cpp index 5d6d9c20de..b4565ee46b 100644 --- a/src/openrct2/paint/track/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/paint/track/coaster/WoodenWildMouse.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.hpp" diff --git a/src/openrct2/paint/track/gentle/CarRide.cpp b/src/openrct2/paint/track/gentle/CarRide.cpp index fa69074c0e..bff64e1489 100644 --- a/src/openrct2/paint/track/gentle/CarRide.cpp +++ b/src/openrct2/paint/track/gentle/CarRide.cpp @@ -11,7 +11,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/gentle/GhostTrain.cpp b/src/openrct2/paint/track/gentle/GhostTrain.cpp index 52df7df781..47841e498f 100644 --- a/src/openrct2/paint/track/gentle/GhostTrain.cpp +++ b/src/openrct2/paint/track/gentle/GhostTrain.cpp @@ -11,7 +11,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/gentle/Maze.cpp b/src/openrct2/paint/track/gentle/Maze.cpp index 5bf306c3d3..b04413a0aa 100644 --- a/src/openrct2/paint/track/gentle/Maze.cpp +++ b/src/openrct2/paint/track/gentle/Maze.cpp @@ -14,7 +14,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/gentle/MiniGolf.cpp b/src/openrct2/paint/track/gentle/MiniGolf.cpp index f997de8044..51fcdcccb3 100644 --- a/src/openrct2/paint/track/gentle/MiniGolf.cpp +++ b/src/openrct2/paint/track/gentle/MiniGolf.cpp @@ -12,7 +12,6 @@ #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" #include "../../../ride/Vehicle.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/Slope.h" #include "../../../world/tile_element/SurfaceElement.h" #include "../../../world/tile_element/TrackElement.h" diff --git a/src/openrct2/paint/track/gentle/MiniHelicopters.cpp b/src/openrct2/paint/track/gentle/MiniHelicopters.cpp index 0aec35cb43..b7ba82cb04 100644 --- a/src/openrct2/paint/track/gentle/MiniHelicopters.cpp +++ b/src/openrct2/paint/track/gentle/MiniHelicopters.cpp @@ -11,7 +11,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/gentle/MonorailCycles.cpp b/src/openrct2/paint/track/gentle/MonorailCycles.cpp index 8db7a987ef..4ba25f2a73 100644 --- a/src/openrct2/paint/track/gentle/MonorailCycles.cpp +++ b/src/openrct2/paint/track/gentle/MonorailCycles.cpp @@ -10,7 +10,6 @@ #include "../../../interface/Viewport.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" #include "../../tile_element/Segment.h" diff --git a/src/openrct2/paint/track/gentle/ObservationTower.cpp b/src/openrct2/paint/track/gentle/ObservationTower.cpp index 03bbc7c403..a6210b34a1 100644 --- a/src/openrct2/paint/track/gentle/ObservationTower.cpp +++ b/src/openrct2/paint/track/gentle/ObservationTower.cpp @@ -12,7 +12,6 @@ #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" #include "../../../ride/Vehicle.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TileElement.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" diff --git a/src/openrct2/paint/track/shops/Facility.cpp b/src/openrct2/paint/track/shops/Facility.cpp index c0026e6416..f33f0ea04b 100644 --- a/src/openrct2/paint/track/shops/Facility.cpp +++ b/src/openrct2/paint/track/shops/Facility.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideEntry.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Boundbox.h" #include "../../Paint.h" diff --git a/src/openrct2/paint/track/shops/Shop.cpp b/src/openrct2/paint/track/shops/Shop.cpp index 825b3eb324..acbaf335a1 100644 --- a/src/openrct2/paint/track/shops/Shop.cpp +++ b/src/openrct2/paint/track/shops/Shop.cpp @@ -13,7 +13,6 @@ #include "../../../ride/RideEntry.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Boundbox.h" #include "../../Paint.h" diff --git a/src/openrct2/paint/track/thrill/GoKarts.cpp b/src/openrct2/paint/track/thrill/GoKarts.cpp index 6a8e7cc3e2..204b72e985 100644 --- a/src/openrct2/paint/track/thrill/GoKarts.cpp +++ b/src/openrct2/paint/track/thrill/GoKarts.cpp @@ -12,7 +12,6 @@ #include "../../../ride/Ride.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/thrill/TopSpin.cpp b/src/openrct2/paint/track/thrill/TopSpin.cpp index 9e0643b053..6fde8a9fd8 100644 --- a/src/openrct2/paint/track/thrill/TopSpin.cpp +++ b/src/openrct2/paint/track/thrill/TopSpin.cpp @@ -14,7 +14,6 @@ #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" #include "../../../ride/Vehicle.h" -#include "../../../world/Map.h" #include "../../Boundbox.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/paint/track/transport/MiniatureRailway.cpp b/src/openrct2/paint/track/transport/MiniatureRailway.cpp index 45436e0992..c556aa07a3 100644 --- a/src/openrct2/paint/track/transport/MiniatureRailway.cpp +++ b/src/openrct2/paint/track/transport/MiniatureRailway.cpp @@ -12,7 +12,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../../world/tile_element/PathElement.h" #include "../../../world/tile_element/TileElement.h" #include "../../../world/tile_element/TrackElement.h" diff --git a/src/openrct2/paint/track/transport/Monorail.cpp b/src/openrct2/paint/track/transport/Monorail.cpp index 3fb0fe1c63..7bebc08ac3 100644 --- a/src/openrct2/paint/track/transport/Monorail.cpp +++ b/src/openrct2/paint/track/transport/Monorail.cpp @@ -12,7 +12,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../Boundbox.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" diff --git a/src/openrct2/paint/track/transport/SuspendedMonorail.cpp b/src/openrct2/paint/track/transport/SuspendedMonorail.cpp index e369ef564f..16b9779fd2 100644 --- a/src/openrct2/paint/track/transport/SuspendedMonorail.cpp +++ b/src/openrct2/paint/track/transport/SuspendedMonorail.cpp @@ -14,7 +14,6 @@ #include "../../../ride/RideData.h" #include "../../../ride/TrackData.h" #include "../../../ride/TrackPaint.h" -#include "../../../world/Map.h" #include "../../Paint.h" #include "../../support/MetalSupports.h" #include "../../tile_element/Paint.TileElement.h" diff --git a/src/openrct2/paint/track/water/RiverRapids.cpp b/src/openrct2/paint/track/water/RiverRapids.cpp index 03d048f9ff..db2393b374 100644 --- a/src/openrct2/paint/track/water/RiverRapids.cpp +++ b/src/openrct2/paint/track/water/RiverRapids.cpp @@ -14,7 +14,6 @@ #include "../../../ride/Track.h" #include "../../../ride/TrackPaint.h" #include "../../../ride/Vehicle.h" -#include "../../../world/Map.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" #include "../../support/WoodenSupports.hpp" diff --git a/src/openrct2/park/ParkPreview.cpp b/src/openrct2/park/ParkPreview.cpp index e43f4bece6..ca88e00911 100644 --- a/src/openrct2/park/ParkPreview.cpp +++ b/src/openrct2/park/ParkPreview.cpp @@ -19,6 +19,7 @@ #include "../interface/Viewport.h" #include "../interface/Window.h" #include "../ride/RideManager.hpp" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "../world/tile_element/TileElement.h" diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 74f34af04d..e7b3690ceb 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -21,6 +21,7 @@ #include "../scenario/Scenario.h" #include "../world/Entrance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/tile_element/BannerElement.h" #include "../world/tile_element/EntranceElement.h" #include "../world/tile_element/PathElement.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 923e9dfac3..8469953740 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -64,6 +64,7 @@ #include "../world/Climate.h" #include "../world/Entrance.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 10d8fa8a2c..b2a7eceb89 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -47,6 +47,7 @@ #include "../scenario/ScenarioSources.h" #include "../world/Climate.h" #include "../world/Entrance.h" +#include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 4654c5c939..ad977d4d81 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -13,6 +13,7 @@ #include "../entity/EntityList.h" #include "../rct12/RCT12.h" #include "../util/Util.h" +#include "../world/Map.h" #include "../world/tile_element/TileElement.h" #include "../world/tile_element/TrackElement.h" #include "Ride.h" diff --git a/src/openrct2/ride/MazeCost.cpp b/src/openrct2/ride/MazeCost.cpp index ed2863aa08..73dbb2f9a6 100644 --- a/src/openrct2/ride/MazeCost.cpp +++ b/src/openrct2/ride/MazeCost.cpp @@ -11,6 +11,7 @@ #include "../core/Money.hpp" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/tile_element/SurfaceElement.h" #include "Ride.h" #include "RideData.h" diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 467f12705e..60d62e6429 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -18,7 +18,6 @@ #include "../object/MusicObject.h" #include "../rct2/DATLimits.h" #include "../rct2/Limits.h" -#include "../world/Map.h" #include "RideColour.h" #include "RideEntry.h" #include "RideRatings.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index c4d47521a7..94c8d32e4e 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -29,6 +29,7 @@ #include "../world/Entrance.h" #include "../world/Footpath.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/ride/RideManager.hpp b/src/openrct2/ride/RideManager.hpp index 7f804e6f78..9c43704a17 100644 --- a/src/openrct2/ride/RideManager.hpp +++ b/src/openrct2/ride/RideManager.hpp @@ -13,6 +13,8 @@ namespace OpenRCT2 { + struct GameState_t; + struct RideManager { private: diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index 8a12faec2d..782c8b4723 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -14,6 +14,7 @@ #include "../entity/Guest.h" #include "../scenario/Scenario.h" #include "../world/Location.hpp" +#include "../world/Map.h" #include "../world/tile_element/TileElement.h" #include "../world/tile_element/TrackElement.h" #include "RideEntry.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 4a94e270e1..8a993ebb42 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -55,6 +55,7 @@ #include "../ride/RideConstruction.h" #include "../sawyer_coding/SawyerCoding.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/MapSelection.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index 87d63238d4..d4d327a510 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -15,7 +15,6 @@ #include "../object/Object.h" #include "../ride/RideColour.h" #include "../ride/Track.h" -#include "../world/Map.h" #include "RideRatings.h" #include "VehicleColour.h" diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 7927d3f875..f18528225f 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -23,6 +23,7 @@ #include "../sawyer_coding/SawyerCoding.h" #include "../windows/Intent.h" #include "../world/Footpath.h" +#include "../world/Map.h" #include "../world/Scenery.h" #include "../world/tile_element/BannerElement.h" #include "../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index fe8203cc36..5b87eb03da 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -26,7 +26,6 @@ #include "../paint/tile_element/Segment.h" #include "../paint/track/Segment.h" #include "../paint/track/Support.h" -#include "../world/Map.h" #include "../world/tile_element/TrackElement.h" #include "RideData.h" #include "Station.h" diff --git a/src/openrct2/scenes/preloader/PreloaderScene.cpp b/src/openrct2/scenes/preloader/PreloaderScene.cpp index 84b4e9f929..db92423a3e 100644 --- a/src/openrct2/scenes/preloader/PreloaderScene.cpp +++ b/src/openrct2/scenes/preloader/PreloaderScene.cpp @@ -19,6 +19,7 @@ #include "../../localisation/StringIds.h" #include "../../ui/WindowManager.h" #include "../../windows/Intent.h" +#include "../../world/Map.h" #include diff --git a/src/openrct2/scenes/title/TitleScene.cpp b/src/openrct2/scenes/title/TitleScene.cpp index be88bcf953..db57a3933a 100644 --- a/src/openrct2/scenes/title/TitleScene.cpp +++ b/src/openrct2/scenes/title/TitleScene.cpp @@ -28,6 +28,7 @@ #include "../../ui/WindowManager.h" #include "../../util/Util.h" #include "../../windows/Intent.h" +#include "../../world/Map.h" #include "TitleSequence.h" #include "TitleSequenceManager.h" #include "TitleSequencePlayer.h" diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index 88eea14914..c24019b3a2 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -16,6 +16,7 @@ #include "../../../object/ObjectManager.h" #include "../../../object/PeepAnimationsObject.h" #include "../../../peep/PeepAnimations.h" + #include "../../../world/Map.h" namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/entity/ScVehicle.cpp b/src/openrct2/scripting/bindings/entity/ScVehicle.cpp index ba32b67f3d..47785d899e 100644 --- a/src/openrct2/scripting/bindings/entity/ScVehicle.cpp +++ b/src/openrct2/scripting/bindings/entity/ScVehicle.cpp @@ -10,6 +10,7 @@ #include "ScVehicle.hpp" #include "../../../ride/TrackData.h" +#include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../ride/ScRide.hpp" diff --git a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp index 93283e907d..b23fe59bc6 100644 --- a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp +++ b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp @@ -14,6 +14,7 @@ #include "../../../Context.h" #include "../../../ride/Ride.h" #include "../../../ride/TrackData.h" + #include "../../../world/Map.h" #include "../../../world/tile_element/TrackElement.h" #include "../../ScriptEngine.h" #include "ScTrackSegment.h" diff --git a/src/openrct2/scripting/bindings/world/ScMap.cpp b/src/openrct2/scripting/bindings/world/ScMap.cpp index 6aa233f5e7..a747969cdd 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.cpp +++ b/src/openrct2/scripting/bindings/world/ScMap.cpp @@ -24,7 +24,6 @@ #include "../../../ride/Ride.h" #include "../../../ride/RideManager.hpp" #include "../../../ride/TrainManager.h" - #include "../../../world/Map.h" #include "../../Duktape.hpp" #include "../entity/ScBalloon.hpp" #include "../entity/ScEntity.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 8e8e9d3729..187d4731de 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -17,6 +17,7 @@ #include "../../../object/LargeSceneryEntry.h" #include "../../../ride/Track.h" #include "../../../world/Footpath.h" + #include "../../../world/Map.h" #include "../../../world/Scenery.h" #include "../../../world/tile_element/LargeSceneryElement.h" #include "../../Duktape.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index 16029eaba8..7c88a296a5 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -20,6 +20,7 @@ #include "../../../ride/RideData.h" #include "../../../ride/Track.h" #include "../../../world/Footpath.h" + #include "../../../world/Map.h" #include "../../../world/Scenery.h" #include "../../../world/tile_element/BannerElement.h" #include "../../../world/tile_element/EntranceElement.h" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index e004fb5e91..02e39e1f71 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -27,6 +27,7 @@ #include "../ride/RideManager.hpp" #include "../ride/Track.h" #include "../windows/Intent.h" +#include "Map.h" #include "MapAnimation.h" #include "Park.h" #include "Scenery.h" diff --git a/src/openrct2/world/ConstructionClearance.cpp b/src/openrct2/world/ConstructionClearance.cpp index 2bd544a6c6..6ed80c96f2 100644 --- a/src/openrct2/world/ConstructionClearance.cpp +++ b/src/openrct2/world/ConstructionClearance.cpp @@ -18,6 +18,7 @@ #include "../openrct2/Cheats.h" #include "../ride/Ride.h" #include "../ride/RideData.h" +#include "Map.h" #include "Park.h" #include "QuarterTile.h" #include "Scenery.h" diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 35921d441f..60eb236d0b 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -27,6 +27,7 @@ #include "../ride/Station.h" #include "../ride/Track.h" #include "Footpath.h" +#include "Map.h" #include "MapAnimation.h" #include "Park.h" #include "tile_element/EntranceElement.h" diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 4cf92a1c91..53cd14c228 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -34,6 +34,7 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "Location.hpp" +#include "Map.h" #include "MapAnimation.h" #include "tile_element/BannerElement.h" #include "tile_element/EntranceElement.h" diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 402db03798..f8d0572ce4 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -19,8 +19,6 @@ constexpr TileCoordsXY kDefaultMapSize = { 150, 150 }; -using PeepSpawn = CoordsXYZD; - namespace OpenRCT2 { struct BannerElement; diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 4f54c4f783..82a05c515b 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -27,6 +27,7 @@ #include "../ride/Track.h" #include "Banner.h" #include "Footpath.h" +#include "Map.h" #include "Scenery.h" #include "tile_element/EntranceElement.h" #include "tile_element/LargeSceneryElement.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index b8333c907c..157bc2ab72 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -39,6 +39,7 @@ #include "../util/Util.h" #include "../windows/Intent.h" #include "Entrance.h" +#include "Map.h" #include "tile_element/EntranceElement.h" #include "tile_element/SurfaceElement.h" diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index a119595d34..da88a76030 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -34,6 +34,7 @@ #include "../object/SmallSceneryEntry.h" #include "../object/WallSceneryEntry.h" #include "Footpath.h" +#include "Map.h" #include "Park.h" #include "tile_element/PathElement.h" #include "tile_element/SmallSceneryElement.h" diff --git a/src/openrct2/world/TileElementsView.h b/src/openrct2/world/TileElementsView.h index bad3931f6d..662a6dcfd0 100644 --- a/src/openrct2/world/TileElementsView.h +++ b/src/openrct2/world/TileElementsView.h @@ -10,6 +10,7 @@ #pragma once #include "Location.hpp" +#include "Map.h" #include diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index bbca5bb6b1..159bfb4bd1 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -20,6 +20,7 @@ #include "Banner.h" #include "Footpath.h" #include "Location.hpp" +#include "Map.h" #include "MapAnimation.h" #include "Park.h" #include "Scenery.h" diff --git a/src/openrct2/world/map_generator/MapGen.cpp b/src/openrct2/world/map_generator/MapGen.cpp index 1253cea75f..e714cc196f 100644 --- a/src/openrct2/world/map_generator/MapGen.cpp +++ b/src/openrct2/world/map_generator/MapGen.cpp @@ -13,6 +13,7 @@ #include "../../GameState.h" #include "../../object/ObjectManager.h" #include "../../util/Util.h" +#include "../Map.h" #include "../tile_element/Slope.h" #include "../tile_element/SurfaceElement.h" #include "HeightMap.hpp" diff --git a/src/openrct2/world/map_generator/MapHelpers.cpp b/src/openrct2/world/map_generator/MapHelpers.cpp index 5592e0c605..7c7d799886 100644 --- a/src/openrct2/world/map_generator/MapHelpers.cpp +++ b/src/openrct2/world/map_generator/MapHelpers.cpp @@ -9,9 +9,9 @@ #include "MapHelpers.h" -#include "../../world/tile_element/Slope.h" -#include "../../world/tile_element/SurfaceElement.h" #include "../Map.h" +#include "../tile_element/Slope.h" +#include "../tile_element/SurfaceElement.h" #include diff --git a/src/openrct2/world/tile_element/TileElement.cpp b/src/openrct2/world/tile_element/TileElement.cpp index 6c7374e67e..65348faf3b 100644 --- a/src/openrct2/world/tile_element/TileElement.cpp +++ b/src/openrct2/world/tile_element/TileElement.cpp @@ -13,7 +13,6 @@ #include "../../core/Guard.hpp" #include "../../interface/WindowClasses.h" #include "../../ui/WindowManager.h" -#include "../Map.h" #include "BannerElement.h" #include "EntranceElement.h" #include "LargeSceneryElement.h"