diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 638b839c41..71cd15a8df 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 39a79f40d6..f071bbca14 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/interface/FileBrowser.cpp b/src/openrct2-ui/interface/FileBrowser.cpp index b092a3dbc2..46856e0d99 100644 --- a/src/openrct2-ui/interface/FileBrowser.cpp +++ b/src/openrct2-ui/interface/FileBrowser.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 7a00fa9115..28c0d83988 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -44,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/scripting/ScTitleSequence.hpp b/src/openrct2-ui/scripting/ScTitleSequence.hpp index ec250d9691..f9d93c9b3a 100644 --- a/src/openrct2-ui/scripting/ScTitleSequence.hpp +++ b/src/openrct2-ui/scripting/ScTitleSequence.hpp @@ -20,7 +20,6 @@ #include #include #include - #include #include #include #include diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index 778a961353..996dcc56c6 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -21,6 +21,7 @@ #include #include #include + #include #include #include #include diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index 81f615bdbb..35473f07cc 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index f9e41f1d77..459f36082a 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -20,8 +20,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index c698032743..c516187801 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index cc1b4aa9fa..d2826d440f 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 80cca31b76..92e5e0ba65 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 7241b9a540..91c58dc090 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 6475d88dfb..f6402228bb 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index ae59f01f06..ceeb63535e 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index aa700f3cdf..cc5b21f7ed 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 215c5b916c..c6a9615279 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index f1c43be154..f863b4abb3 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 25ebf1c61a..869231f773 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -15,7 +15,6 @@ #include "core/DataSerialiser.h" #include "network/Network.h" #include "ride/Ride.h" -#include "scenario/Scenario.h" #include "world/Climate.h" #include "world/Footpath.h" #include "world/Map.h" diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index f122e5c9ee..722c0eaa2f 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -62,7 +62,6 @@ #include "rct2/RCT2.h" #include "ride/TrackData.h" #include "ride/TrackDesignRepository.h" -#include "scenario/Scenario.h" #include "scenario/ScenarioRepository.h" #include "scenes/game/GameScene.h" #include "scenes/intro/IntroScene.h" @@ -73,6 +72,7 @@ #include "scripting/ScriptEngine.h" #include "ui/UiContext.h" #include "ui/WindowManager.h" +#include "world/MapAnimation.h" #include "world/Park.h" #include diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 4bfae5c73e..eb07114ef5 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -38,7 +38,6 @@ #include "object/ObjectRepository.h" #include "peep/PeepAnimations.h" #include "rct1/RCT1.h" -#include "scenario/Scenario.h" #include "ui/WindowManager.h" #include "windows/Intent.h" #include "world/Climate.h" diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index be2090e2a6..2fedbab368 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -16,6 +16,7 @@ #include "GameState.h" #include "OpenRCT2.h" #include "drawing/Drawing.h" +#include "entity/EntityList.h" #include "entity/Guest.h" #include "entity/Staff.h" #include "localisation/Formatter.h" @@ -29,7 +30,6 @@ #include "ride/RideManager.hpp" #include "ride/TrainManager.h" #include "ride/Vehicle.h" -#include "scenario/Scenario.h" #include "windows/Intent.h" #include "world/tile_element/BannerElement.h" #include "world/tile_element/EntranceElement.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 9af209bc11..6173bbe02f 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -32,6 +32,7 @@ #include "core/Path.hpp" #include "core/SawyerCoding.h" #include "core/String.hpp" +#include "entity/EntityList.h" #include "entity/EntityRegistry.h" #include "entity/PatrolArea.h" #include "entity/Peep.h" @@ -56,7 +57,6 @@ #include "ride/Track.h" #include "ride/TrackDesign.h" #include "ride/Vehicle.h" -#include "scenario/Scenario.h" #include "scenes/title/TitleScene.h" #include "scripting/ScriptEngine.h" #include "ui/UiContext.h" diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index bf9a968679..474f8425f2 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -27,6 +27,7 @@ #include "scripting/ScriptEngine.h" #include "ui/UiContext.h" #include "windows/Intent.h" +#include "world/MapAnimation.h" #include "world/Scenery.h" using namespace OpenRCT2::Scripting; diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h index e4c44c7a6e..edef39ddad 100644 --- a/src/openrct2/GameState.h +++ b/src/openrct2/GameState.h @@ -14,6 +14,7 @@ #include "Editor.h" #include "Limits.h" #include "core/EnumUtils.hpp" +#include "entity/EntityRegistry.h" #include "interface/ZoomLevel.h" #include "management/Award.h" #include "management/Finance.h" diff --git a/src/openrct2/ReplayManager.cpp b/src/openrct2/ReplayManager.cpp index f400172e43..cabd433c30 100644 --- a/src/openrct2/ReplayManager.cpp +++ b/src/openrct2/ReplayManager.cpp @@ -34,7 +34,6 @@ #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "park/ParkFile.h" -#include "scenario/Scenario.h" #include "world/Park.h" #include "zlib.h" diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index a0681fb3d5..7e7aad2791 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -18,6 +18,7 @@ #include "../core/String.hpp" #include "../drawing/Drawing.h" #include "../entity/Duck.h" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" #include "../localisation/StringIds.h" @@ -26,7 +27,6 @@ #include "../ride/Ride.h" #include "../ride/RideManager.hpp" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 6a4c0cb79e..c48d111153 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -21,7 +21,6 @@ #include "../network/Network.h" #include "../platform/Platform.h" #include "../profiling/Profiling.h" -#include "../scenario/Scenario.h" #include "../scripting/Duktape.hpp" #include "../scripting/HookEngine.h" #include "../scripting/ScriptEngine.h" diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 69f156f454..62dc1caf47 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -24,7 +24,6 @@ #include "../ride/RideData.h" #include "../ride/ShopItem.h" #include "../ride/Station.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/ScenarioSetSettingAction.cpp b/src/openrct2/actions/ScenarioSetSettingAction.cpp index 27e5f935ae..c816e0d5d4 100644 --- a/src/openrct2/actions/ScenarioSetSettingAction.cpp +++ b/src/openrct2/actions/ScenarioSetSettingAction.cpp @@ -14,7 +14,6 @@ #include "../OpenRCT2.h" #include "../entity/Peep.h" #include "../management/Finance.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/StaffHireNewAction.cpp b/src/openrct2/actions/StaffHireNewAction.cpp index 572afd8daf..3256470b90 100644 --- a/src/openrct2/actions/StaffHireNewAction.cpp +++ b/src/openrct2/actions/StaffHireNewAction.cpp @@ -15,6 +15,7 @@ #include "../GameState.h" #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" #include "../localisation/StringIds.h" @@ -22,7 +23,6 @@ #include "../object/ObjectManager.h" #include "../object/PeepAnimationsObject.h" #include "../ride/Ride.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../world/Entrance.h" #include "../world/Park.h" diff --git a/src/openrct2/command_line/ConvertCommand.cpp b/src/openrct2/command_line/ConvertCommand.cpp index 1013dc538a..1846c50fc1 100644 --- a/src/openrct2/command_line/ConvertCommand.cpp +++ b/src/openrct2/command_line/ConvertCommand.cpp @@ -16,7 +16,6 @@ #include "../core/Path.hpp" #include "../object/ObjectManager.h" #include "../park/ParkFile.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "CommandLine.hpp" diff --git a/src/openrct2/core/SawyerCoding.cpp b/src/openrct2/core/SawyerCoding.cpp index 03d7f1150c..503ed0b69a 100644 --- a/src/openrct2/core/SawyerCoding.cpp +++ b/src/openrct2/core/SawyerCoding.cpp @@ -10,11 +10,12 @@ #include "SawyerCoding.h" #include "../platform/Platform.h" -#include "../scenario/Scenario.h" #include "Numerics.hpp" #include +#include #include +#include #include namespace OpenRCT2::SawyerCoding diff --git a/src/openrct2/drawing/Weather.cpp b/src/openrct2/drawing/Weather.cpp index d675cd2d5a..340b7d76dd 100644 --- a/src/openrct2/drawing/Weather.cpp +++ b/src/openrct2/drawing/Weather.cpp @@ -14,7 +14,6 @@ #include "../config/Config.h" #include "../interface/Viewport.h" #include "../ride/TrackDesign.h" -#include "../scenario/Scenario.h" #include "../ui/UiContext.h" #include "../world/Climate.h" #include "Drawing.h" diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp index 7f230aa456..938344d286 100644 --- a/src/openrct2/entity/Duck.cpp +++ b/src/openrct2/entity/Duck.cpp @@ -13,9 +13,9 @@ #include "../SpriteIds.h" #include "../audio/Audio.h" #include "../core/DataSerialiser.h" +#include "../entity/EntityList.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" -#include "../scenario/Scenario.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 7791b65977..76c83ba2f8 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -19,13 +19,13 @@ #include "../core/Guard.hpp" #include "../core/MemoryStream.h" #include "../core/String.hpp" +#include "../entity/EntityList.h" #include "../entity/Peep.h" #include "../entity/Staff.h" #include "../interface/Viewport.h" #include "../peep/RideUseSystem.h" #include "../profiling/Profiling.h" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "Balloon.h" #include "Duck.h" #include "EntityTweener.h" diff --git a/src/openrct2/entity/Fountain.cpp b/src/openrct2/entity/Fountain.cpp index 5f4b6176b4..98f72e2888 100644 --- a/src/openrct2/entity/Fountain.cpp +++ b/src/openrct2/entity/Fountain.cpp @@ -15,7 +15,6 @@ #include "../object/PathAdditionEntry.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" -#include "../scenario/Scenario.h" #include "../world/Footpath.h" #include "../world/Location.hpp" #include "../world/Map.h" diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 37fe448d7b..425775d7a1 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -22,6 +22,7 @@ #include "../core/Numerics.hpp" #include "../core/String.hpp" #include "../entity/Balloon.h" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/MoneyEffect.h" #include "../entity/Particle.h" @@ -50,7 +51,6 @@ #include "../ride/Station.h" #include "../ride/Track.h" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "../scripting/HookEngine.h" #include "../scripting/ScriptEngine.h" #include "../ui/WindowManager.h" diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 8be6b22e5f..d4946d7016 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -27,6 +27,7 @@ #include "../core/String.hpp" #include "../drawing/LightFX.h" #include "../entity/Balloon.h" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/EntityTweener.h" #include "../interface/Viewport.h" @@ -48,7 +49,6 @@ #include "../ride/ShopItem.h" #include "../ride/Station.h" #include "../ride/Track.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" #include "../world/Climate.h" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 8d354f9976..44ecfea79c 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -18,6 +18,7 @@ #include "../audio/Audio.h" #include "../core/DataSerialiser.h" #include "../core/EnumUtils.hpp" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../interface/Viewport.h" #include "../localisation/StringIds.h" @@ -38,7 +39,6 @@ #include "../ride/Station.h" #include "../ride/Track.h" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "../util/Util.h" #include "../windows/Intent.h" #include "../world/Entrance.h" diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index ef9b61687b..dcb30bd0cc 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -11,13 +11,13 @@ #include "../GameState.h" #include "../config/Config.h" +#include "../entity/EntityList.h" #include "../entity/Guest.h" #include "../localisation/StringIds.h" #include "../profiling/Profiling.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ride/RideManager.hpp" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../world/Park.h" #include "NewsItem.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 8e70a904ee..cd3dd51808 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -14,12 +14,12 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../core/EnumUtils.hpp" +#include "../entity/EntityList.h" #include "../entity/Peep.h" #include "../entity/Staff.h" #include "../profiling/Profiling.h" #include "../ride/Ride.h" #include "../ride/RideManager.hpp" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 7ae376b20e..22d0564d47 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -33,7 +33,6 @@ #include "../ride/RideData.h" #include "../ride/RideEntry.h" #include "../ride/TrackData.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" #include "../world/Park.h" diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 5972692a70..74f17aa59c 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -32,11 +32,11 @@ #include "../localisation/LocalisationService.h" #include "../park/ParkFile.h" #include "../platform/Platform.h" -#include "../scenario/Scenario.h" #include "../scripting/ScriptEngine.h" #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../world/Location.hpp" +#include "../world/MapAnimation.h" #include "Network.h" #include @@ -81,7 +81,6 @@ static constexpr uint32_t kMaxPacketsPerUpdate = 100; #include "../localisation/Localisation.Date.h" #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" - #include "../scenario/Scenario.h" #include "../world/Park.h" #include "NetworkAction.h" #include "NetworkConnection.h" diff --git a/src/openrct2/paint/track/water/RiverRapids.cpp b/src/openrct2/paint/track/water/RiverRapids.cpp index 8c160ccc0e..85eec1da5f 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 "../../../scenario/Scenario.h" #include "../../../world/Map.h" #include "../../Paint.h" #include "../../support/WoodenSupports.h" diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 536dca72a8..aacc65d5d5 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -47,7 +47,6 @@ #include "../ride/RideManager.hpp" #include "../ride/ShopItem.h" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "../scenario/ScenarioRepository.h" #include "../scripting/ScriptEngine.h" #include "../ui/WindowManager.h" diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 7a27c7aa18..bb380a334b 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -18,7 +18,6 @@ #include "../ride/RideData.h" #include "../ride/Station.h" #include "../ride/Track.h" -#include "../scenario/Scenario.h" #include "../world/Entrance.h" #include "../world/Footpath.h" #include "../world/tile_element/BannerElement.h" diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index 86c4ae7361..7c865e427d 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -41,7 +41,6 @@ #include "../interface/Screenshot.h" #include "../object/ObjectManager.h" #include "../park/ParkFile.h" - #include "../scenario/Scenario.h" #include "Platform.h" #define WSZ(x) L"" x diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 1a9741a587..f5415b1a26 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -62,7 +62,6 @@ #include "../ride/Track.h" #include "../ride/TrainManager.h" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "../scenario/ScenarioRepository.h" #include "../scenario/ScenarioSources.h" #include "../world/Climate.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index ef2c1b8ffd..abf261ceec 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -67,7 +67,6 @@ #include "../ride/Track.h" #include "../ride/TrainManager.h" #include "../ride/Vehicle.h" -#include "../scenario/Scenario.h" #include "../scenario/ScenarioRepository.h" #include "../scenario/ScenarioSources.h" #include "../world/Climate.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 21af3a8caa..c802fffc66 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -28,6 +28,7 @@ #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" #include "../core/Numerics.hpp" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/Peep.h" #include "../entity/Staff.h" @@ -46,7 +47,6 @@ #include "../object/StationObject.h" #include "../profiling/Profiling.h" #include "../rct1/RCT1.h" -#include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index 5a45a47ba1..1812afbf48 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -12,7 +12,6 @@ #include "../Game.h" #include "../GameState.h" #include "../entity/Guest.h" -#include "../scenario/Scenario.h" #include "../world/Location.hpp" #include "../world/tile_element/TileElement.h" #include "../world/tile_element/TrackElement.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 58fd847ccc..0006cbb845 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 "../scenario/Scenario.h" #include "../world/Map.h" #include "../world/tile_element/TrackElement.h" #include "RideData.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 24f15441fa..32dbad646d 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -24,6 +24,7 @@ #include "../core/FixedPoint.hpp" #include "../core/Memory.hpp" #include "../core/Speed.hpp" +#include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" #include "../entity/Particle.h" #include "../entity/Yaw.hpp" @@ -36,7 +37,6 @@ #include "../platform/Platform.h" #include "../profiling/Profiling.h" #include "../rct12/RCT12.h" -#include "../scenario/Scenario.h" #include "../scripting/HookEngine.h" #include "../scripting/ScriptEngine.h" #include "../ui/WindowManager.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 2b49f70251..866f7abc5a 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -7,8 +7,6 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "Scenario.h" - #include "../Cheats.h" #include "../Context.h" #include "../Date.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index e6df2f8ec1..53535ab59e 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -9,16 +9,11 @@ #pragma once +#include "../core/Money.hpp" #include "../core/Random.hpp" -#include "../entity/EntityList.h" -#include "../management/Finance.h" -#include "../management/Research.h" -#include "../object/Object.h" +#include "../core/String.hpp" +#include "../localisation/StringIdType.h" #include "../ride/RideRatings.h" -#include "../world/Banner.h" -#include "../world/Climate.h" -#include "../world/Map.h" -#include "../world/MapAnimation.h" struct ResultWithMessage; diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index da04a69f8d..a5e75127e7 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -29,7 +29,7 @@ #include "../rct12/RCT12.h" #include "../rct12/SawyerChunkReader.h" #include "../rct2/RCT2.h" -#include "Scenario.h" +#include "../scenario/Scenario.h" #include "ScenarioSources.h" #include diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h index 8099349477..a78103ac3b 100644 --- a/src/openrct2/scenario/ScenarioRepository.h +++ b/src/openrct2/scenario/ScenarioRepository.h @@ -1,4 +1,3 @@ - /***************************************************************************** * Copyright (c) 2014-2025 OpenRCT2 developers * @@ -11,8 +10,8 @@ #pragma once #include "../core/DateTime.h" +#include "../core/Money.hpp" #include "../core/StringTypes.h" -#include "../scenario/Scenario.h" #include diff --git a/src/openrct2/scenes/title/TitleScene.cpp b/src/openrct2/scenes/title/TitleScene.cpp index 2d756dafbb..58c77c6ca3 100644 --- a/src/openrct2/scenes/title/TitleScene.cpp +++ b/src/openrct2/scenes/title/TitleScene.cpp @@ -23,7 +23,6 @@ #include "../../interface/Viewport.h" #include "../../network/Network.h" #include "../../network/NetworkBase.h" -#include "../../scenario/Scenario.h" #include "../../scenario/ScenarioRepository.h" #include "../../ui/UiContext.h" #include "../../ui/WindowManager.h" diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index ec9eb87896..b72c0f1ad0 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -25,6 +25,7 @@ #include "../../scenario/ScenarioRepository.h" #include "../../scenario/ScenarioSources.h" +#include #include #include #include diff --git a/src/openrct2/scripting/bindings/game/ScContext.hpp b/src/openrct2/scripting/bindings/game/ScContext.hpp index c61d48c657..7cc04ec8a1 100644 --- a/src/openrct2/scripting/bindings/game/ScContext.hpp +++ b/src/openrct2/scripting/bindings/game/ScContext.hpp @@ -16,7 +16,6 @@ #include "../../../interface/Screenshot.h" #include "../../../localisation/Formatting.h" #include "../../../object/ObjectManager.h" - #include "../../../scenario/Scenario.h" #include "../../Duktape.hpp" #include "../../HookEngine.h" #include "../../IconNames.hpp" diff --git a/src/openrct2/scripting/bindings/world/ScScenario.hpp b/src/openrct2/scripting/bindings/world/ScScenario.hpp index 2a772f55db..f4f8da52d4 100644 --- a/src/openrct2/scripting/bindings/world/ScScenario.hpp +++ b/src/openrct2/scripting/bindings/world/ScScenario.hpp @@ -14,7 +14,6 @@ #include "../../../Context.h" #include "../../../GameState.h" #include "../../../core/StringTypes.h" - #include "../../../scenario/Scenario.h" #include "../../../world/Park.h" #include "../../Duktape.hpp" #include "../../ScriptEngine.h" diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 3516e6d3cb..3380170590 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -22,7 +22,6 @@ #include "../core/EnumUtils.hpp" #include "../drawing/Drawing.h" #include "../profiling/Profiling.h" -#include "../scenario/Scenario.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 160f10c93a..dae538fb7a 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -24,6 +24,7 @@ #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" #include "../entity/Duck.h" +#include "../entity/EntityList.h" #include "../entity/EntityTweener.h" #include "../entity/Fountain.h" #include "../entity/PatrolArea.h" @@ -43,7 +44,6 @@ #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../ride/TrackDesign.h" -#include "../scenario/Scenario.h" #include "../windows/Intent.h" #include "../world/TilePointerIndex.hpp" #include "Banner.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 9b8fc31761..8b81916c4f 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -18,6 +18,7 @@ #include "../actions/ParkSetParameterAction.h" #include "../core/Memory.hpp" #include "../core/String.hpp" +#include "../entity/EntityList.h" #include "../entity/Litter.h" #include "../entity/Peep.h" #include "../entity/Staff.h" @@ -32,7 +33,6 @@ #include "../ride/RideData.h" #include "../ride/RideManager.hpp" #include "../ride/ShopItem.h" -#include "../scenario/Scenario.h" #include "../scripting/ScriptEngine.h" #include "../ui/WindowManager.h" #include "../util/Util.h" diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 1cbb9f3b47..8ef8b2e618 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -33,7 +33,6 @@ #include "../object/SceneryGroupObject.h" #include "../object/SmallSceneryEntry.h" #include "../object/WallSceneryEntry.h" -#include "../scenario/Scenario.h" #include "Footpath.h" #include "Map.h" #include "Park.h"