From 7c726e2a0cbf3d7d9c209fc2e101dbda32b9fbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Wed, 24 Nov 2021 16:48:33 +0200 Subject: [PATCH] Fix includes --- src/openrct2-ui/WindowManager.cpp | 2 +- .../interface/ViewportInteraction.cpp | 6 +++--- src/openrct2-ui/interface/Window.cpp | 2 +- src/openrct2-ui/scripting/ScTitleSequence.hpp | 2 +- src/openrct2-ui/title/TitleSequencePlayer.cpp | 2 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffFirePrompt.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 4 ++-- src/openrct2-ui/windows/TitleCommandEditor.cpp | 6 +++--- src/openrct2/Game.cpp | 2 +- src/openrct2/GameState.cpp | 2 +- src/openrct2/GameStateSnapshots.cpp | 16 ++++++++-------- src/openrct2/ParkFile.cpp | 16 ++++++++-------- src/openrct2/ReplayManager.cpp | 4 ++-- src/openrct2/actions/BalloonPressAction.cpp | 4 ++-- src/openrct2/actions/GameAction.cpp | 2 +- src/openrct2/actions/GuestSetFlagsAction.cpp | 2 +- src/openrct2/actions/GuestSetNameAction.cpp | 2 +- src/openrct2/actions/PeepPickupAction.cpp | 2 +- src/openrct2/actions/SetCheatAction.cpp | 4 ++-- src/openrct2/actions/StaffFireAction.cpp | 2 +- src/openrct2/actions/StaffHireNewAction.cpp | 2 +- src/openrct2/actions/StaffSetColourAction.cpp | 2 +- src/openrct2/actions/StaffSetCostumeAction.cpp | 2 +- src/openrct2/actions/StaffSetNameAction.cpp | 2 +- src/openrct2/actions/StaffSetOrdersAction.cpp | 2 +- .../actions/StaffSetPatrolAreaAction.cpp | 2 +- src/openrct2/entity/EntityList.h | 2 +- src/openrct2/entity/Fountain.cpp | 6 +++--- src/openrct2/entity/Fountain.h | 2 +- src/openrct2/entity/Litter.cpp | 2 +- src/openrct2/entity/MoneyEffect.cpp | 2 +- src/openrct2/interface/InteractiveConsole.cpp | 4 ++-- src/openrct2/interface/Viewport.cpp | 2 +- src/openrct2/management/NewsItem.cpp | 2 +- src/openrct2/network/NetworkBase.cpp | 6 +++--- src/openrct2/paint/sprite/Paint.Sprite.cpp | 14 +++++++------- src/openrct2/paint/tile_element/Paint.Path.cpp | 5 +++-- .../paint/tile_element/Paint.Surface.cpp | 2 +- src/openrct2/peep/Guest.cpp | 8 ++++---- src/openrct2/peep/Peep.cpp | 6 +++--- src/openrct2/peep/Peep.h | 2 +- src/openrct2/peep/Staff.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 16 ++++++++-------- src/openrct2/rct2/RCT2.h | 2 +- src/openrct2/rct2/S6Importer.cpp | 18 +++++++++--------- src/openrct2/ride/CableLift.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 6 +++--- src/openrct2/ride/ShopItem.h | 2 +- src/openrct2/ride/Vehicle.cpp | 4 ++-- src/openrct2/ride/Vehicle.h | 2 +- src/openrct2/ride/VehiclePaint.cpp | 2 +- .../ride/coaster/ReverserRollerCoaster.cpp | 2 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 2 +- src/openrct2/ride/gentle/MiniGolf.cpp | 2 +- src/openrct2/ride/gentle/SpaceRings.cpp | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 2 +- .../ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 2 +- src/openrct2/scenario/Scenario.h | 2 +- .../scripting/bindings/entity/ScEntity.hpp | 4 ++-- .../scripting/bindings/world/ScMap.cpp | 14 +++++++------- .../scripting/bindings/world/ScTile.cpp | 2 +- .../scripting/bindings/world/ScTileElement.cpp | 2 +- .../scripting/bindings/world/ScTileElement.hpp | 2 +- src/openrct2/world/Footpath.cpp | 4 ++-- src/openrct2/world/MapAnimation.cpp | 2 +- src/openrct2/world/Park.cpp | 2 +- src/openrct2/world/Scenery.cpp | 2 +- test/tests/PlayTests.cpp | 4 ++-- test/tests/S6ImportExportTests.cpp | 4 ++-- 73 files changed, 141 insertions(+), 140 deletions(-) diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index fdc312becc..1fa73f6dc0 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -18,11 +18,11 @@ #include #include #include +#include #include #include #include #include -#include using namespace OpenRCT2::Ui; diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 6e0c45b47b..d0503d828e 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -24,6 +24,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -32,15 +35,12 @@ #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 5e3774a544..7f213856c4 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -20,11 +20,11 @@ #include #include #include +#include #include #include #include #include -#include using namespace OpenRCT2; diff --git a/src/openrct2-ui/scripting/ScTitleSequence.hpp b/src/openrct2-ui/scripting/ScTitleSequence.hpp index 0d9e80db33..0ea84d6a88 100644 --- a/src/openrct2-ui/scripting/ScTitleSequence.hpp +++ b/src/openrct2-ui/scripting/ScTitleSequence.hpp @@ -16,6 +16,7 @@ # include # include # include +# include # include # include # include @@ -23,7 +24,6 @@ # include # include # include -# include namespace OpenRCT2::Scripting { diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index d0e954a21f..be1fb8b856 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -38,7 +39,6 @@ #include #include #include -#include using namespace OpenRCT2; diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 290557a448..ad2e3bf187 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -13,12 +13,12 @@ #include #include #include +#include #include #include #include #include #include -#include static constexpr const rct_string_id WINDOW_TITLE = STR_RECENT_MESSAGES; static constexpr const int32_t WH = 300; diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index f6d7891805..798001b0a0 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index e229b466d9..650250d521 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -12,10 +12,10 @@ #include #include #include +#include #include #include #include -#include static constexpr const rct_string_id WINDOW_TITLE = STR_SACK_STAFF; static constexpr const int32_t WW = 200; diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 64758ff7f1..4f6793daf7 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -19,16 +19,16 @@ #include #include #include +#include +#include #include #include #include #include #include #include -#include #include #include -#include #include enum diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index ceb9ae605e..bbcd03c636 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -19,6 +19,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -27,9 +30,6 @@ #include #include #include -#include -#include -#include // clang-format off struct TITLE_COMMAND_ORDER { diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 938d384056..b04dc48f86 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -25,6 +25,7 @@ #include "core/Console.hpp" #include "core/FileScanner.h" #include "core/Path.hpp" +#include "entity/Sprite.h" #include "interface/Colour.h" #include "interface/Screenshot.h" #include "interface/Viewport.h" @@ -62,7 +63,6 @@ #include "world/MapAnimation.h" #include "world/Park.h" #include "world/Scenery.h" -#include "world/Sprite.h" #include "world/Surface.h" #include "world/Water.h" diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index a5b540a498..88dcfe67d2 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -19,6 +19,7 @@ #include "ReplayManager.h" #include "actions/GameAction.h" #include "config/Config.h" +#include "entity/Sprite.h" #include "interface/Screenshot.h" #include "localisation/Date.h" #include "localisation/Localisation.h" @@ -37,7 +38,6 @@ #include "world/MapAnimation.h" #include "world/Park.h" #include "world/Scenery.h" -#include "world/Sprite.h" #include #include diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 93325a3fca..3a0b00dbee 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -10,17 +10,17 @@ #include "GameStateSnapshots.h" #include "core/CircularBuffer.h" +#include "entity/Balloon.h" +#include "entity/Duck.h" +#include "entity/EntityList.h" +#include "entity/Fountain.h" +#include "entity/Litter.h" +#include "entity/MoneyEffect.h" +#include "entity/Particle.h" +#include "entity/Sprite.h" #include "peep/Guest.h" #include "peep/Staff.h" #include "ride/Vehicle.h" -#include "world/Balloon.h" -#include "world/Duck.h" -#include "world/EntityList.h" -#include "world/Fountain.h" -#include "world/Litter.h" -#include "world/MoneyEffect.h" -#include "world/Particle.h" -#include "world/Sprite.h" static constexpr size_t MaximumGameStateSnapshots = 32; static constexpr uint32_t InvalidTick = 0xFFFFFFFF; diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index ffbf1ad0fc..7f78bf67e1 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -23,6 +23,14 @@ #include "core/OrcaStream.hpp" #include "core/Path.hpp" #include "drawing/Drawing.h" +#include "entity/Balloon.h" +#include "entity/Duck.h" +#include "entity/EntityList.h" +#include "entity/Fountain.h" +#include "entity/Litter.h" +#include "entity/MoneyEffect.h" +#include "entity/Particle.h" +#include "entity/Sprite.h" #include "interface/Viewport.h" #include "interface/Window.h" #include "localisation/Date.h" @@ -39,18 +47,10 @@ #include "ride/Vehicle.h" #include "scenario/Scenario.h" #include "scenario/ScenarioRepository.h" -#include "world/Balloon.h" #include "world/Climate.h" -#include "world/Duck.h" -#include "world/EntityList.h" #include "world/Entrance.h" -#include "world/Fountain.h" -#include "world/Litter.h" #include "world/Map.h" -#include "world/MoneyEffect.h" #include "world/Park.h" -#include "world/Particle.h" -#include "world/Sprite.h" #include #include diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index 8846137cbc..c6b99bc3f4 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -26,13 +26,13 @@ #include "config/Config.h" #include "core/DataSerialiser.h" #include "core/Path.hpp" +#include "entity/EntityTweener.h" +#include "entity/Sprite.h" #include "management/NewsItem.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "scenario/Scenario.h" -#include "world/EntityTweener.h" #include "world/Park.h" -#include "world/Sprite.h" #include "zlib.h" #include diff --git a/src/openrct2/actions/BalloonPressAction.cpp b/src/openrct2/actions/BalloonPressAction.cpp index 2c3fceafe8..7b8c1da5be 100644 --- a/src/openrct2/actions/BalloonPressAction.cpp +++ b/src/openrct2/actions/BalloonPressAction.cpp @@ -9,8 +9,8 @@ #include "BalloonPressAction.h" -#include "../world/Balloon.h" -#include "../world/Entity.h" +#include "../entity/Balloon.h" +#include "../entity/Entity.h" #include "GameAction.h" BalloonPressAction::BalloonPressAction(uint16_t spriteIndex) diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 686c4942b2..76485058ac 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -14,6 +14,7 @@ #include "../core/Guard.hpp" #include "../core/Memory.hpp" #include "../core/MemoryStream.h" +#include "../entity/MoneyEffect.h" #include "../localisation/Localisation.h" #include "../network/network.h" #include "../platform/platform.h" @@ -23,7 +24,6 @@ #include "../scripting/ScriptEngine.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" -#include "../world/MoneyEffect.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/actions/GuestSetFlagsAction.cpp b/src/openrct2/actions/GuestSetFlagsAction.cpp index de52b37a98..bdb4cb22f8 100644 --- a/src/openrct2/actions/GuestSetFlagsAction.cpp +++ b/src/openrct2/actions/GuestSetFlagsAction.cpp @@ -11,7 +11,7 @@ #include "../Context.h" #include "../OpenRCT2.h" -#include "../world/Entity.h" +#include "../entity/Entity.h" GuestSetFlagsAction::GuestSetFlagsAction(uint16_t peepId, uint32_t flags) : _peepId(peepId) diff --git a/src/openrct2/actions/GuestSetNameAction.cpp b/src/openrct2/actions/GuestSetNameAction.cpp index af9f3769ad..86070d9714 100644 --- a/src/openrct2/actions/GuestSetNameAction.cpp +++ b/src/openrct2/actions/GuestSetNameAction.cpp @@ -13,11 +13,11 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../windows/Intent.h" -#include "../world/Entity.h" #include "../world/Park.h" GuestSetNameAction::GuestSetNameAction(uint16_t spriteIndex, const std::string& name) diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index 9c75fce9e5..ce854fafa3 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -10,10 +10,10 @@ #include "PeepPickupAction.h" #include "../Input.h" +#include "../entity/Entity.h" #include "../network/network.h" #include "../peep/Peep.h" #include "../util/Util.h" -#include "../world/Entity.h" PeepPickupAction::PeepPickupAction(PeepPickupType type, uint32_t spriteId, const CoordsXYZ& loc, NetworkPlayerId_t owner) : _type(type) diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/SetCheatAction.cpp index 4666db5718..5d5c69e0b2 100644 --- a/src/openrct2/actions/SetCheatAction.cpp +++ b/src/openrct2/actions/SetCheatAction.cpp @@ -15,6 +15,8 @@ #include "../config/Config.h" #include "../core/String.hpp" #include "../drawing/Drawing.h" +#include "../entity/Duck.h" +#include "../entity/Sprite.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../network/network.h" @@ -27,13 +29,11 @@ #include "../windows/Intent.h" #include "../world/Banner.h" #include "../world/Climate.h" -#include "../world/Duck.h" #include "../world/Footpath.h" #include "../world/Location.hpp" #include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "ParkSetLoanAction.h" #include "ParkSetParameterAction.h" diff --git a/src/openrct2/actions/StaffFireAction.cpp b/src/openrct2/actions/StaffFireAction.cpp index d0d3917f27..8ece06bdee 100644 --- a/src/openrct2/actions/StaffFireAction.cpp +++ b/src/openrct2/actions/StaffFireAction.cpp @@ -9,9 +9,9 @@ #include "StaffFireAction.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../peep/Staff.h" -#include "../world/Entity.h" StaffFireAction::StaffFireAction(uint16_t spriteId) : _spriteId(spriteId) diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 1758b70c93..c643e1ca69 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -13,6 +13,7 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" +#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" @@ -24,7 +25,6 @@ #include "../ui/WindowManager.h" #include "../world/Entrance.h" #include "../world/Park.h" -#include "../world/Sprite.h" /* rct2: 0x009929FC */ static constexpr const PeepSpriteType spriteTypes[] = { diff --git a/src/openrct2/actions/StaffSetColourAction.cpp b/src/openrct2/actions/StaffSetColourAction.cpp index e4ef8ad7c6..81bb7cd78e 100644 --- a/src/openrct2/actions/StaffSetColourAction.cpp +++ b/src/openrct2/actions/StaffSetColourAction.cpp @@ -12,12 +12,12 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" +#include "../entity/EntityList.h" #include "../localisation/StringIds.h" #include "../peep/Staff.h" #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" -#include "../world/EntityList.h" StaffSetColourAction::StaffSetColourAction(StaffType staffType, uint8_t colour) : _staffType(static_cast(staffType)) diff --git a/src/openrct2/actions/StaffSetCostumeAction.cpp b/src/openrct2/actions/StaffSetCostumeAction.cpp index eb3a09ac7e..b4da89f683 100644 --- a/src/openrct2/actions/StaffSetCostumeAction.cpp +++ b/src/openrct2/actions/StaffSetCostumeAction.cpp @@ -10,11 +10,11 @@ #include "StaffSetCostumeAction.h" #include "../Context.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../windows/Intent.h" -#include "../world/Entity.h" /** rct2: 0x00982134 */ constexpr const bool peep_slow_walking_types[] = { diff --git a/src/openrct2/actions/StaffSetNameAction.cpp b/src/openrct2/actions/StaffSetNameAction.cpp index 2adf8554ca..e20485ec36 100644 --- a/src/openrct2/actions/StaffSetNameAction.cpp +++ b/src/openrct2/actions/StaffSetNameAction.cpp @@ -13,12 +13,12 @@ #include "../Context.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../peep/Staff.h" #include "../windows/Intent.h" -#include "../world/Entity.h" #include "../world/Park.h" StaffSetNameAction::StaffSetNameAction(uint16_t spriteIndex, const std::string& name) diff --git a/src/openrct2/actions/StaffSetOrdersAction.cpp b/src/openrct2/actions/StaffSetOrdersAction.cpp index deb3013ba1..751af768d2 100644 --- a/src/openrct2/actions/StaffSetOrdersAction.cpp +++ b/src/openrct2/actions/StaffSetOrdersAction.cpp @@ -10,12 +10,12 @@ #include "StaffSetOrdersAction.h" #include "../Context.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../peep/Staff.h" #include "../windows/Intent.h" -#include "../world/Entity.h" StaffSetOrdersAction::StaffSetOrdersAction(uint16_t spriteIndex, uint8_t ordersId) : _spriteIndex(spriteIndex) diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp index 49231c99f0..4a5c9fdc65 100644 --- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp +++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp @@ -9,10 +9,10 @@ #include "StaffSetPatrolAreaAction.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../peep/Peep.h" #include "../peep/Staff.h" -#include "../world/Entity.h" StaffSetPatrolAreaAction::StaffSetPatrolAreaAction(uint16_t spriteId, const CoordsXY& loc, const StaffSetPatrolAreaMode mode) : _spriteId(spriteId) diff --git a/src/openrct2/entity/EntityList.h b/src/openrct2/entity/EntityList.h index 60d967aac5..f604398bed 100644 --- a/src/openrct2/entity/EntityList.h +++ b/src/openrct2/entity/EntityList.h @@ -11,9 +11,9 @@ #include "../common.h" #include "../rct12/RCT12.h" +#include "../world/Location.hpp" #include "Entity.h" #include "EntityBase.h" -#include "Location.hpp" #include #include diff --git a/src/openrct2/entity/Fountain.cpp b/src/openrct2/entity/Fountain.cpp index 6da08d9e63..65ebf0862a 100644 --- a/src/openrct2/entity/Fountain.cpp +++ b/src/openrct2/entity/Fountain.cpp @@ -11,9 +11,9 @@ #include "../Game.h" #include "../scenario/Scenario.h" -#include "Footpath.h" -#include "Map.h" -#include "Scenery.h" +#include "../world/Footpath.h" +#include "../world/Map.h" +#include "../world/Scenery.h" #include "Sprite.h" enum class PATTERN diff --git a/src/openrct2/entity/Fountain.h b/src/openrct2/entity/Fountain.h index d8db48780a..06220322ca 100644 --- a/src/openrct2/entity/Fountain.h +++ b/src/openrct2/entity/Fountain.h @@ -10,8 +10,8 @@ #pragma once #include "../common.h" +#include "../world/Map.h" #include "EntityBase.h" -#include "Map.h" class DataSerialiser; diff --git a/src/openrct2/entity/Litter.cpp b/src/openrct2/entity/Litter.cpp index 19b8bb87a8..907a16961e 100644 --- a/src/openrct2/entity/Litter.cpp +++ b/src/openrct2/entity/Litter.cpp @@ -3,8 +3,8 @@ #include "../Cheats.h" #include "../Game.h" #include "../localisation/StringIds.h" +#include "../world/Map.h" #include "EntityList.h" -#include "Map.h" #include "Sprite.h" static bool isLocationLitterable(const CoordsXYZ& mapPos) diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp index aa474fd10e..6fef24af4a 100644 --- a/src/openrct2/entity/MoneyEffect.cpp +++ b/src/openrct2/entity/MoneyEffect.cpp @@ -14,8 +14,8 @@ #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../network/network.h" +#include "../world/Map.h" #include "Entity.h" -#include "Map.h" #include "Sprite.h" static constexpr const CoordsXY _moneyEffectMoveOffset[] = { diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index e16124a409..c68c19fdde 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -28,6 +28,8 @@ #include "../core/String.hpp" #include "../drawing/Drawing.h" #include "../drawing/Font.h" +#include "../entity/EntityList.h" +#include "../entity/Sprite.h" #include "../interface/Chat.h" #include "../interface/Colour.h" #include "../interface/Window_internal.h" @@ -48,10 +50,8 @@ #include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Climate.h" -#include "../world/EntityList.h" #include "../world/Park.h" #include "../world/Scenery.h" -#include "../world/Sprite.h" #include "Viewport.h" #include diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index d1df3bfdb0..f32ac3b20b 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -18,6 +18,7 @@ #include "../core/JobPool.h" #include "../drawing/Drawing.h" #include "../drawing/IDrawingEngine.h" +#include "../entity/EntityList.h" #include "../paint/Paint.h" #include "../peep/Guest.h" #include "../peep/Staff.h" @@ -28,7 +29,6 @@ #include "../ui/WindowManager.h" #include "../util/Math.hpp" #include "../world/Climate.h" -#include "../world/EntityList.h" #include "../world/Map.h" #include "Colour.h" #include "Window.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 14c9654de2..774a46cb55 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -13,6 +13,7 @@ #include "../Input.h" #include "../OpenRCT2.h" #include "../audio/audio.h" +#include "../entity/Entity.h" #include "../interface/Window.h" #include "../interface/Window_internal.h" #include "../localisation/Date.h" @@ -23,7 +24,6 @@ #include "../ride/Vehicle.h" #include "../util/Util.h" #include "../windows/Intent.h" -#include "../world/Entity.h" #include "../world/Location.hpp" News::ItemQueues gNewsItems; diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 8f96dd2e95..0ef4f6105c 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -20,6 +20,9 @@ #include "../actions/PeepPickupAction.h" #include "../core/Guard.hpp" #include "../core/Json.hpp" +#include "../entity/EntityList.h" +#include "../entity/EntityTweener.h" +#include "../entity/Sprite.h" #include "../localisation/Formatting.h" #include "../platform/Platform2.h" #include "../scenario/Scenario.h" @@ -27,10 +30,7 @@ #include "../ui/UiContext.h" #include "../ui/WindowManager.h" #include "../util/SawyerCoding.h" -#include "../world/EntityList.h" -#include "../world/EntityTweener.h" #include "../world/Location.hpp" -#include "../world/Sprite.h" #include "network.h" #include diff --git a/src/openrct2/paint/sprite/Paint.Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp index f85702a72a..dcceb7bfb4 100644 --- a/src/openrct2/paint/sprite/Paint.Sprite.cpp +++ b/src/openrct2/paint/sprite/Paint.Sprite.cpp @@ -11,21 +11,21 @@ #include "../../drawing/Drawing.h" #include "../../drawing/LightFX.h" +#include "../../entity/Balloon.h" +#include "../../entity/Duck.h" +#include "../../entity/EntityList.h" +#include "../../entity/Fountain.h" +#include "../../entity/Litter.h" +#include "../../entity/MoneyEffect.h" +#include "../../entity/Particle.h" #include "../../interface/Viewport.h" #include "../../peep/Staff.h" #include "../../ride/RideData.h" #include "../../ride/TrackDesign.h" #include "../../ride/VehiclePaint.h" -#include "../../world/Balloon.h" #include "../../world/Climate.h" -#include "../../world/Duck.h" -#include "../../world/EntityList.h" -#include "../../world/Fountain.h" -#include "../../world/Litter.h" #include "../../world/MapAnimation.h" -#include "../../world/MoneyEffect.h" #include "../../world/Park.h" -#include "../../world/Particle.h" #include "../Paint.h" /** diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index 33d181772c..c6b8edbeac 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -7,11 +7,14 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include "../Paint.h" + #include "../../Context.h" #include "../../Game.h" #include "../../config/Config.h" #include "../../core/Numerics.hpp" #include "../../drawing/LightFX.h" +#include "../../entity/Entity.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../object/FootpathObject.h" @@ -24,13 +27,11 @@ #include "../../ride/Track.h" #include "../../ride/TrackDesign.h" #include "../../ride/TrackPaint.h" -#include "../../world/Entity.h" #include "../../world/Footpath.h" #include "../../world/Map.h" #include "../../world/Scenery.h" #include "../../world/Surface.h" #include "../../world/TileInspector.h" -#include "../Paint.h" #include "../Supports.h" #include "Paint.Surface.h" #include "Paint.TileElement.h" diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index 5cdecc095b..be4cdf1ad2 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -16,6 +16,7 @@ #include "../../core/Guard.hpp" #include "../../core/Numerics.hpp" #include "../../drawing/Drawing.h" +#include "../../entity/Entity.h" #include "../../interface/Colour.h" #include "../../interface/Viewport.h" #include "../../object/ObjectManager.h" @@ -26,7 +27,6 @@ #include "../../peep/Staff.h" #include "../../ride/TrackDesign.h" #include "../../sprites.h" -#include "../../world/Entity.h" #include "../../world/Surface.h" #include "../../world/TileInspector.h" #include "Paint.TileElement.h" diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 5970e06fb4..c56096b8c0 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -16,6 +16,10 @@ #include "../config/Config.h" #include "../core/Guard.hpp" #include "../core/Numerics.hpp" +#include "../entity/Balloon.h" +#include "../entity/MoneyEffect.h" +#include "../entity/Particle.h" +#include "../entity/Sprite.h" #include "../interface/Window_internal.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" @@ -34,16 +38,12 @@ #include "../scripting/ScriptEngine.h" #include "../util/Math.hpp" #include "../windows/Intent.h" -#include "../world/Balloon.h" #include "../world/Climate.h" #include "../world/Footpath.h" #include "../world/LargeScenery.h" #include "../world/Map.h" -#include "../world/MoneyEffect.h" #include "../world/Park.h" -#include "../world/Particle.h" #include "../world/Scenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "../world/TileElementsView.h" #include "GuestPathfinding.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 3193b8d151..6e94b70040 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -19,6 +19,9 @@ #include "../audio/audio.h" #include "../config/Config.h" #include "../core/Guard.hpp" +#include "../entity/Balloon.h" +#include "../entity/EntityTweener.h" +#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" @@ -34,10 +37,8 @@ #include "../sprites.h" #include "../util/Util.h" #include "../windows/Intent.h" -#include "../world/Balloon.h" #include "../world/Climate.h" #include "../world/ConstructionClearance.h" -#include "../world/EntityTweener.h" #include "../world/Entrance.h" #include "../world/Footpath.h" #include "../world/LargeScenery.h" @@ -45,7 +46,6 @@ #include "../world/Park.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "GuestPathfinding.h" #include "Staff.h" diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index f9b4402b59..ce1890b4c7 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -11,10 +11,10 @@ #include "../Identifiers.h" #include "../common.h" +#include "../entity/EntityBase.h" #include "../ride/RideTypes.h" #include "../ride/Station.h" #include "../util/Util.h" -#include "../world/EntityBase.h" #include "../world/Location.hpp" #include diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 399ec278b6..688b8560a1 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -16,6 +16,7 @@ #include "../actions/StaffSetOrdersAction.h" #include "../audio/audio.h" #include "../config/Config.h" +#include "../entity/Sprite.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -37,7 +38,6 @@ #include "../world/Footpath.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "GuestPathfinding.h" #include "Peep.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index de4f3bff34..3d38fd92ca 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -23,6 +23,14 @@ #include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" +#include "../entity/Balloon.h" +#include "../entity/Duck.h" +#include "../entity/EntityList.h" +#include "../entity/Fountain.h" +#include "../entity/Litter.h" +#include "../entity/MoneyEffect.h" +#include "../entity/Particle.h" +#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -46,22 +54,14 @@ #include "../scenario/ScenarioSources.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" -#include "../world/Balloon.h" #include "../world/Climate.h" -#include "../world/Duck.h" -#include "../world/EntityList.h" #include "../world/Entrance.h" #include "../world/Footpath.h" -#include "../world/Fountain.h" #include "../world/LargeScenery.h" -#include "../world/Litter.h" #include "../world/MapAnimation.h" -#include "../world/MoneyEffect.h" #include "../world/Park.h" -#include "../world/Particle.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "../world/TilePointerIndex.hpp" #include "../world/Wall.h" diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 245398b047..dd55bb2627 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -11,11 +11,11 @@ #include "../common.h" #include "../core/FileSystem.hpp" +#include "../entity/EntityList.h" #include "../object/Object.h" #include "../rct12/RCT12.h" #include "../ride/RideRatings.h" #include "../ride/VehicleColour.h" -#include "../world/EntityList.h" #include #include diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index dc64d651cd..ec6ace5485 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -22,6 +22,15 @@ #include "../core/Path.hpp" #include "../core/Random.hpp" #include "../core/String.hpp" +#include "../entity/Balloon.h" +#include "../entity/Duck.h" +#include "../entity/EntityList.h" +#include "../entity/EntityTweener.h" +#include "../entity/Fountain.h" +#include "../entity/Litter.h" +#include "../entity/MoneyEffect.h" +#include "../entity/Particle.h" +#include "../entity/Sprite.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -54,20 +63,11 @@ #include "../scenario/ScenarioRepository.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" -#include "../world/Balloon.h" #include "../world/Climate.h" -#include "../world/Duck.h" -#include "../world/EntityList.h" -#include "../world/EntityTweener.h" #include "../world/Entrance.h" -#include "../world/Fountain.h" -#include "../world/Litter.h" #include "../world/MapAnimation.h" -#include "../world/MoneyEffect.h" #include "../world/Park.h" -#include "../world/Particle.h" #include "../world/Scenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "../world/TilePointerIndex.hpp" diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 8532e08256..70cdbfebbe 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -10,9 +10,9 @@ #include "CableLift.h" #include "../audio/audio.h" +#include "../entity/EntityList.h" #include "../rct12/RCT12.h" #include "../util/Util.h" -#include "../world/EntityList.h" #include "Ride.h" #include "RideData.h" #include "Track.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index d0200de66e..baccefafd5 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -25,6 +25,7 @@ #include "../core/FixedVector.h" #include "../core/Guard.hpp" #include "../core/Numerics.hpp" +#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -53,7 +54,6 @@ #include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/Scenery.h" -#include "../world/Sprite.h" #include "CableLift.h" #include "RideAudio.h" #include "RideData.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index ef3211f1f0..f4eee0f3ea 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -15,6 +15,9 @@ #include "../actions/RideSetVehicleAction.h" #include "../actions/TrackRemoveAction.h" #include "../common.h" +#include "../entity/Entity.h" +#include "../entity/EntityList.h" +#include "../entity/Sprite.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -27,8 +30,6 @@ #include "../windows/Intent.h" #include "../world/Banner.h" #include "../world/Climate.h" -#include "../world/Entity.h" -#include "../world/EntityList.h" #include "../world/Entrance.h" #include "../world/Footpath.h" #include "../world/Location.hpp" @@ -36,7 +37,6 @@ #include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/Scenery.h" -#include "../world/Sprite.h" #include "Ride.h" #include "RideData.h" #include "Track.h" diff --git a/src/openrct2/ride/ShopItem.h b/src/openrct2/ride/ShopItem.h index 0f9b450f60..e1b42a92aa 100644 --- a/src/openrct2/ride/ShopItem.h +++ b/src/openrct2/ride/ShopItem.h @@ -10,8 +10,8 @@ #pragma once #include "../common.h" +#include "../entity/Litter.h" #include "../util/Util.h" -#include "../world/Litter.h" struct Ride; enum class PeepThoughtType : uint8_t; diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 0e7f1388b5..8ec18d6204 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -18,6 +18,8 @@ #include "../audio/audio.h" #include "../config/Config.h" #include "../core/Memory.hpp" +#include "../entity/Particle.h" +#include "../entity/Sprite.h" #include "../interface/Viewport.h" #include "../localisation/Localisation.h" #include "../management/NewsItem.h" @@ -31,10 +33,8 @@ #include "../world/Map.h" #include "../world/MapAnimation.h" #include "../world/Park.h" -#include "../world/Particle.h" #include "../world/Scenery.h" #include "../world/SmallScenery.h" -#include "../world/Sprite.h" #include "../world/Surface.h" #include "../world/Wall.h" #include "CableLift.h" diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 2146af930d..1fd340808e 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -11,8 +11,8 @@ #include "../audio/audio.h" #include "../common.h" +#include "../entity/EntityBase.h" #include "../ride/RideTypes.h" -#include "../world/EntityBase.h" #include "../world/Location.hpp" #include "Station.h" #include "VehicleColour.h" diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index 84ecc2748d..30715bb3a3 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -12,12 +12,12 @@ #include "../Game.h" #include "../drawing/Drawing.h" #include "../drawing/LightFX.h" +#include "../entity/Entity.h" #include "../interface/Viewport.h" #include "../paint/Paint.h" #include "../paint/sprite/Paint.Sprite.h" #include "../ride/RideData.h" #include "../ride/Vehicle.h" -#include "../world/Entity.h" #include "Track.h" #include diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index aaabb4d2e2..f434207be5 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -8,12 +8,12 @@ *****************************************************************************/ #include "../../drawing/Drawing.h" +#include "../../entity/Entity.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../paint/tile_element/Paint.TileElement.h" #include "../../sprites.h" -#include "../../world/Entity.h" #include "../../world/Map.h" #include "../RideData.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 1e36848b05..a1c44e6456 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -7,11 +7,11 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include "../../entity/Entity.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../peep/Guest.h" -#include "../../world/Entity.h" #include "../Track.h" #include "../TrackPaint.h" #include "../Vehicle.h" diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 81309353fa..3d1d9e83ce 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -8,11 +8,11 @@ *****************************************************************************/ #include "../../config/Config.h" +#include "../../entity/Entity.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../peep/Guest.h" -#include "../../world/Entity.h" #include "../../world/Map.h" #include "../../world/Surface.h" #include "../RideData.h" diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index c00d152c05..19835d7db5 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -8,11 +8,11 @@ *****************************************************************************/ #include "../../common.h" +#include "../../entity/Entity.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../peep/Guest.h" -#include "../../world/Entity.h" #include "../Track.h" #include "../TrackPaint.h" #include "../Vehicle.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 7c8851fb4a..d6d31ad980 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -7,12 +7,12 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ +#include "../../entity/Entity.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../sprites.h" -#include "../../world/Entity.h" #include "../../world/Map.h" #include "../RideData.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 558fd8690f..1f0f89b438 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -8,13 +8,13 @@ *****************************************************************************/ #include "../../drawing/Drawing.h" +#include "../../entity/Sprite.h" #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../paint/tile_element/Paint.TileElement.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 74566fb116..a8582aa635 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -20,6 +20,7 @@ #include "../config/Config.h" #include "../core/Guard.hpp" #include "../core/Random.hpp" +#include "../entity/Duck.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" @@ -43,7 +44,6 @@ #include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Climate.h" -#include "../world/Duck.h" #include "../world/Map.h" #include "../world/Park.h" #include "../world/Scenery.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index b7de2b2c80..1a14621ae1 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -11,6 +11,7 @@ #include "../common.h" #include "../core/Random.hpp" +#include "../entity/EntityList.h" #include "../management/Finance.h" #include "../management/Research.h" #include "../object/Object.h" @@ -18,7 +19,6 @@ #include "../ride/RideRatings.h" #include "../world/Banner.h" #include "../world/Climate.h" -#include "../world/EntityList.h" #include "../world/Map.h" #include "../world/MapAnimation.h" diff --git a/src/openrct2/scripting/bindings/entity/ScEntity.hpp b/src/openrct2/scripting/bindings/entity/ScEntity.hpp index 3877eee64f..3a900aede6 100644 --- a/src/openrct2/scripting/bindings/entity/ScEntity.hpp +++ b/src/openrct2/scripting/bindings/entity/ScEntity.hpp @@ -13,10 +13,10 @@ # include "../../../Context.h" # include "../../../common.h" +# include "../../../entity/EntityList.h" +# include "../../../entity/Sprite.h" # include "../../../peep/Peep.h" # include "../../../util/Util.h" -# include "../../../world/EntityList.h" -# include "../../../world/Sprite.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScMap.cpp b/src/openrct2/scripting/bindings/world/ScMap.cpp index 0a672ad6b1..405b45fb04 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.cpp +++ b/src/openrct2/scripting/bindings/world/ScMap.cpp @@ -12,18 +12,18 @@ # include "ScMap.hpp" # include "../../../common.h" +# include "../../../entity/Balloon.h" +# include "../../../entity/Duck.h" +# include "../../../entity/EntityList.h" +# include "../../../entity/Fountain.h" +# include "../../../entity/Litter.h" +# include "../../../entity/MoneyEffect.h" +# include "../../../entity/Particle.h" # include "../../../peep/Guest.h" # include "../../../peep/Staff.h" # include "../../../ride/Ride.h" # include "../../../ride/TrainManager.h" -# include "../../../world/Balloon.h" -# include "../../../world/Duck.h" -# include "../../../world/EntityList.h" -# include "../../../world/Fountain.h" -# include "../../../world/Litter.h" # include "../../../world/Map.h" -# include "../../../world/MoneyEffect.h" -# include "../../../world/Particle.h" # include "../../Duktape.hpp" # include "../entity/ScEntity.hpp" # include "../entity/ScGuest.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 28d4d2751b..17344dba11 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -14,10 +14,10 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../core/Guard.hpp" +# include "../../../entity/Sprite.h" # include "../../../ride/Track.h" # include "../../../world/Footpath.h" # include "../../../world/Scenery.h" -# include "../../../world/Sprite.h" # include "../../../world/Surface.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index 6605812e97..6033ef5d5e 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -14,10 +14,10 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../core/Guard.hpp" +# include "../../../entity/Sprite.h" # include "../../../ride/Track.h" # include "../../../world/Footpath.h" # include "../../../world/Scenery.h" -# include "../../../world/Sprite.h" # include "../../../world/Surface.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.hpp b/src/openrct2/scripting/bindings/world/ScTileElement.hpp index feca670d5c..586103fa05 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.hpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.hpp @@ -14,10 +14,10 @@ # include "../../../Context.h" # include "../../../common.h" # include "../../../core/Guard.hpp" +# include "../../../entity/Sprite.h" # include "../../../ride/Track.h" # include "../../../world/Footpath.h" # include "../../../world/Scenery.h" -# include "../../../world/Sprite.h" # include "../../../world/Surface.h" # include "../../Duktape.hpp" # include "../../ScriptEngine.h" diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 0e048cedd6..61fb01c0e6 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -15,6 +15,8 @@ #include "../actions/FootpathRemoveAction.h" #include "../actions/LandSetRightsAction.h" #include "../core/Guard.hpp" +#include "../entity/EntityList.h" +#include "../entity/Sprite.h" #include "../interface/Window_internal.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" @@ -30,11 +32,9 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../util/Util.h" -#include "EntityList.h" #include "Map.h" #include "MapAnimation.h" #include "Park.h" -#include "Sprite.h" #include "Surface.h" #include diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index f80a5a5271..8ae4e93391 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -11,6 +11,7 @@ #include "../Context.h" #include "../Game.h" +#include "../entity/EntityList.h" #include "../interface/Viewport.h" #include "../object/StationObject.h" #include "../peep/Peep.h" @@ -19,7 +20,6 @@ #include "../ride/Track.h" #include "../world/Wall.h" #include "Banner.h" -#include "EntityList.h" #include "Footpath.h" #include "LargeScenery.h" #include "Map.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index ddcec0d235..2aa4df84b7 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -19,6 +19,7 @@ #include "../config/Config.h" #include "../core/Memory.hpp" #include "../core/String.hpp" +#include "../entity/Litter.h" #include "../interface/Colour.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" @@ -36,7 +37,6 @@ #include "../util/Util.h" #include "../windows/Intent.h" #include "Entrance.h" -#include "Litter.h" #include "Map.h" #include "Surface.h" diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 278d6cb947..03ba51ebea 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -19,6 +19,7 @@ #include "../actions/SmallSceneryRemoveAction.h" #include "../actions/WallRemoveAction.h" #include "../common.h" +#include "../entity/Fountain.h" #include "../localisation/Localisation.h" #include "../network/network.h" #include "../object/ObjectList.h" @@ -26,7 +27,6 @@ #include "../scenario/Scenario.h" #include "Climate.h" #include "Footpath.h" -#include "Fountain.h" #include "LargeScenery.h" #include "Map.h" #include "Park.h" diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index 8d6bbd9e53..ecbb48e9e9 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -17,15 +17,15 @@ #include #include #include +#include +#include #include #include #include #include -#include #include #include #include -#include #include using namespace OpenRCT2; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 2a8285229b..ab259cfa15 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -25,14 +25,14 @@ #include #include #include +#include +#include #include #include #include #include #include -#include #include -#include #include #include