diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 2ba5bece6752..8d4ff668323c 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -25,13 +25,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/interface/FileBrowser.cpp b/src/openrct2-ui/interface/FileBrowser.cpp index bff761d54e4d..865a81dfece7 100644 --- a/src/openrct2-ui/interface/FileBrowser.cpp +++ b/src/openrct2-ui/interface/FileBrowser.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,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 4dbad2392e2e..fbf8143c2357 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 5121ac6d26c1..e6bba907b1c4 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 8ff2845c75da..25b3421aa34f 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -40,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 1adac93ad832..77cdb3accf21 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -56,7 +57,6 @@ #include #include #include -#include #include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 6c32660e175a..9a5d1e505fad 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -28,6 +28,7 @@ #include "actions/GameAction.h" #include "audio/Audio.h" #include "audio/AudioContext.h" +#include "compatibility/rct2/RCT2.h" #include "config/Config.h" #include "core/Console.hpp" #include "core/File.h" @@ -61,7 +62,6 @@ #include "platform/Crash.h" #include "platform/Platform.h" #include "profiling/Profiling.h" -#include "rct2/RCT2.h" #include "ride/TrackDesignRepository.h" #include "scenario/Scenario.h" #include "scenario/ScenarioRepository.h" diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 16c695f49f9a..6177b31ccb68 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -20,6 +20,7 @@ #include "actions/LandSetRightsAction.h" #include "actions/ResultWithMessage.h" #include "audio/Audio.h" +#include "compatibility/rct1/RCT1.h" #include "core/EnumUtils.hpp" #include "core/Path.hpp" #include "core/String.hpp" @@ -37,7 +38,6 @@ #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "peep/PeepAnimations.h" -#include "rct1/RCT1.h" #include "scenario/Scenario.h" #include "scripting/ScriptEngine.h" #include "ui/WindowManager.h" diff --git a/src/openrct2/FileClassifier.cpp b/src/openrct2/FileClassifier.cpp index e666116c1390..03d0ebafac2e 100644 --- a/src/openrct2/FileClassifier.cpp +++ b/src/openrct2/FileClassifier.cpp @@ -10,13 +10,13 @@ #include "FileClassifier.h" #include "Diagnostic.h" +#include "compatibility/rct2/RCT2.h" #include "core/Console.hpp" #include "core/FileStream.h" #include "core/Memory.hpp" #include "core/Path.hpp" #include "core/String.hpp" #include "park/ParkFile.h" -#include "rct2/RCT2.h" #include "sawyer_coding/SawyerChunkReader.h" #include "sawyer_coding/SawyerCoding.h" #include "scenario/Scenario.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 2952540dfb2c..da18f08e0e3c 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -24,6 +24,7 @@ #include "actions/GameSetSpeedAction.h" #include "actions/LoadOrQuitAction.h" #include "audio/Audio.h" +#include "compatibility/shared/CSStringConverter.h" #include "config/Config.h" #include "core/Console.hpp" #include "core/File.h" @@ -50,7 +51,6 @@ #include "object/ObjectList.h" #include "object/WaterEntry.h" #include "platform/Platform.h" -#include "rct12/CSStringConverter.h" #include "ride/Ride.h" #include "ride/RideRatings.h" #include "ride/Station.h" diff --git a/src/openrct2/Limits.h b/src/openrct2/Limits.h index ed45a66d03f0..96a4cc7fa47c 100644 --- a/src/openrct2/Limits.h +++ b/src/openrct2/Limits.h @@ -9,7 +9,7 @@ #pragma once -#include "rct2/Limits.h" +#include "compatibility/rct2/Limits.h" #include diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index a09781e72913..cdf464d2ef6f 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -9,9 +9,9 @@ #pragma once +#include "compatibility/rct1/Limits.h" #include "drawing/ImageIndexType.h" #include "drawing/ScrollingText.h" -#include "rct1/Limits.h" #include diff --git a/src/openrct2/compatibility/FlagHoldersFwd.h b/src/openrct2/compatibility/FlagHoldersFwd.h new file mode 100644 index 000000000000..7e33a091f423 --- /dev/null +++ b/src/openrct2/compatibility/FlagHoldersFwd.h @@ -0,0 +1,20 @@ +/***************************************************************************** + * Copyright (c) 2014-2026 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#include "../core/FlagHolder.hpp" + +#include + +enum class BannerFlag : uint8_t; // Banner.h +enum class RideInvalidateFlag : uint8_t; // Ride.h + +using BannerFlags = FlagHolder; +using RideInvalidateFlags = FlagHolder; diff --git a/src/openrct2/rct1/Csg.cpp b/src/openrct2/compatibility/rct1/Csg.cpp similarity index 96% rename from src/openrct2/rct1/Csg.cpp rename to src/openrct2/compatibility/rct1/Csg.cpp index 12d14bcee517..71bd3df925b2 100644 --- a/src/openrct2/rct1/Csg.cpp +++ b/src/openrct2/compatibility/rct1/Csg.cpp @@ -9,10 +9,10 @@ #include "Csg.h" -#include "../core/FileStream.h" -#include "../core/Path.hpp" -#include "../drawing/Drawing.h" -#include "../rct1/Limits.h" +#include "../../core/FileStream.h" +#include "../../core/Path.hpp" +#include "../../drawing/Drawing.h" +#include "Limits.h" namespace OpenRCT2 { diff --git a/src/openrct2/rct1/Csg.h b/src/openrct2/compatibility/rct1/Csg.h similarity index 96% rename from src/openrct2/rct1/Csg.h rename to src/openrct2/compatibility/rct1/Csg.h index d96ac8444eb4..972508677a53 100644 --- a/src/openrct2/rct1/Csg.h +++ b/src/openrct2/compatibility/rct1/Csg.h @@ -9,7 +9,7 @@ #pragma once -#include "../core/StringTypes.h" +#include "../../core/StringTypes.h" namespace OpenRCT2 { diff --git a/src/openrct2/rct1/Limits.h b/src/openrct2/compatibility/rct1/Limits.h similarity index 97% rename from src/openrct2/rct1/Limits.h rename to src/openrct2/compatibility/rct1/Limits.h index 5afb75c6180a..be449f86efcc 100644 --- a/src/openrct2/rct1/Limits.h +++ b/src/openrct2/compatibility/rct1/Limits.h @@ -8,7 +8,7 @@ *****************************************************************************/ #pragma once -#include "../rct12/Limits.h" +#include "../shared/Limits.h" namespace OpenRCT2::RCT1::Limits { diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/compatibility/rct1/RCT1.h similarity index 99% rename from src/openrct2/rct1/RCT1.h rename to src/openrct2/compatibility/rct1/RCT1.h index 62329f5ea3c4..973179b45d83 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/compatibility/rct1/RCT1.h @@ -9,11 +9,11 @@ #pragma once -#include "../core/FixedPoint.hpp" -#include "../rct12/RCT12.h" -#include "../ride/Angles.h" -#include "../ride/RideRatings.h" -#include "../world/ParkData.h" +#include "../../core/FixedPoint.hpp" +#include "../../ride/Angles.h" +#include "../../ride/RideRatings.h" +#include "../../world/ParkData.h" +#include "../shared/RCT12.h" #include "Limits.h" enum class MechanicStatus : uint8_t; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/compatibility/rct1/S4Importer.cpp similarity index 98% rename from src/openrct2/rct1/S4Importer.cpp rename to src/openrct2/compatibility/rct1/S4Importer.cpp index b8efe49ab975..b6c1fb42136b 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/compatibility/rct1/S4Importer.cpp @@ -7,74 +7,74 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../Cheats.h" -#include "../Context.h" -#include "../Diagnostic.h" -#include "../Editor.h" -#include "../Game.h" -#include "../GameState.h" -#include "../ParkImporter.h" -#include "../audio/Audio.h" -#include "../core/BitSet.hpp" -#include "../core/Console.hpp" -#include "../core/FileStream.h" -#include "../core/Guard.hpp" -#include "../core/IStream.hpp" -#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/PatrolArea.h" -#include "../entity/Peep.h" -#include "../entity/Staff.h" -#include "../localisation/Formatting.h" -#include "../management/Award.h" -#include "../management/Marketing.h" -#include "../management/NewsItem.h" -#include "../object/ObjectLimits.h" -#include "../object/ObjectList.h" -#include "../object/ObjectManager.h" -#include "../object/ObjectRepository.h" -#include "../object/PeepAnimationsObject.h" -#include "../object/ScenarioMetaObject.h" -#include "../park/Legacy.h" -#include "../peep/RideUseSystem.h" -#include "../rct12/CSStringConverter.h" -#include "../rct12/EntryList.h" -#include "../rct12/ScenarioPatcher.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" -#include "../ride/RideManager.hpp" -#include "../ride/Track.h" -#include "../ride/Vehicle.h" -#include "../sawyer_coding/SawyerCoding.h" -#include "../scenario/Scenario.h" -#include "../scenario/ScenarioObjective.h" -#include "../scenario/ScenarioRepository.h" -#include "../scenario/ScenarioSources.h" -#include "../world/Climate.h" -#include "../world/Map.h" -#include "../world/MapAnimation.h" -#include "../world/Park.h" -#include "../world/Scenery.h" -#include "../world/TilePointerIndex.hpp" -#include "../world/Wall.h" -#include "../world/tile_element/BannerElement.h" -#include "../world/tile_element/EntranceElement.h" -#include "../world/tile_element/LargeSceneryElement.h" -#include "../world/tile_element/PathElement.h" -#include "../world/tile_element/Slope.h" -#include "../world/tile_element/SmallSceneryElement.h" -#include "../world/tile_element/SurfaceElement.h" -#include "../world/tile_element/TileElement.h" -#include "../world/tile_element/TrackElement.h" -#include "../world/tile_element/WallElement.h" +#include "../../Cheats.h" +#include "../../Context.h" +#include "../../Diagnostic.h" +#include "../../Editor.h" +#include "../../Game.h" +#include "../../GameState.h" +#include "../../ParkImporter.h" +#include "../../audio/Audio.h" +#include "../../core/BitSet.hpp" +#include "../../core/Console.hpp" +#include "../../core/FileStream.h" +#include "../../core/Guard.hpp" +#include "../../core/IStream.hpp" +#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/PatrolArea.h" +#include "../../entity/Peep.h" +#include "../../entity/Staff.h" +#include "../../localisation/Formatting.h" +#include "../../management/Award.h" +#include "../../management/Marketing.h" +#include "../../management/NewsItem.h" +#include "../../object/ObjectLimits.h" +#include "../../object/ObjectList.h" +#include "../../object/ObjectManager.h" +#include "../../object/ObjectRepository.h" +#include "../../object/PeepAnimationsObject.h" +#include "../../object/ScenarioMetaObject.h" +#include "../../park/Legacy.h" +#include "../../peep/RideUseSystem.h" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" +#include "../../ride/RideManager.hpp" +#include "../../ride/Track.h" +#include "../../ride/Vehicle.h" +#include "../../sawyer_coding/SawyerCoding.h" +#include "../../scenario/Scenario.h" +#include "../../scenario/ScenarioObjective.h" +#include "../../scenario/ScenarioRepository.h" +#include "../../scenario/ScenarioSources.h" +#include "../../world/Climate.h" +#include "../../world/Map.h" +#include "../../world/MapAnimation.h" +#include "../../world/Park.h" +#include "../../world/Scenery.h" +#include "../../world/TilePointerIndex.hpp" +#include "../../world/Wall.h" +#include "../../world/tile_element/BannerElement.h" +#include "../../world/tile_element/EntranceElement.h" +#include "../../world/tile_element/LargeSceneryElement.h" +#include "../../world/tile_element/PathElement.h" +#include "../../world/tile_element/Slope.h" +#include "../../world/tile_element/SmallSceneryElement.h" +#include "../../world/tile_element/SurfaceElement.h" +#include "../../world/tile_element/TileElement.h" +#include "../../world/tile_element/TrackElement.h" +#include "../../world/tile_element/WallElement.h" +#include "../shared/CSStringConverter.h" +#include "../shared/EntryList.h" +#include "../shared/ScenarioPatcher.h" #include "RCT1.h" #include "Tables.h" diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/compatibility/rct1/T4Importer.cpp similarity index 96% rename from src/openrct2/rct1/T4Importer.cpp rename to src/openrct2/compatibility/rct1/T4Importer.cpp index 4c1a88e558ef..7a576920c435 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/compatibility/rct1/T4Importer.cpp @@ -7,20 +7,20 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../TrackImporter.h" -#include "../config/Config.h" -#include "../core/FileStream.h" -#include "../core/MemoryStream.h" -#include "../core/Path.hpp" -#include "../core/String.hpp" -#include "../rct1/RCT1.h" -#include "../rct1/Tables.h" -#include "../rct12/TD46.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" -#include "../ride/TrackDesign.h" -#include "../ride/TrackDesignRepository.h" -#include "../sawyer_coding/SawyerChunkReader.h" +#include "../../TrackImporter.h" +#include "../../config/Config.h" +#include "../../core/FileStream.h" +#include "../../core/MemoryStream.h" +#include "../../core/Path.hpp" +#include "../../core/String.hpp" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" +#include "../../ride/TrackDesign.h" +#include "../../ride/TrackDesignRepository.h" +#include "../../sawyer_coding/SawyerChunkReader.h" +#include "../shared/TD46.h" +#include "RCT1.h" +#include "Tables.h" #include diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/compatibility/rct1/Tables.cpp similarity index 99% rename from src/openrct2/rct1/Tables.cpp rename to src/openrct2/compatibility/rct1/Tables.cpp index b60b8a61329d..6ef3dbcd8b66 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/compatibility/rct1/Tables.cpp @@ -9,12 +9,12 @@ #include "Tables.h" -#include "../Diagnostic.h" -#include "../core/Guard.hpp" -#include "../interface/Colour.h" -#include "../object/ObjectManager.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" +#include "../../Diagnostic.h" +#include "../../core/Guard.hpp" +#include "../../interface/Colour.h" +#include "../../object/ObjectManager.h" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" #include "RCT1.h" #include diff --git a/src/openrct2/rct1/Tables.h b/src/openrct2/compatibility/rct1/Tables.h similarity index 98% rename from src/openrct2/rct1/Tables.h rename to src/openrct2/compatibility/rct1/Tables.h index 5123aec28d36..c995d15aa8f3 100644 --- a/src/openrct2/rct1/Tables.h +++ b/src/openrct2/compatibility/rct1/Tables.h @@ -9,7 +9,7 @@ #pragma once -#include "../entity/Peep.h" +#include "../../entity/Peep.h" #include "RCT1.h" #include diff --git a/src/openrct2/rct2/DATLimits.h b/src/openrct2/compatibility/rct2/DATLimits.h similarity index 100% rename from src/openrct2/rct2/DATLimits.h rename to src/openrct2/compatibility/rct2/DATLimits.h diff --git a/src/openrct2/rct2/Limits.h b/src/openrct2/compatibility/rct2/Limits.h similarity index 98% rename from src/openrct2/rct2/Limits.h rename to src/openrct2/compatibility/rct2/Limits.h index f49e32c33b9b..c0706e67095b 100644 --- a/src/openrct2/rct2/Limits.h +++ b/src/openrct2/compatibility/rct2/Limits.h @@ -8,7 +8,7 @@ *****************************************************************************/ #pragma once -#include "../rct12/Limits.h" +#include "../shared/Limits.h" namespace OpenRCT2::RCT2::Limits { diff --git a/src/openrct2/rct2/RCT2.cpp b/src/openrct2/compatibility/rct2/RCT2.cpp similarity index 98% rename from src/openrct2/rct2/RCT2.cpp rename to src/openrct2/compatibility/rct2/RCT2.cpp index 647ea6cb9d04..89bdbf59012f 100644 --- a/src/openrct2/rct2/RCT2.cpp +++ b/src/openrct2/compatibility/rct2/RCT2.cpp @@ -9,13 +9,13 @@ #include "RCT2.h" -#include "../Context.h" -#include "../object/Object.h" -#include "../object/ObjectList.h" -#include "../object/ObjectManager.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" -#include "../ride/Track.h" +#include "../../Context.h" +#include "../../object/Object.h" +#include "../../object/ObjectList.h" +#include "../../object/ObjectManager.h" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" +#include "../../ride/Track.h" #include #include diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/compatibility/rct2/RCT2.h similarity index 99% rename from src/openrct2/rct2/RCT2.h rename to src/openrct2/compatibility/rct2/RCT2.h index 1be847398afa..fbad465db20a 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/compatibility/rct2/RCT2.h @@ -9,26 +9,22 @@ #pragma once -#include "../core/FileSystem.hpp" -#include "../core/FixedPoint.hpp" -#include "../rct12/RCT12.h" -#include "../ride/Angles.h" -#include "../ride/RideRatings.h" -#include "../world/ParkData.h" -#include "Limits.h" +#include "../../core/FileSystem.hpp" +#include "../../core/FixedPoint.hpp" +#include "../../ride/Angles.h" +#include "../../ride/RideRatings.h" +#include "../../world/ParkData.h" +#include "../FlagHoldersFwd.h" +#include "../rct2/Limits.h" +#include "../shared/RCT12.h" #include struct RideObjectEntry; enum class EditorStep : uint8_t; enum class MechanicStatus : uint8_t; -enum class RideInvalidateFlag : uint8_t; enum class VehicleColourSettings : uint8_t; -template -struct FlagHolder; -using RideInvalidateFlags = FlagHolder; - namespace OpenRCT2::Scenario { enum class Category : uint8_t; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/compatibility/rct2/S6Importer.cpp similarity index 98% rename from src/openrct2/rct2/S6Importer.cpp rename to src/openrct2/compatibility/rct2/S6Importer.cpp index d1570a0dd326..dd38dcb9b889 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/compatibility/rct2/S6Importer.cpp @@ -7,59 +7,59 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../Context.h" -#include "../Diagnostic.h" -#include "../Game.h" -#include "../GameState.h" -#include "../ParkImporter.h" -#include "../core/FileStream.h" -#include "../core/Path.hpp" -#include "../core/String.hpp" -#include "../entity/Balloon.h" -#include "../entity/Duck.h" -#include "../entity/Fountain.h" -#include "../entity/Guest.h" -#include "../entity/Litter.h" -#include "../entity/MoneyEffect.h" -#include "../entity/Particle.h" -#include "../entity/PatrolArea.h" -#include "../entity/Staff.h" -#include "../localisation/Formatting.h" -#include "../object/ObjectList.h" -#include "../object/ObjectManager.h" -#include "../object/ObjectRepository.h" -#include "../object/ScenarioMetaObject.h" -#include "../park/Legacy.h" -#include "../park/ParkPreview.h" -#include "../peep/RideUseSystem.h" -#include "../rct12/CSStringConverter.h" -#include "../rct12/EntryList.h" -#include "../rct12/RCT12.h" -#include "../rct12/ScenarioPatcher.h" +#include "../../Context.h" +#include "../../Diagnostic.h" +#include "../../Game.h" +#include "../../GameState.h" +#include "../../ParkImporter.h" +#include "../../core/FileStream.h" +#include "../../core/Path.hpp" +#include "../../core/String.hpp" +#include "../../entity/Balloon.h" +#include "../../entity/Duck.h" +#include "../../entity/Fountain.h" +#include "../../entity/Guest.h" +#include "../../entity/Litter.h" +#include "../../entity/MoneyEffect.h" +#include "../../entity/Particle.h" +#include "../../entity/PatrolArea.h" +#include "../../entity/Staff.h" +#include "../../localisation/Formatting.h" +#include "../../object/ObjectList.h" +#include "../../object/ObjectManager.h" +#include "../../object/ObjectRepository.h" +#include "../../object/ScenarioMetaObject.h" +#include "../../park/Legacy.h" +#include "../../park/ParkPreview.h" +#include "../../peep/RideUseSystem.h" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" +#include "../../ride/Vehicle.h" +#include "../../sawyer_coding/SawyerChunkReader.h" +#include "../../scenario/Scenario.h" +#include "../../scenario/ScenarioRepository.h" +#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" +#include "../../world/TilePointerIndex.hpp" +#include "../../world/tile_element/BannerElement.h" +#include "../../world/tile_element/EntranceElement.h" +#include "../../world/tile_element/LargeSceneryElement.h" +#include "../../world/tile_element/PathElement.h" +#include "../../world/tile_element/SmallSceneryElement.h" +#include "../../world/tile_element/SurfaceElement.h" +#include "../../world/tile_element/TileElement.h" +#include "../../world/tile_element/TrackElement.h" +#include "../../world/tile_element/WallElement.h" #include "../rct2/RCT2.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" -#include "../ride/Vehicle.h" -#include "../sawyer_coding/SawyerChunkReader.h" -#include "../scenario/Scenario.h" -#include "../scenario/ScenarioRepository.h" -#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" -#include "../world/TilePointerIndex.hpp" -#include "../world/tile_element/BannerElement.h" -#include "../world/tile_element/EntranceElement.h" -#include "../world/tile_element/LargeSceneryElement.h" -#include "../world/tile_element/PathElement.h" -#include "../world/tile_element/SmallSceneryElement.h" -#include "../world/tile_element/SurfaceElement.h" -#include "../world/tile_element/TileElement.h" -#include "../world/tile_element/TrackElement.h" -#include "../world/tile_element/WallElement.h" +#include "../shared/CSStringConverter.h" +#include "../shared/EntryList.h" +#include "../shared/RCT12.h" +#include "../shared/ScenarioPatcher.h" #include diff --git a/src/openrct2/rct2/SeaDecrypt.cpp b/src/openrct2/compatibility/rct2/SeaDecrypt.cpp similarity index 95% rename from src/openrct2/rct2/SeaDecrypt.cpp rename to src/openrct2/compatibility/rct2/SeaDecrypt.cpp index de63c5370c06..8d8774dc38eb 100644 --- a/src/openrct2/rct2/SeaDecrypt.cpp +++ b/src/openrct2/compatibility/rct2/SeaDecrypt.cpp @@ -7,10 +7,10 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../core/File.h" -#include "../core/Numerics.hpp" -#include "../core/Path.hpp" -#include "RCT2.h" +#include "../../core/File.h" +#include "../../core/Numerics.hpp" +#include "../../core/Path.hpp" +#include "../rct2/RCT2.h" #include #include diff --git a/src/openrct2/rct2/T6Exporter.cpp b/src/openrct2/compatibility/rct2/T6Exporter.cpp similarity index 94% rename from src/openrct2/rct2/T6Exporter.cpp rename to src/openrct2/compatibility/rct2/T6Exporter.cpp index 3b63eee8573f..73aee0fcf519 100644 --- a/src/openrct2/rct2/T6Exporter.cpp +++ b/src/openrct2/compatibility/rct2/T6Exporter.cpp @@ -9,23 +9,23 @@ #include "T6Exporter.h" -#include "../Context.h" -#include "../Diagnostic.h" -#include "../core/FileStream.h" -#include "../core/MemoryStream.h" -#include "../localisation/StringIds.h" -#include "../object/ObjectList.h" -#include "../rct12/TD46.h" +#include "../../Context.h" +#include "../../Diagnostic.h" +#include "../../core/FileStream.h" +#include "../../core/MemoryStream.h" +#include "../../localisation/StringIds.h" +#include "../../object/ObjectList.h" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" +#include "../../ride/Station.h" +#include "../../ride/Track.h" +#include "../../ride/TrackData.h" +#include "../../ride/TrackDesign.h" +#include "../../ride/TrackDesignRepository.h" +#include "../../sawyer_coding/SawyerChunkWriter.h" +#include "../../windows/Intent.h" #include "../rct2/RCT2.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" -#include "../ride/Station.h" -#include "../ride/Track.h" -#include "../ride/TrackData.h" -#include "../ride/TrackDesign.h" -#include "../ride/TrackDesignRepository.h" -#include "../sawyer_coding/SawyerChunkWriter.h" -#include "../windows/Intent.h" +#include "../shared/TD46.h" #include diff --git a/src/openrct2/rct2/T6Exporter.h b/src/openrct2/compatibility/rct2/T6Exporter.h similarity index 96% rename from src/openrct2/rct2/T6Exporter.h rename to src/openrct2/compatibility/rct2/T6Exporter.h index edc29697b47f..89737e2699ef 100644 --- a/src/openrct2/rct2/T6Exporter.h +++ b/src/openrct2/compatibility/rct2/T6Exporter.h @@ -9,7 +9,7 @@ #pragma once -#include "../ride/TrackDesign.h" +#include "../../ride/TrackDesign.h" #include diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/compatibility/rct2/T6Importer.cpp similarity index 95% rename from src/openrct2/rct2/T6Importer.cpp rename to src/openrct2/compatibility/rct2/T6Importer.cpp index 178ffb4c0dd3..f60691624d24 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/compatibility/rct2/T6Importer.cpp @@ -7,21 +7,21 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../Diagnostic.h" -#include "../TrackImporter.h" -#include "../core/FileStream.h" -#include "../core/MemoryStream.h" -#include "../core/Path.hpp" -#include "../core/String.hpp" -#include "../object/ObjectRepository.h" -#include "../object/RideObject.h" -#include "../rct12/TD46.h" +#include "../../Diagnostic.h" +#include "../../TrackImporter.h" +#include "../../core/FileStream.h" +#include "../../core/MemoryStream.h" +#include "../../core/Path.hpp" +#include "../../core/String.hpp" +#include "../../object/ObjectRepository.h" +#include "../../object/RideObject.h" +#include "../../ride/Ride.h" +#include "../../ride/RideData.h" +#include "../../ride/TrackDesign.h" +#include "../../ride/TrackDesignRepository.h" +#include "../../sawyer_coding/SawyerChunkReader.h" #include "../rct2/RCT2.h" -#include "../ride/Ride.h" -#include "../ride/RideData.h" -#include "../ride/TrackDesign.h" -#include "../ride/TrackDesignRepository.h" -#include "../sawyer_coding/SawyerChunkReader.h" +#include "../shared/TD46.h" #include diff --git a/src/openrct2/rct12/CSChar.h b/src/openrct2/compatibility/shared/CSChar.h similarity index 100% rename from src/openrct2/rct12/CSChar.h rename to src/openrct2/compatibility/shared/CSChar.h diff --git a/src/openrct2/rct12/CSStringConverter.cpp b/src/openrct2/compatibility/shared/CSStringConverter.cpp similarity index 97% rename from src/openrct2/rct12/CSStringConverter.cpp rename to src/openrct2/compatibility/shared/CSStringConverter.cpp index 8f967e4d8d34..991a4f145f1f 100644 --- a/src/openrct2/rct12/CSStringConverter.cpp +++ b/src/openrct2/compatibility/shared/CSStringConverter.cpp @@ -9,11 +9,11 @@ #include "CSStringConverter.h" -#include "../core/String.hpp" -#include "../core/UnicodeChar.h" -#include "../localisation/FormatCodes.h" -#include "../localisation/Language.h" -#include "../rct12/CSChar.h" +#include "../../core/String.hpp" +#include "../../core/UnicodeChar.h" +#include "../../localisation/FormatCodes.h" +#include "../../localisation/Language.h" +#include "CSChar.h" #include #include diff --git a/src/openrct2/rct12/CSStringConverter.h b/src/openrct2/compatibility/shared/CSStringConverter.h similarity index 100% rename from src/openrct2/rct12/CSStringConverter.h rename to src/openrct2/compatibility/shared/CSStringConverter.h diff --git a/src/openrct2/rct12/EntryList.h b/src/openrct2/compatibility/shared/EntryList.h similarity index 100% rename from src/openrct2/rct12/EntryList.h rename to src/openrct2/compatibility/shared/EntryList.h diff --git a/src/openrct2/rct12/Limits.h b/src/openrct2/compatibility/shared/Limits.h similarity index 100% rename from src/openrct2/rct12/Limits.h rename to src/openrct2/compatibility/shared/Limits.h diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/compatibility/shared/RCT12.cpp similarity index 97% rename from src/openrct2/rct12/RCT12.cpp rename to src/openrct2/compatibility/shared/RCT12.cpp index fdc9f1845d93..5084ca748ad4 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/compatibility/shared/RCT12.cpp @@ -9,23 +9,23 @@ #include "RCT12.h" -#include "../core/CodepointView.hpp" -#include "../core/String.hpp" -#include "../localisation/Formatting.h" -#include "../object/ObjectList.h" +#include "../../core/CodepointView.hpp" +#include "../../core/String.hpp" +#include "../../localisation/Formatting.h" +#include "../../object/ObjectList.h" +#include "../../ride/Ride.h" +#include "../../scenario/Scenario.h" +#include "../../world/Banner.h" +#include "../../world/Footpath.h" +#include "../../world/Wall.h" +#include "../../world/tile_element/PathElement.h" +#include "../../world/tile_element/Slope.h" +#include "../../world/tile_element/SmallSceneryElement.h" +#include "../../world/tile_element/SurfaceElement.h" +#include "../../world/tile_element/WallElement.h" #include "../rct1/Tables.h" -#include "../rct12/CSStringConverter.h" #include "../rct2/RCT2.h" -#include "../ride/Ride.h" -#include "../scenario/Scenario.h" -#include "../world/Banner.h" -#include "../world/Footpath.h" -#include "../world/Wall.h" -#include "../world/tile_element/PathElement.h" -#include "../world/tile_element/Slope.h" -#include "../world/tile_element/SmallSceneryElement.h" -#include "../world/tile_element/SurfaceElement.h" -#include "../world/tile_element/WallElement.h" +#include "CSStringConverter.h" #include "EntryList.h" using namespace OpenRCT2; diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/compatibility/shared/RCT12.h similarity index 99% rename from src/openrct2/rct12/RCT12.h rename to src/openrct2/compatibility/shared/RCT12.h index 05fc284e6665..ed3209261c5c 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/compatibility/shared/RCT12.h @@ -11,14 +11,13 @@ // Structures shared between both RCT1 and RCT2. -#include "../core/EnumUtils.hpp" -#include "../core/FlagHolder.hpp" -#include "../core/Money.hpp" -#include "../entity/Fountain.h" -#include "../management/Research.h" -#include "../object/Object.h" -#include "../ride/RideTypes.h" -#include "../world/tile_element/TileElementType.h" +#include "../../core/Money.hpp" +#include "../../entity/Fountain.h" +#include "../../management/Research.h" +#include "../../object/Object.h" +#include "../../ride/RideTypes.h" +#include "../../world/tile_element/TileElementType.h" +#include "../FlagHoldersFwd.h" #include "Limits.h" #include @@ -382,8 +381,6 @@ constexpr uint8_t kRCT12InversionAndHoleMask = 0b00011111; constexpr uint8_t kRCT12RideNumDropsMask = 0b00111111; enum class RideColourScheme : uint8_t; -enum class BannerFlag : uint8_t; -using BannerFlags = FlagHolder; enum { diff --git a/src/openrct2/rct12/ScenarioPatcher.cpp b/src/openrct2/compatibility/shared/ScenarioPatcher.cpp similarity index 95% rename from src/openrct2/rct12/ScenarioPatcher.cpp rename to src/openrct2/compatibility/shared/ScenarioPatcher.cpp index 5fece06eb135..7709a1d5cdbb 100644 --- a/src/openrct2/rct12/ScenarioPatcher.cpp +++ b/src/openrct2/compatibility/shared/ScenarioPatcher.cpp @@ -9,37 +9,37 @@ #include "ScenarioPatcher.h" -#include "../Context.h" -#include "../Game.h" -#include "../PlatformEnvironment.h" -#include "../actions/FootpathPlaceAction.h" -#include "../actions/GameActionResult.h" -#include "../core/File.h" -#include "../core/Guard.hpp" -#include "../core/Json.hpp" -#include "../core/Path.hpp" -#include "../core/String.hpp" -#include "../entity/EntityList.h" -#include "../entity/Guest.h" -#include "../entity/Peep.h" -#include "../object/ObjectManager.h" -#include "../ride/Ride.h" -#include "../ride/Track.h" -#include "../world/Footpath.h" -#include "../world/Location.hpp" -#include "../world/Map.h" -#include "../world/tile_element/EntranceElement.h" -#include "../world/tile_element/PathElement.h" -#include "../world/tile_element/Slope.h" -#include "../world/tile_element/SurfaceElement.h" -#include "../world/tile_element/TileElement.h" -#include "../world/tile_element/TileElementType.h" -#include "../world/tile_element/TrackElement.h" +#include "../../Context.h" +#include "../../Game.h" +#include "../../PlatformEnvironment.h" +#include "../../actions/FootpathPlaceAction.h" +#include "../../actions/GameActionResult.h" +#include "../../core/File.h" +#include "../../core/Guard.hpp" +#include "../../core/Json.hpp" +#include "../../core/Path.hpp" +#include "../../core/String.hpp" +#include "../../entity/EntityList.h" +#include "../../entity/Guest.h" +#include "../../entity/Peep.h" +#include "../../object/ObjectManager.h" +#include "../../ride/Ride.h" +#include "../../ride/Track.h" +#include "../../world/Footpath.h" +#include "../../world/Location.hpp" +#include "../../world/Map.h" +#include "../../world/tile_element/EntranceElement.h" +#include "../../world/tile_element/PathElement.h" +#include "../../world/tile_element/Slope.h" +#include "../../world/tile_element/SurfaceElement.h" +#include "../../world/tile_element/TileElement.h" +#include "../../world/tile_element/TileElementType.h" +#include "../../world/tile_element/TrackElement.h" #ifdef DISABLE_NETWORK #include #else - #include "../core/Crypt.h" + #include "../../core/Crypt.h" #endif #include diff --git a/src/openrct2/rct12/ScenarioPatcher.h b/src/openrct2/compatibility/shared/ScenarioPatcher.h similarity index 95% rename from src/openrct2/rct12/ScenarioPatcher.h rename to src/openrct2/compatibility/shared/ScenarioPatcher.h index b613824e3e4b..089d2fef2782 100644 --- a/src/openrct2/rct12/ScenarioPatcher.h +++ b/src/openrct2/compatibility/shared/ScenarioPatcher.h @@ -9,7 +9,7 @@ #pragma once -#include "../core/StringTypes.h" +#include "../../core/StringTypes.h" namespace OpenRCT2::RCT12 { diff --git a/src/openrct2/rct12/TD46.cpp b/src/openrct2/compatibility/shared/TD46.cpp similarity index 98% rename from src/openrct2/rct12/TD46.cpp rename to src/openrct2/compatibility/shared/TD46.cpp index 40296098ca82..0a8d7d616593 100644 --- a/src/openrct2/rct12/TD46.cpp +++ b/src/openrct2/compatibility/shared/TD46.cpp @@ -9,8 +9,8 @@ #include "TD46.h" -#include "../ride/Track.h" -#include "../ride/TrackDesign.h" +#include "../../ride/Track.h" +#include "../../ride/TrackDesign.h" namespace OpenRCT2::RCT12 { diff --git a/src/openrct2/rct12/TD46.h b/src/openrct2/compatibility/shared/TD46.h similarity index 98% rename from src/openrct2/rct12/TD46.h rename to src/openrct2/compatibility/shared/TD46.h index 0fefb6ba6b22..3549f92f8bfb 100644 --- a/src/openrct2/rct12/TD46.h +++ b/src/openrct2/compatibility/shared/TD46.h @@ -9,7 +9,7 @@ #pragma once -#include "../core/EnumUtils.hpp" +#include "../../core/EnumUtils.hpp" #include diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 30097e931fb2..3469422ab759 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -14,6 +14,7 @@ #include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" +#include "../compatibility/rct1/Csg.h" #include "../core/Console.hpp" #include "../core/EnumUtils.hpp" #include "../core/File.h" @@ -29,7 +30,6 @@ #include "../network/Network.h" #include "../paint/VirtualFloor.h" #include "../platform/Platform.h" -#include "../rct1/Csg.h" #include "../ride/Ride.h" #include "../scenario/Scenario.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index c4df1000ac52..435387148e8f 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -14,13 +14,13 @@ #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../SpriteIds.h" +#include "../compatibility/rct1/Csg.h" #include "../config/Config.h" #include "../core/FileStream.h" #include "../core/Guard.hpp" #include "../core/MemoryStream.h" #include "../core/Path.hpp" #include "../platform/Platform.h" -#include "../rct1/Csg.h" #include "../ui/UiContext.h" #include "ScrollingText.h" diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 5fa48895dd6d..9f7b46eab1a7 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -11,11 +11,11 @@ #include "../Diagnostic.h" #include "../SpriteIds.h" +#include "../compatibility/shared/CSChar.h" #include "../core/EnumUtils.hpp" #include "../core/UTF8.h" #include "../core/UnicodeChar.h" #include "../localisation/LocalisationService.h" -#include "../rct12/CSChar.h" #include "Drawing.h" #include "ScrollingText.h" #include "TTF.h" diff --git a/src/openrct2/entity/EntityList.h b/src/openrct2/entity/EntityList.h index b654e047bf13..edfa5bdbc2ed 100644 --- a/src/openrct2/entity/EntityList.h +++ b/src/openrct2/entity/EntityList.h @@ -10,7 +10,7 @@ #pragma once #include "../GameState.h" -#include "../rct12/RCT12.h" +#include "../compatibility/shared/RCT12.h" #include "../world/Location.hpp" #include "EntityBase.h" #include "EntityRegistry.h" diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 1f99206b2406..cd8e0f304491 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -16,6 +16,7 @@ #include "../OpenRCT2.h" #include "../SpriteIds.h" #include "../audio/Audio.h" +#include "../compatibility/rct2/RCT2.h" #include "../config/Config.h" #include "../core/DataSerialiser.h" #include "../core/Guard.hpp" @@ -44,7 +45,6 @@ #include "../peep/PeepAnimations.h" #include "../peep/PeepThoughts.h" #include "../peep/RideUseSystem.h" -#include "../rct2/RCT2.h" #include "../ride/Ride.h" #include "../ride/RideData.h" #include "../ride/RideManager.hpp" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 34bb1b2990ce..d98e962b87f6 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -176,6 +176,21 @@ + + + + + + + + + + + + + + + @@ -419,20 +434,6 @@ - - - - - - - - - - - - - - @@ -790,6 +791,19 @@ + + + + + + + + + + + + + @@ -1069,19 +1083,6 @@ - - - - - - - - - - - - - diff --git a/src/openrct2/object/PeepAnimationsObject.cpp b/src/openrct2/object/PeepAnimationsObject.cpp index 33fc76b09c54..5b49f6abaa2d 100644 --- a/src/openrct2/object/PeepAnimationsObject.cpp +++ b/src/openrct2/object/PeepAnimationsObject.cpp @@ -11,12 +11,12 @@ #include "../Context.h" #include "../PlatformEnvironment.h" +#include "../compatibility/shared/RCT12.h" #include "../core/EnumMap.hpp" #include "../core/Guard.hpp" #include "../core/Json.hpp" #include "../drawing/Drawing.h" #include "../peep/PeepAnimations.h" -#include "../rct12/RCT12.h" #include "ObjectRepository.h" namespace OpenRCT2 diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index a1385ea6cf61..92c3d3510284 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -13,6 +13,8 @@ #include "../OpenRCT2.h" #include "../audio/Audio.h" +#include "../compatibility/rct2/DATLimits.h" +#include "../compatibility/rct2/RCT2.h" #include "../core/EnumMap.hpp" #include "../core/FlagHolder.hpp" #include "../core/IStream.hpp" @@ -23,8 +25,6 @@ #include "../drawing/Drawing.h" #include "../entity/Yaw.hpp" #include "../localisation/Language.h" -#include "../rct2/DATLimits.h" -#include "../rct2/RCT2.h" #include "../ride/CarEntry.h" #include "../ride/Ride.h" #include "../ride/RideData.h" diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index 5fa2b68e0978..517c354dbd18 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -10,13 +10,13 @@ #include "StringTable.h" #include "../Context.h" +#include "../compatibility/shared/CSStringConverter.h" #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" #include "../core/IStream.hpp" #include "../core/Json.hpp" #include "../core/String.hpp" #include "../localisation/LocalisationService.h" -#include "../rct12/CSStringConverter.h" #include "Object.h" namespace OpenRCT2 diff --git a/src/openrct2/openrct2_pch.h b/src/openrct2/openrct2_pch.h index 655dac226e7c..ae7a1c9f6341 100644 --- a/src/openrct2/openrct2_pch.h +++ b/src/openrct2/openrct2_pch.h @@ -2,7 +2,7 @@ // Include some expensive headers here to improve compilation speed +#include "compatibility/rct2/RCT2.h" #include "core/FileSystem.hpp" #include "object/Object.h" -#include "rct2/RCT2.h" #include "ride/Ride.h" diff --git a/src/openrct2/park/Legacy.cpp b/src/openrct2/park/Legacy.cpp index d3903496de6e..4edeb98ef8e5 100644 --- a/src/openrct2/park/Legacy.cpp +++ b/src/openrct2/park/Legacy.cpp @@ -11,6 +11,8 @@ #include "../Context.h" #include "../Diagnostic.h" +#include "../compatibility/rct2/RCT2.h" +#include "../compatibility/shared/RCT12.h" #include "../entity/EntityList.h" #include "../entity/Guest.h" #include "../entity/Staff.h" @@ -18,8 +20,6 @@ #include "../object/ObjectList.h" #include "../object/ObjectManager.h" #include "../object/PeepAnimationsObject.h" -#include "../rct12/RCT12.h" -#include "../rct2/RCT2.h" #include "../ride/Ride.h" #include "../ride/Track.h" #include "ParkFile.h" diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index b796d10c0345..d76da043fda7 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -17,6 +17,7 @@ #include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../Version.h" +#include "../compatibility/rct2/RCT2.h" #include "../config/Config.h" #include "../core/Console.hpp" #include "../core/Crypt.h" @@ -45,7 +46,6 @@ #include "../object/ObjectManager.h" #include "../object/ObjectRepository.h" #include "../peep/RideUseSystem.h" -#include "../rct2/RCT2.h" #include "../ride/RideManager.hpp" #include "../ride/ShopItem.h" #include "../ride/Vehicle.h" diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index b9b779cbf2d5..51d8a85037e1 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -10,8 +10,8 @@ #include "CableLift.h" #include "../audio/Audio.h" +#include "../compatibility/shared/RCT12.h" #include "../entity/EntityList.h" -#include "../rct12/RCT12.h" #include "../util/Util.h" #include "../world/Map.h" #include "../world/tile_element/TileElement.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 0707beba3dde..97bbe5907fb9 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -21,6 +21,7 @@ #include "../actions/RideSetStatusAction.h" #include "../actions/RideSetVehicleAction.h" #include "../audio/Audio.h" +#include "../compatibility/rct1/RCT1.h" #include "../config/Config.h" #include "../core/BitSet.hpp" #include "../core/EnumUtils.hpp" @@ -42,7 +43,6 @@ #include "../object/RideObject.h" #include "../object/StationObject.h" #include "../profiling/Profiling.h" -#include "../rct1/RCT1.h" #include "../scenario/Scenario.h" #include "../ui/WindowManager.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 6773e881a9b5..1d9ea0bfeed6 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -10,10 +10,10 @@ #pragma once #include "../Limits.h" +#include "../compatibility/rct2/Limits.h" #include "../core/BitSet.hpp" #include "../core/FixedPoint.hpp" #include "../core/FlagHolder.hpp" -#include "../rct2/Limits.h" #include "RideColour.h" #include "RideEntry.h" #include "RideRatings.h" diff --git a/src/openrct2/ride/RideEntry.h b/src/openrct2/ride/RideEntry.h index 980cafb76dc9..07e3b9e020c0 100644 --- a/src/openrct2/ride/RideEntry.h +++ b/src/openrct2/ride/RideEntry.h @@ -9,7 +9,7 @@ #pragma once -#include "../rct2/DATLimits.h" +#include "../compatibility/rct2/DATLimits.h" #include "CarEntry.h" #include "RideColour.h" #include "RideTypes.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index f0539ee29d1f..08d1ebe776ac 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -15,12 +15,12 @@ #include "../GameState.h" #include "../actions/ResultWithMessage.h" #include "../audio/Audio.h" +#include "../compatibility/rct1/RCT1.h" #include "../config/Config.h" #include "../interface/Viewport.h" #include "../management/Finance.h" #include "../network/Network.h" #include "../platform/Platform.h" -#include "../rct1/RCT1.h" #include "../ride/RideColour.h" #include "../sawyer_coding/SawyerCoding.h" #include "../world/Footpath.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 037e682bef15..1c510ee241a1 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -32,6 +32,7 @@ #include "../actions/WallPlaceAction.h" #include "../actions/WallRemoveAction.h" #include "../audio/Audio.h" +#include "../compatibility/rct2/RCT2.h" #include "../config/Config.h" #include "../core/DataSerialiser.h" #include "../core/File.h" @@ -53,7 +54,6 @@ #include "../object/ObjectRepository.h" #include "../object/SmallSceneryEntry.h" #include "../object/StationObject.h" -#include "../rct2/RCT2.h" #include "../ride/RideConstruction.h" #include "../sawyer_coding/SawyerCoding.h" #include "../world/Footpath.h" diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 478643f98559..4a1a69b55707 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -11,6 +11,7 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../audio/Audio.h" +#include "../compatibility/rct2/RCT2.h" #include "../drawing/Drawing.h" #include "../interface/Viewport.h" #include "../localisation/Formatter.h" @@ -21,7 +22,6 @@ #include "../object/LargeSceneryObject.h" #include "../object/ObjectList.h" #include "../object/ObjectManager.h" -#include "../rct2/RCT2.h" #include "../sawyer_coding/SawyerCoding.h" #include "../windows/Intent.h" #include "../world/Footpath.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 5f38c61f9f7a..1f2d50e57047 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -16,6 +16,7 @@ #include "../OpenRCT2.h" #include "../actions/RideSetStatusAction.h" #include "../audio/Audio.h" +#include "../compatibility/shared/RCT12.h" #include "../config/Config.h" #include "../core/EnumUtils.hpp" #include "../core/FixedPoint.hpp" @@ -33,7 +34,6 @@ #include "../object/SmallSceneryEntry.h" #include "../paint/vehicle/Vehicle.MiniGolf.h" #include "../profiling/Profiling.h" -#include "../rct12/RCT12.h" #include "../scenario/Scenario.h" #include "../scripting/HookEngine.h" #include "../scripting/ScriptEngine.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index c5961c1b502e..27bbca13ed9b 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -20,6 +20,8 @@ #include "../PlatformEnvironment.h" #include "../actions/ResultWithMessage.h" #include "../audio/Audio.h" +#include "../compatibility/rct1/RCT1.h" +#include "../compatibility/shared/RCT12.h" #include "../config/Config.h" #include "../core/BitSet.hpp" #include "../core/EnumUtils.hpp" @@ -46,8 +48,6 @@ #include "../object/WaterEntry.h" #include "../platform/Platform.h" #include "../profiling/Profiling.h" -#include "../rct1/RCT1.h" -#include "../rct12/RCT12.h" #include "../ride/Ride.h" #include "../ride/RideManager.hpp" #include "../ride/Track.h" diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 5d6ca298c187..03a380bb36e9 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -14,6 +14,9 @@ #include "../Game.h" #include "../ParkImporter.h" #include "../PlatformEnvironment.h" +#include "../compatibility/rct2/RCT2.h" +#include "../compatibility/shared/CSStringConverter.h" +#include "../compatibility/shared/RCT12.h" #include "../config/Config.h" #include "../core/Console.hpp" #include "../core/File.h" @@ -26,9 +29,6 @@ #include "../localisation/LocalisationService.h" #include "../platform/Crash.h" #include "../platform/Platform.h" -#include "../rct12/CSStringConverter.h" -#include "../rct12/RCT12.h" -#include "../rct2/RCT2.h" #include "../sawyer_coding/SawyerChunkReader.h" #include "Scenario.h" #include "ScenarioCategory.h" diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index dc8f811f8612..fedf98a2787b 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -11,12 +11,12 @@ #include "ScStaff.hpp" + #include "../../../compatibility/shared/RCT12.h" #include "../../../entity/PatrolArea.h" #include "../../../entity/Staff.h" #include "../../../object/ObjectManager.h" #include "../../../object/PeepAnimationsObject.h" #include "../../../peep/PeepAnimations.h" - #include "../../../rct12/RCT12.h" #include "../../../world/Map.h" namespace OpenRCT2::Scripting diff --git a/test/tests/LocalisationTest.cpp b/test/tests/LocalisationTest.cpp index 5e0fa06de5a7..3cf2b2f0b76f 100644 --- a/test/tests/LocalisationTest.cpp +++ b/test/tests/LocalisationTest.cpp @@ -8,8 +8,8 @@ *****************************************************************************/ #include "helpers/StringHelpers.hpp" +#include "openrct2/compatibility/shared/CSStringConverter.h" #include "openrct2/localisation/Language.h" -#include "openrct2/rct12/CSStringConverter.h" #include diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 774edce68072..99df2652113f 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/test/tests/ScenarioPatcherTests.cpp b/test/tests/ScenarioPatcherTests.cpp index 9f0d6ffe8018..c031d22853ec 100644 --- a/test/tests/ScenarioPatcherTests.cpp +++ b/test/tests/ScenarioPatcherTests.cpp @@ -13,10 +13,10 @@ #include #include #include +#include #include #include #include -#include /* Test that all JSONs are with the expected formatting, otherwise the fetcher will abort NOTE: This will *not* test that it actually applies the patch, due to the scenarios