diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 85b7966ed6..0b64d1f3bb 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -711,6 +711,9 @@ 4C7B53F0200143C200A52E21 /* Widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Widget.h; sourceTree = ""; }; 4C7B53F1200143C200A52E21 /* Window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Window.cpp; sourceTree = ""; }; 4C7B53F2200143C200A52E21 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = ""; }; + 4C7B54022004C57400A52E21 /* RCT1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCT1.h; sourceTree = ""; }; + 4C7B54032004C57B00A52E21 /* RCT12.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCT12.h; sourceTree = ""; }; + 4C7B54042004C58200A52E21 /* RCT2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCT2.h; sourceTree = ""; }; 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = ""; }; 4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = ""; }; 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = ""; }; @@ -1292,7 +1295,6 @@ F76C84671EC4E7CC00FA49E2 /* S4Importer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = S4Importer.cpp; sourceTree = ""; }; F76C84681EC4E7CC00FA49E2 /* Tables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Tables.cpp; sourceTree = ""; }; F76C84691EC4E7CC00FA49E2 /* Tables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Tables.h; sourceTree = ""; }; - F76C846B1EC4E7CC00FA49E2 /* rct1.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rct1.h; sourceTree = ""; }; F76C846D1EC4E7CC00FA49E2 /* SawyerChunk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SawyerChunk.cpp; sourceTree = ""; }; F76C846E1EC4E7CC00FA49E2 /* SawyerChunk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SawyerChunk.h; sourceTree = ""; }; F76C846F1EC4E7CC00FA49E2 /* SawyerChunkReader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SawyerChunkReader.cpp; sourceTree = ""; }; @@ -1301,11 +1303,9 @@ F76C84721EC4E7CC00FA49E2 /* SawyerChunkWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SawyerChunkWriter.h; sourceTree = ""; }; F76C84731EC4E7CC00FA49E2 /* SawyerEncoding.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SawyerEncoding.cpp; sourceTree = ""; }; F76C84741EC4E7CC00FA49E2 /* SawyerEncoding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SawyerEncoding.h; sourceTree = ""; }; - F76C84751EC4E7CC00FA49E2 /* rct12.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rct12.h; sourceTree = ""; }; F76C847D1EC4E7CC00FA49E2 /* S6Exporter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = S6Exporter.cpp; sourceTree = ""; }; F76C847E1EC4E7CC00FA49E2 /* S6Exporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = S6Exporter.h; sourceTree = ""; }; F76C847F1EC4E7CC00FA49E2 /* S6Importer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = S6Importer.cpp; sourceTree = ""; }; - F76C84811EC4E7CC00FA49E2 /* rct2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rct2.h; sourceTree = ""; }; F76C84BC1EC4E7CC00FA49E2 /* ride_data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ride_data.c; sourceTree = ""; }; F76C84BD1EC4E7CC00FA49E2 /* ride_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ride_data.h; sourceTree = ""; }; F76C84BE1EC4E7CC00FA49E2 /* ride_ratings.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ride_ratings.c; sourceTree = ""; }; @@ -1878,9 +1878,6 @@ F76C84521EC4E7CC00FA49E2 /* ParkImporter.h */, F76C84641EC4E7CC00FA49E2 /* PlatformEnvironment.cpp */, F76C84651EC4E7CC00FA49E2 /* PlatformEnvironment.h */, - F76C846B1EC4E7CC00FA49E2 /* rct1.h */, - F76C84751EC4E7CC00FA49E2 /* rct12.h */, - F76C84811EC4E7CC00FA49E2 /* rct2.h */, F76C84FA1EC4E7CD00FA49E2 /* sprites.h */, F76C850B1EC4E7CD00FA49E2 /* Version.cpp */, F76C850C1EC4E7CD00FA49E2 /* Version.h */, @@ -2244,6 +2241,7 @@ F76C84661EC4E7CC00FA49E2 /* rct1 */ = { isa = PBXGroup; children = ( + 4C7B54022004C57400A52E21 /* RCT1.h */, F76C84671EC4E7CC00FA49E2 /* S4Importer.cpp */, F76C84681EC4E7CC00FA49E2 /* Tables.cpp */, F76C84691EC4E7CC00FA49E2 /* Tables.h */, @@ -2254,6 +2252,7 @@ F76C846C1EC4E7CC00FA49E2 /* rct12 */ = { isa = PBXGroup; children = ( + 4C7B54032004C57B00A52E21 /* RCT12.h */, F76C846D1EC4E7CC00FA49E2 /* SawyerChunk.cpp */, F76C846E1EC4E7CC00FA49E2 /* SawyerChunk.h */, F76C846F1EC4E7CC00FA49E2 /* SawyerChunkReader.cpp */, @@ -2269,6 +2268,7 @@ F76C84761EC4E7CC00FA49E2 /* rct2 */ = { isa = PBXGroup; children = ( + 4C7B54042004C58200A52E21 /* RCT2.h */, F76C847D1EC4E7CC00FA49E2 /* S6Exporter.cpp */, F76C847E1EC4E7CC00FA49E2 /* S6Exporter.h */, F76C847F1EC4E7CC00FA49E2 /* S6Importer.cpp */, diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index b07d4c0583..5962103cc5 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 6993d771e8..3689c622f0 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index a224994b55..90e85da442 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 777a2849ef..572f018ba9 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -65,7 +65,7 @@ #include "network/twitch.h" #include "object/ObjectList.h" #include "platform/platform.h" -#include "rct1.h" +#include "rct1/RCT1.h" #include "util/Util.h" using namespace OpenRCT2; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 65b3f90a97..7fc5712cbc 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -30,7 +30,7 @@ #include "object/ObjectRepository.h" #include "object/ObjectList.h" #include "peep/Staff.h" -#include "rct1.h" +#include "rct1/RCT1.h" #include "util/Util.h" #include "windows/Intent.h" #include "world/Climate.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index e7274a3c69..a3a82d5194 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -40,7 +40,7 @@ #include "peep/Peep.h" #include "peep/Staff.h" #include "platform/platform.h" -#include "rct1.h" +#include "rct1/RCT1.h" #include "ride/Ride.h" #include "ride/ride_ratings.h" #include "ride/Track.h" diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 9e637259d1..7a6e841021 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -25,7 +25,7 @@ #include "../Cheats.h" #include "../interface/Window.h" #include "../world/Park.h" -#include "../rct1.h" +#include "../rct1/RCT1.h" #include "../ride/ride_data.h" #include "../ride/Ride.h" #include "../ride/Station.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 1297b0d30a..907fa86080 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -25,7 +25,7 @@ #include "../object/ObjectList.h" #include "../OpenRCT2.h" #include "../scenario/Scenario.h" -#include "../rct1.h" +#include "../rct1/RCT1.h" #include "../ride/Ride.h" #include "../ride/ride_data.h" #include "../ride/RideGroupManager.h" diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 2b8c1d8610..ba4788556b 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -24,7 +24,7 @@ #include "../drawing/Drawing.h" #include "../localisation/Language.h" -#include "../rct2.h" +#include "../rct2/RCT2.h" #include "../ride/Ride.h" #include "../ride/Track.h" diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c index c240168fd2..b95fc2cca7 100644 --- a/src/openrct2/platform/windows.c +++ b/src/openrct2/platform/windows.c @@ -34,7 +34,7 @@ #include "../localisation/Date.h" #include "../localisation/Language.h" #include "../OpenRCT2.h" -#include "../rct2.h" +#include "../rct2/RCT2.h" #include "../util/Util.h" #include "../Version.h" #include "platform.h" diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1/RCT1.h similarity index 99% rename from src/openrct2/rct1.h rename to src/openrct2/rct1/RCT1.h index 8a257e581e..de8beb2b2e 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1/RCT1.h @@ -17,15 +17,15 @@ #ifndef _RCT1_H_ #define _RCT1_H_ -#include "management/Award.h" -#include "management/NewsItem.h" -#include "management/Research.h" -#include "rct12.h" -#include "ride/Ride.h" -#include "world/Banner.h" -#include "world/Map.h" -#include "world/sprite.h" -#include "world/map_animation.h" +#include "../management/Award.h" +#include "../management/NewsItem.h" +#include "../management/Research.h" +#include "../rct12/RCT12.h" +#include "../ride/Ride.h" +#include "../world/Banner.h" +#include "../world/Map.h" +#include "../world/sprite.h" +#include "../world/map_animation.h" #define RCT1_MAX_TILE_ELEMENTS 0xC000 #define RCT1_MAX_SPRITES 5000 diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 763a467f81..3a2b3e5999 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -47,7 +47,7 @@ #include "../object/ObjectManager.h" #include "../peep/Peep.h" #include "../peep/Staff.h" -#include "../rct1.h" +#include "RCT1.h" #include "../ride/ride_data.h" #include "../ride/Track.h" #include "../util/SawyerCoding.h" diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 3b62608fa6..80320ced63 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -20,7 +20,7 @@ #include "Tables.h" #include "../interface/Colour.h" -#include "../rct1.h" +#include "RCT1.h" #include "../ride/Ride.h" namespace RCT1 diff --git a/src/openrct2/rct12.h b/src/openrct2/rct12/RCT12.h similarity index 99% rename from src/openrct2/rct12.h rename to src/openrct2/rct12/RCT12.h index eb43361200..0557029239 100644 --- a/src/openrct2/rct12.h +++ b/src/openrct2/rct12/RCT12.h @@ -18,7 +18,7 @@ // Structures shared between both RCT1 and RCT2. -#include "common.h" +#include "../common.h" #define RCT12_MAX_RIDES_IN_PARK 255 #define RCT12_MAX_AWARDS 4 diff --git a/src/openrct2/rct2.h b/src/openrct2/rct2/RCT2.h similarity index 99% rename from src/openrct2/rct2.h rename to src/openrct2/rct2/RCT2.h index 0621f54f71..b645b86cb6 100644 --- a/src/openrct2/rct2.h +++ b/src/openrct2/rct2/RCT2.h @@ -17,10 +17,10 @@ #ifndef _RCT2_H_ #define _RCT2_H_ -#include "ride/ride_ratings.h" -#include "ride/Vehicle.h" -#include "common.h" -#include "rct12.h" +#include "../ride/ride_ratings.h" +#include "../ride/Vehicle.h" +#include "../common.h" +#include "../rct12/RCT12.h" #define RCT2_MAX_STAFF 200 #define RCT2_MAX_BANNERS_IN_PARK 250 diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 051f43b12b..12ddff71e5 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../core/Math.hpp" -#include "../rct12.h" +#include "../rct12/RCT12.h" #include "../util/Util.h" #include "../world/sprite.h" #include "CableLift.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index d9a2abfaa2..a0c21ef94e 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -37,7 +37,7 @@ #include "../OpenRCT2.h" #include "../peep/Peep.h" #include "../peep/Staff.h" -#include "../rct1.h" +#include "../rct1/RCT1.h" #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../windows/Intent.h" diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 0ed5744f15..f50fd67b2c 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -19,8 +19,8 @@ #include "../common.h" #include "../peep/Peep.h" -#include "../rct12.h" -#include "../rct2.h" +#include "../rct12/RCT12.h" +#include "../rct2/RCT2.h" #include "../world/Map.h" #include "ride_ratings.h" #include "Vehicle.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 9edc777f80..cd53e32cd3 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -23,7 +23,7 @@ #include "../management/Finance.h" #include "../network/network.h" #include "../platform/platform.h" -#include "../rct1.h" +#include "../rct1/RCT1.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/footpath.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index bfd12955b9..9faf1b1e3a 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -29,7 +29,7 @@ #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" -#include "../rct1.h" +#include "../rct1/RCT1.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/footpath.h" diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index 53b1ca6a50..5b18b9a920 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -19,8 +19,8 @@ #include "../common.h" #include "../object/Object.h" -#include "../rct12.h" -#include "../rct2.h" +#include "../rct12/RCT12.h" +#include "../rct2/RCT2.h" #include "../world/Map.h" #include "Vehicle.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 7377e06fbd..c186ec3609 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -28,7 +28,7 @@ #include "../localisation/Localisation.h" #include "../management/NewsItem.h" #include "../platform/platform.h" -#include "../rct12.h" +#include "../rct12/RCT12.h" #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../world/map_animation.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 0db50ec4af..49380a78a4 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -34,7 +34,7 @@ #include "../ParkImporter.h" #include "../peep/Staff.h" #include "../platform/platform.h" -#include "../rct1.h" +#include "../rct1/RCT1.h" #include "../ride/Ride.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index ea48129a11..f91e4d3b1d 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -21,8 +21,8 @@ #include "../management/Finance.h" #include "../management/Research.h" #include "../object/Object.h" -#include "../rct12.h" -#include "../rct2.h" +#include "../rct12/RCT12.h" +#include "../rct2/RCT2.h" #include "../ride/Ride.h" #include "../ride/ride_ratings.h" #include "../world/Banner.h" diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 516c06a229..a6b8392a64 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -28,7 +28,7 @@ #include "data.h" #include -#include +#include #include #include #include diff --git a/test/testpaint/main.cpp b/test/testpaint/main.cpp index 98a87a7061..6895606a42 100644 --- a/test/testpaint/main.cpp +++ b/test/testpaint/main.cpp @@ -29,7 +29,7 @@ #include "Utils.hpp" #include "data.h" -#include +#include #include #include #include