Create /compatibility directory

src/openrct2-ui/WindowManager.cpp

@@ -25,13 +25,13 @@
 #include <openrct2/GameState.h>
 #include <openrct2/Input.h>
 #include <openrct2/OpenRCT2.h>
+#include <openrct2/compatibility/rct2/T6Exporter.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Console.hpp>
 #include <openrct2/core/Guard.hpp>
 #include <openrct2/drawing/Drawing.h>
 #include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/interface/Viewport.h>
-#include <openrct2/rct2/T6Exporter.h>
 #include <openrct2/ride/Ride.h>
 #include <openrct2/ride/RideConstruction.h>
 #include <openrct2/ride/Vehicle.h>

src/openrct2-ui/interface/FileBrowser.cpp

@@ -16,6 +16,7 @@
 #include <openrct2/Game.h>
 #include <openrct2/GameState.h>
 #include <openrct2/PlatformEnvironment.h>
+#include <openrct2/compatibility/rct2/T6Exporter.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Path.hpp>
 #include <openrct2/core/String.hpp>
@@ -24,7 +25,6 @@
 #include <openrct2/localisation/Formatter.h>
 #include <openrct2/localisation/StringIds.h>
 #include <openrct2/platform/Platform.h>
-#include <openrct2/rct2/T6Exporter.h>
 #include <openrct2/ride/TrackDesign.h>
 #include <openrct2/scenario/Scenario.h>
 #include <openrct2/ui/UiContext.h>

src/openrct2-ui/windows/LoadSave.cpp

@@ -41,7 +41,6 @@
 #include <openrct2/object/ObjectRepository.h>
 #include <openrct2/park/ParkPreview.h>
 #include <openrct2/platform/Platform.h>
-#include <openrct2/rct2/T6Exporter.h>
 #include <openrct2/ride/TrackDesign.h>
 #include <openrct2/scenes/title/TitleScene.h>
 #include <openrct2/ui/UiContext.h>

src/openrct2-ui/windows/NewRide.cpp

@@ -19,6 +19,7 @@
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/SpriteIds.h>
 #include <openrct2/audio/Audio.h>
+#include <openrct2/compatibility/rct1/RCT1.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/String.hpp>
 #include <openrct2/drawing/Drawing.h>
@@ -32,7 +33,6 @@
 #include <openrct2/object/ObjectManager.h>
 #include <openrct2/object/ObjectRepository.h>
 #include <openrct2/object/RideObject.h>
-#include <openrct2/rct1/RCT1.h>
 #include <openrct2/ride/RideData.h>
 #include <openrct2/ride/TrackData.h>
 #include <openrct2/ride/TrackDesignRepository.h>

src/openrct2-ui/windows/Options.cpp

@@ -26,6 +26,7 @@
 #include <openrct2/audio/Audio.h>
 #include <openrct2/audio/AudioContext.h>
 #include <openrct2/audio/AudioMixer.h>
+#include <openrct2/compatibility/rct1/Csg.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/EnumUtils.hpp>
 #include <openrct2/core/File.h>
@@ -40,7 +41,6 @@
 #include <openrct2/localisation/LocalisationService.h>
 #include <openrct2/network/Network.h>
 #include <openrct2/platform/Platform.h>
-#include <openrct2/rct1/Csg.h>
 #include <openrct2/ride/RideAudio.h>
 #include <openrct2/scenario/Scenario.h>
 #include <openrct2/scenes/title/TitleScene.h>

src/openrct2-ui/windows/Ride.cpp

@@ -38,6 +38,7 @@
 #include <openrct2/actions/RideSetSettingAction.h>
 #include <openrct2/actions/RideSetStatusAction.h>
 #include <openrct2/audio/Audio.h>
+#include <openrct2/compatibility/rct1/RCT1.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/String.hpp>
 #include <openrct2/core/UnitConversion.h>
@@ -56,7 +57,6 @@
 #include <openrct2/object/ObjectManager.h>
 #include <openrct2/object/PeepAnimationsObject.h>
 #include <openrct2/object/StationObject.h>
-#include <openrct2/rct1/RCT1.h>
 #include <openrct2/ride/RideConstruction.h>
 #include <openrct2/ride/RideData.h>
 #include <openrct2/ride/ShopItem.h>

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"

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"

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"

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"

src/openrct2/Limits.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "rct2/Limits.h"
+#include "compatibility/rct2/Limits.h"
 
 #include <limits>
 

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 <cstddef>
 

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 <cstdint>
+
+enum class BannerFlag : uint8_t;         // Banner.h
+enum class RideInvalidateFlag : uint8_t; // Ride.h
+
+using BannerFlags = FlagHolder<uint8_t, BannerFlag>;
+using RideInvalidateFlags = FlagHolder<uint8_t, RideInvalidateFlag>;

src/openrct2/rct1/Csg.cpp → 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
 {

src/openrct2/rct1/Csg.h → src/openrct2/compatibility/rct1/Csg.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/StringTypes.h"
+#include "../../core/StringTypes.h"
 
 namespace OpenRCT2
 {

src/openrct2/rct1/Limits.h → src/openrct2/compatibility/rct1/Limits.h

@@ -8,7 +8,7 @@
  *****************************************************************************/
 
 #pragma once
-#include "../rct12/Limits.h"
+#include "../shared/Limits.h"
 
 namespace OpenRCT2::RCT1::Limits
 {

src/openrct2/rct1/RCT1.h → 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;

src/openrct2/rct1/S4Importer.cpp → 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"