From c4f44e5e7ae95b7f4db41485d97164a6b0ed103f Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 14 Dec 2017 10:34:12 +0100 Subject: [PATCH] Compile files in paint folder as C++ --- OpenRCT2.xcodeproj/project.pbxproj | 144 ++++++++++-------- .../engines/HardwareDisplayDrawingEngine.cpp | 2 +- src/openrct2-ui/input/MouseInput.cpp | 2 +- src/openrct2-ui/windows/DebugPaint.cpp | 4 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2/Game.cpp | 4 +- src/openrct2/ObjectList.h | 4 +- .../actions/PlaceParkEntranceAction.hpp | 2 +- src/openrct2/drawing/lightfx.c | 2 +- src/openrct2/drawing/scrolling_text.c | 2 +- src/openrct2/interface/viewport.c | 8 +- src/openrct2/interface/viewport.h | 2 +- src/openrct2/interface/viewport_interaction.c | 2 +- src/openrct2/object/EntranceObject.h | 2 +- src/openrct2/paint/Paint.cpp | 6 +- src/openrct2/paint/{paint.h => Paint.h} | 5 +- .../{paint_helpers.c => PaintHelpers.cpp} | 2 +- .../paint/{supports.c => Supports.cpp} | 6 +- src/openrct2/paint/{supports.h => Supports.h} | 0 .../paint/sprite/{litter.c => Litter.cpp} | 4 +- .../paint/sprite/{misc.c => Misc.cpp} | 4 +- .../paint/sprite/{peep.c => Peep.cpp} | 4 +- .../paint/sprite/{sprite.c => Sprite.cpp} | 4 +- .../paint/sprite/{sprite.h => Sprite.h} | 0 .../tile_element/{banner.c => Banner.cpp} | 6 +- .../tile_element/{entrance.c => Entrance.cpp} | 8 +- .../paint/tile_element/{fence.c => Fence.cpp} | 84 +++++----- .../{large_scenery.c => LargeScenery.cpp} | 11 +- .../paint/tile_element/{path.c => Path.cpp} | 26 ++-- .../{scenery.c => SmallScenery.cpp} | 6 +- src/openrct2/paint/tile_element/Surface.cpp | 4 +- .../tile_element/{surface.h => Surface.h} | 0 .../{tile_element.c => TileElement.cpp} | 38 ++--- .../{tile_element.h => TileElement.h} | 0 src/openrct2/peep/Peep.cpp | 2 +- src/openrct2/peep/Staff.cpp | 4 +- src/openrct2/rct1.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- .../coaster/AirPoweredVerticalCoaster.cpp | 6 +- .../ride/coaster/BobsleighCoaster.cpp | 6 +- .../ride/coaster/BolligerMabillardTrack.cpp | 6 +- .../ride/coaster/CompactInvertedCoaster.cpp | 6 +- .../ride/coaster/CorkscrewRollerCoaster.cpp | 6 +- .../ride/coaster/FlyingRollerCoaster.cpp | 6 +- src/openrct2/ride/coaster/GigaCoaster.cpp | 6 +- .../ride/coaster/HeartlineTwisterCoaster.cpp | 6 +- .../ride/coaster/InvertedHairpinCoaster.cpp | 6 +- .../ride/coaster/InvertedImpulseCoaster.cpp | 6 +- .../ride/coaster/InvertedRollerCoaster.cpp | 6 +- .../ride/coaster/JuniorRollerCoaster.cpp | 4 +- .../ride/coaster/JuniorRollerCoaster.h | 2 +- .../ride/coaster/LayDownRollerCoaster.cpp | 6 +- .../ride/coaster/LimLaunchedRollerCoaster.cpp | 6 +- .../ride/coaster/LoopingRollerCoaster.cpp | 6 +- src/openrct2/ride/coaster/MineRide.cpp | 6 +- .../ride/coaster/MineTrainCoaster.cpp | 6 +- .../ride/coaster/MiniRollerCoaster.cpp | 6 +- .../ride/coaster/MiniSuspendedCoaster.cpp | 6 +- .../coaster/MultiDimensionRollerCoaster.cpp | 6 +- .../ride/coaster/ReverseFreefallCoaster.cpp | 6 +- .../ride/coaster/ReverserRollerCoaster.cpp | 6 +- .../coaster/SideFrictionRollerCoaster.cpp | 6 +- .../ride/coaster/StandUpRollerCoaster.cpp | 6 +- src/openrct2/ride/coaster/Steeplechase.cpp | 6 +- .../ride/coaster/SuspendedSwingingCoaster.cpp | 6 +- .../ride/coaster/TwisterRollerCoaster.cpp | 6 +- .../coaster/VerticalDropRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/VirginiaReel.cpp | 4 +- src/openrct2/ride/coaster/WildMouse.cpp | 6 +- .../ride/coaster/WoodenRollerCoaster.cpp | 6 +- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 6 +- src/openrct2/ride/gentle/CarRide.cpp | 4 +- src/openrct2/ride/gentle/CircusShow.cpp | 4 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 4 +- src/openrct2/ride/gentle/Dodgems.cpp | 4 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 4 +- src/openrct2/ride/gentle/FlyingSaucers.cpp | 4 +- src/openrct2/ride/gentle/GhostTrain.cpp | 4 +- src/openrct2/ride/gentle/HauntedHouse.cpp | 4 +- src/openrct2/ride/gentle/Maze.cpp | 6 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 4 +- src/openrct2/ride/gentle/MiniGolf.cpp | 4 +- src/openrct2/ride/gentle/MiniHelicopters.cpp | 4 +- src/openrct2/ride/gentle/MonorailCycles.cpp | 4 +- src/openrct2/ride/gentle/ObservationTower.cpp | 4 +- src/openrct2/ride/gentle/SpaceRings.cpp | 4 +- src/openrct2/ride/gentle/SpiralSlide.cpp | 4 +- src/openrct2/ride/ride.c | 2 +- src/openrct2/ride/shops/Facility.cpp | 4 +- src/openrct2/ride/shops/Shop.cpp | 4 +- src/openrct2/ride/thrill/3dCinema.cpp | 4 +- src/openrct2/ride/thrill/Enterprise.cpp | 4 +- src/openrct2/ride/thrill/GoKarts.cpp | 4 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 4 +- src/openrct2/ride/thrill/MagicCarpet.cpp | 4 +- src/openrct2/ride/thrill/MotionSimulator.cpp | 4 +- src/openrct2/ride/thrill/PirateShip.cpp | 4 +- src/openrct2/ride/thrill/RotoDrop.cpp | 4 +- .../ride/thrill/SwingingInverterShip.cpp | 4 +- src/openrct2/ride/thrill/TopSpin.cpp | 4 +- src/openrct2/ride/thrill/Twist.cpp | 4 +- src/openrct2/ride/track_paint.c | 6 +- src/openrct2/ride/track_paint.h | 4 +- src/openrct2/ride/transport/Chairlift.cpp | 4 +- src/openrct2/ride/transport/Lift.cpp | 4 +- .../ride/transport/MiniatureRailway.cpp | 4 +- src/openrct2/ride/transport/Monorail.cpp | 4 +- .../ride/transport/SuspendedMonorail.cpp | 6 +- src/openrct2/ride/vehicle_paint.c | 2 +- src/openrct2/ride/water/BoatHire.cpp | 2 +- src/openrct2/ride/water/DingySlide.cpp | 4 +- src/openrct2/ride/water/LogFlume.cpp | 4 +- src/openrct2/ride/water/RiverRapids.cpp | 4 +- src/openrct2/ride/water/SplashBoats.cpp | 4 +- src/openrct2/ride/water/SubmarineRide.cpp | 4 +- src/openrct2/scenario/scenario.h | 2 +- src/openrct2/world/Banner.cpp | 2 +- src/openrct2/world/{banner.h => Banner.h} | 0 src/openrct2/world/Entrance.cpp | 2 +- src/openrct2/world/{entrance.h => Entrance.h} | 0 src/openrct2/world/Particle.cpp | 2 +- src/openrct2/world/map.c | 2 +- src/openrct2/world/park.c | 2 +- test/testpaint/CMakeLists.txt | 4 +- test/testpaint/PaintIntercept.cpp | 2 +- test/testpaint/SegmentSupportHeightCall.cpp | 2 +- test/testpaint/SegmentSupportHeightCall.hpp | 2 +- test/testpaint/SideTunnelCall.hpp | 2 +- test/testpaint/TestPaint.cpp | 4 +- test/testpaint/TestPaint.hpp | 4 +- test/testpaint/TestTrack.cpp | 4 +- test/testpaint/compat.c | 2 +- 135 files changed, 416 insertions(+), 400 deletions(-) rename src/openrct2/paint/{paint.h => Paint.h} (99%) rename src/openrct2/paint/{paint_helpers.c => PaintHelpers.cpp} (99%) rename src/openrct2/paint/{supports.c => Supports.cpp} (99%) rename src/openrct2/paint/{supports.h => Supports.h} (100%) rename src/openrct2/paint/sprite/{litter.c => Litter.cpp} (98%) rename src/openrct2/paint/sprite/{misc.c => Misc.cpp} (99%) rename src/openrct2/paint/sprite/{peep.c => Peep.cpp} (98%) rename src/openrct2/paint/sprite/{sprite.c => Sprite.cpp} (98%) rename src/openrct2/paint/sprite/{sprite.h => Sprite.h} (100%) rename src/openrct2/paint/tile_element/{banner.c => Banner.cpp} (97%) rename src/openrct2/paint/tile_element/{entrance.c => Entrance.cpp} (99%) rename src/openrct2/paint/tile_element/{fence.c => Fence.cpp} (83%) rename src/openrct2/paint/tile_element/{large_scenery.c => LargeScenery.cpp} (98%) rename src/openrct2/paint/tile_element/{path.c => Path.cpp} (98%) rename src/openrct2/paint/tile_element/{scenery.c => SmallScenery.cpp} (99%) rename src/openrct2/paint/tile_element/{surface.h => Surface.h} (100%) rename src/openrct2/paint/tile_element/{tile_element.c => TileElement.cpp} (93%) rename src/openrct2/paint/tile_element/{tile_element.h => TileElement.h} (100%) rename src/openrct2/world/{banner.h => Banner.h} (100%) rename src/openrct2/world/{entrance.h => Entrance.h} (100%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 11bd46f4ff..5ef860314a 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -27,6 +27,22 @@ 4C6A668E1FE14C3A00694CB6 /* SawyerCoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A668A1FE14C3A00694CB6 /* SawyerCoding.cpp */; }; 4C6A668F1FE14C3A00694CB6 /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A668C1FE14C3A00694CB6 /* Util.cpp */; }; 4C6A66921FE14C9500694CB6 /* Cheats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66901FE14C9500694CB6 /* Cheats.cpp */; }; + 4C6A66981FE2786F00694CB6 /* Litter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66931FE2786F00694CB6 /* Litter.cpp */; }; + 4C6A66991FE2786F00694CB6 /* Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66941FE2786F00694CB6 /* Misc.cpp */; }; + 4C6A669A1FE2786F00694CB6 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66951FE2786F00694CB6 /* Peep.cpp */; }; + 4C6A669B1FE2786F00694CB6 /* Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66961FE2786F00694CB6 /* Sprite.cpp */; }; + 4C6A66A61FE2787700694CB6 /* Banner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669C1FE2787700694CB6 /* Banner.cpp */; }; + 4C6A66A71FE2787700694CB6 /* Entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669D1FE2787700694CB6 /* Entrance.cpp */; }; + 4C6A66A81FE2787700694CB6 /* Fence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669E1FE2787700694CB6 /* Fence.cpp */; }; + 4C6A66A91FE2787700694CB6 /* LargeScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A669F1FE2787700694CB6 /* LargeScenery.cpp */; }; + 4C6A66AA1FE2787700694CB6 /* Path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A01FE2787700694CB6 /* Path.cpp */; }; + 4C6A66AB1FE2787700694CB6 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A11FE2787700694CB6 /* SmallScenery.cpp */; }; + 4C6A66AC1FE2787700694CB6 /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A21FE2787700694CB6 /* Surface.cpp */; }; + 4C6A66AD1FE2787700694CB6 /* TileElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66A41FE2787700694CB6 /* TileElement.cpp */; }; + 4C6A66B51FE278C900694CB6 /* Paint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66AE1FE278C900694CB6 /* Paint.cpp */; }; + 4C6A66B61FE278C900694CB6 /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B01FE278C900694CB6 /* Painter.cpp */; }; + 4C6A66B71FE278C900694CB6 /* PaintHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */; }; + 4C6A66B81FE278C900694CB6 /* Supports.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66B31FE278C900694CB6 /* Supports.cpp */; }; 4C6AC20F1F9E1693004324AA /* Station.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6AC20D1F9E1693004324AA /* Station.cpp */; }; 4C6AC2121F9E1CB3004324AA /* CableLift.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6AC2101F9E1CB3004324AA /* CableLift.cpp */; }; 4C729BC01FC2E1BE001DFF2F /* LargeScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BBE1FC2E1BE001DFF2F /* LargeScenery.cpp */; }; @@ -130,7 +146,6 @@ 4CE4624B1FD1613D0001CD98 /* Platform.macOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */; }; 4CE4624C1FD1613D0001CD98 /* Platform.Posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */; }; 4CE4624D1FD1613D0001CD98 /* Platform.Win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */; }; - 4CF788C01F1B787700C611BF /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CF788BE1F1B787700C611BF /* Painter.cpp */; }; 4CFBCD5E1F27CD8000D74FB6 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */; }; 4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7B1F90A3F1005243C2 /* Peep.cpp */; }; 4CFE4E811F90A3F1005243C2 /* PeepData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7D1F90A3F1005243C2 /* PeepData.cpp */; }; @@ -365,21 +380,6 @@ F76C867F1EC4E88400FA49E2 /* WallObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84311EC4E7CC00FA49E2 /* WallObject.cpp */; }; F76C86811EC4E88400FA49E2 /* WaterObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84331EC4E7CC00FA49E2 /* WaterObject.cpp */; }; F76C86861EC4E88400FA49E2 /* OpenRCT2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84381EC4E7CC00FA49E2 /* OpenRCT2.cpp */; }; - F76C86881EC4E88400FA49E2 /* banner.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843C1EC4E7CC00FA49E2 /* banner.c */; }; - F76C86891EC4E88400FA49E2 /* entrance.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843D1EC4E7CC00FA49E2 /* entrance.c */; }; - F76C868A1EC4E88400FA49E2 /* fence.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843E1EC4E7CC00FA49E2 /* fence.c */; }; - F76C868B1EC4E88400FA49E2 /* tile_element.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843F1EC4E7CC00FA49E2 /* tile_element.c */; }; - F76C868D1EC4E88400FA49E2 /* path.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84411EC4E7CC00FA49E2 /* path.c */; }; - F76C868E1EC4E88400FA49E2 /* scenery.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84421EC4E7CC00FA49E2 /* scenery.c */; }; - F76C868F1EC4E88400FA49E2 /* large_scenery.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84431EC4E7CC00FA49E2 /* large_scenery.c */; }; - F76C86901EC4E88400FA49E2 /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84441EC4E7CC00FA49E2 /* Surface.cpp */; }; - F76C86921EC4E88400FA49E2 /* Paint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84461EC4E7CC00FA49E2 /* Paint.cpp */; }; - F76C86941EC4E88400FA49E2 /* paint_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84481EC4E7CC00FA49E2 /* paint_helpers.c */; }; - F76C86951EC4E88400FA49E2 /* litter.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C844A1EC4E7CC00FA49E2 /* litter.c */; }; - F76C86961EC4E88400FA49E2 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C844B1EC4E7CC00FA49E2 /* misc.c */; }; - F76C86971EC4E88400FA49E2 /* peep.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C844C1EC4E7CC00FA49E2 /* peep.c */; }; - F76C86981EC4E88400FA49E2 /* sprite.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C844D1EC4E7CC00FA49E2 /* sprite.c */; }; - F76C869A1EC4E88400FA49E2 /* supports.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C844F1EC4E7CC00FA49E2 /* supports.c */; }; F76C869C1EC4E88400FA49E2 /* ParkImporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84511EC4E7CC00FA49E2 /* ParkImporter.cpp */; }; F76C86A31EC4E88400FA49E2 /* Crash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C845A1EC4E7CC00FA49E2 /* Crash.cpp */; }; F76C86A51EC4E88400FA49E2 /* linux.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C845C1EC4E7CC00FA49E2 /* linux.c */; }; @@ -610,6 +610,28 @@ 4C6A668D1FE14C3A00694CB6 /* Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Util.h; sourceTree = ""; }; 4C6A66901FE14C9500694CB6 /* Cheats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cheats.cpp; sourceTree = ""; }; 4C6A66911FE14C9500694CB6 /* Cheats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cheats.h; sourceTree = ""; }; + 4C6A66931FE2786F00694CB6 /* Litter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Litter.cpp; sourceTree = ""; }; + 4C6A66941FE2786F00694CB6 /* Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Misc.cpp; sourceTree = ""; }; + 4C6A66951FE2786F00694CB6 /* Peep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Peep.cpp; sourceTree = ""; }; + 4C6A66961FE2786F00694CB6 /* Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sprite.cpp; sourceTree = ""; }; + 4C6A66971FE2786F00694CB6 /* Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sprite.h; sourceTree = ""; }; + 4C6A669C1FE2787700694CB6 /* Banner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Banner.cpp; sourceTree = ""; }; + 4C6A669D1FE2787700694CB6 /* Entrance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Entrance.cpp; sourceTree = ""; }; + 4C6A669E1FE2787700694CB6 /* Fence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Fence.cpp; sourceTree = ""; }; + 4C6A669F1FE2787700694CB6 /* LargeScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LargeScenery.cpp; sourceTree = ""; }; + 4C6A66A01FE2787700694CB6 /* Path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Path.cpp; sourceTree = ""; }; + 4C6A66A11FE2787700694CB6 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = ""; }; + 4C6A66A21FE2787700694CB6 /* Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Surface.cpp; sourceTree = ""; }; + 4C6A66A31FE2787700694CB6 /* Surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Surface.h; sourceTree = ""; }; + 4C6A66A41FE2787700694CB6 /* TileElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileElement.cpp; sourceTree = ""; }; + 4C6A66A51FE2787700694CB6 /* TileElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileElement.h; sourceTree = ""; }; + 4C6A66AE1FE278C900694CB6 /* Paint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.cpp; sourceTree = ""; }; + 4C6A66AF1FE278C900694CB6 /* Paint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Paint.h; sourceTree = ""; }; + 4C6A66B01FE278C900694CB6 /* Painter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Painter.cpp; sourceTree = ""; }; + 4C6A66B11FE278C900694CB6 /* Painter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Painter.h; sourceTree = ""; }; + 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PaintHelpers.cpp; sourceTree = ""; }; + 4C6A66B31FE278C900694CB6 /* Supports.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Supports.cpp; sourceTree = ""; }; + 4C6A66B41FE278C900694CB6 /* Supports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Supports.h; sourceTree = ""; }; 4C6AC20D1F9E1693004324AA /* Station.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Station.cpp; sourceTree = ""; }; 4C6AC20E1F9E1693004324AA /* Station.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Station.h; sourceTree = ""; }; 4C6AC2101F9E1CB3004324AA /* CableLift.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CableLift.cpp; sourceTree = ""; }; @@ -736,8 +758,6 @@ 4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.macOS.cpp; sourceTree = ""; }; 4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Posix.cpp; sourceTree = ""; }; 4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Win32.cpp; sourceTree = ""; }; - 4CF788BE1F1B787700C611BF /* Painter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Painter.cpp; sourceTree = ""; }; - 4CF788BF1F1B787700C611BF /* Painter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Painter.h; sourceTree = ""; }; 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = ""; }; 4CFE4E7B1F90A3F1005243C2 /* Peep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Peep.cpp; sourceTree = ""; }; 4CFE4E7C1F90A3F1005243C2 /* Peep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Peep.h; sourceTree = ""; }; @@ -1241,26 +1261,6 @@ F76C84351EC4E7CC00FA49E2 /* object.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = ""; }; F76C84381EC4E7CC00FA49E2 /* OpenRCT2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OpenRCT2.cpp; sourceTree = ""; }; F76C84391EC4E7CC00FA49E2 /* OpenRCT2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenRCT2.h; sourceTree = ""; }; - F76C843C1EC4E7CC00FA49E2 /* banner.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = banner.c; sourceTree = ""; }; - F76C843D1EC4E7CC00FA49E2 /* entrance.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = entrance.c; sourceTree = ""; }; - F76C843E1EC4E7CC00FA49E2 /* fence.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fence.c; sourceTree = ""; }; - F76C843F1EC4E7CC00FA49E2 /* tile_element.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = tile_element.c; sourceTree = ""; }; - F76C84401EC4E7CC00FA49E2 /* tile_element.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tile_element.h; sourceTree = ""; }; - F76C84411EC4E7CC00FA49E2 /* path.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = path.c; sourceTree = ""; }; - F76C84421EC4E7CC00FA49E2 /* scenery.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = scenery.c; sourceTree = ""; }; - F76C84431EC4E7CC00FA49E2 /* large_scenery.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = large_scenery.c; sourceTree = ""; }; - F76C84441EC4E7CC00FA49E2 /* Surface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Surface.cpp; sourceTree = ""; }; - F76C84451EC4E7CC00FA49E2 /* surface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = surface.h; sourceTree = ""; }; - F76C84461EC4E7CC00FA49E2 /* Paint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Paint.cpp; sourceTree = ""; }; - F76C84471EC4E7CC00FA49E2 /* paint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = paint.h; sourceTree = ""; }; - F76C84481EC4E7CC00FA49E2 /* paint_helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = paint_helpers.c; sourceTree = ""; }; - F76C844A1EC4E7CC00FA49E2 /* litter.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = litter.c; sourceTree = ""; }; - F76C844B1EC4E7CC00FA49E2 /* misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = ""; }; - F76C844C1EC4E7CC00FA49E2 /* peep.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = peep.c; sourceTree = ""; }; - F76C844D1EC4E7CC00FA49E2 /* sprite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sprite.c; sourceTree = ""; }; - F76C844E1EC4E7CC00FA49E2 /* sprite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = ""; }; - F76C844F1EC4E7CC00FA49E2 /* supports.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = supports.c; sourceTree = ""; }; - F76C84501EC4E7CC00FA49E2 /* supports.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = supports.h; sourceTree = ""; }; F76C84511EC4E7CC00FA49E2 /* ParkImporter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ParkImporter.cpp; sourceTree = ""; }; F76C84521EC4E7CC00FA49E2 /* ParkImporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParkImporter.h; sourceTree = ""; }; F76C845A1EC4E7CC00FA49E2 /* Crash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Crash.cpp; sourceTree = ""; }; @@ -1327,7 +1327,7 @@ F76C854A1EC4E7CD00FA49E2 /* tile_inspector.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tile_inspector.h; sourceTree = ""; }; F76C855C1EC4E7CD00FA49E2 /* Balloon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Balloon.cpp; sourceTree = ""; }; F76C855D1EC4E7CD00FA49E2 /* Banner.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Banner.cpp; sourceTree = ""; }; - F76C855E1EC4E7CD00FA49E2 /* banner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = banner.h; sourceTree = ""; }; + F76C855E1EC4E7CD00FA49E2 /* Banner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Banner.h; sourceTree = ""; }; F76C855F1EC4E7CD00FA49E2 /* Climate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Climate.cpp; sourceTree = ""; }; F76C85601EC4E7CD00FA49E2 /* Climate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Climate.h; sourceTree = ""; }; F76C85611EC4E7CD00FA49E2 /* Duck.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Duck.cpp; sourceTree = ""; }; @@ -2154,15 +2154,15 @@ F76C843A1EC4E7CC00FA49E2 /* paint */ = { isa = PBXGroup; children = ( - F76C843B1EC4E7CC00FA49E2 /* tile_element */, F76C84491EC4E7CC00FA49E2 /* sprite */, - F76C84461EC4E7CC00FA49E2 /* Paint.cpp */, - F76C84471EC4E7CC00FA49E2 /* paint.h */, - 4CF788BE1F1B787700C611BF /* Painter.cpp */, - 4CF788BF1F1B787700C611BF /* Painter.h */, - F76C84481EC4E7CC00FA49E2 /* paint_helpers.c */, - F76C844F1EC4E7CC00FA49E2 /* supports.c */, - F76C84501EC4E7CC00FA49E2 /* supports.h */, + F76C843B1EC4E7CC00FA49E2 /* tile_element */, + 4C6A66AE1FE278C900694CB6 /* Paint.cpp */, + 4C6A66AF1FE278C900694CB6 /* Paint.h */, + 4C6A66B01FE278C900694CB6 /* Painter.cpp */, + 4C6A66B11FE278C900694CB6 /* Painter.h */, + 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */, + 4C6A66B31FE278C900694CB6 /* Supports.cpp */, + 4C6A66B41FE278C900694CB6 /* Supports.h */, ); path = paint; sourceTree = ""; @@ -2170,16 +2170,16 @@ F76C843B1EC4E7CC00FA49E2 /* tile_element */ = { isa = PBXGroup; children = ( - F76C843C1EC4E7CC00FA49E2 /* banner.c */, - F76C843D1EC4E7CC00FA49E2 /* entrance.c */, - F76C843E1EC4E7CC00FA49E2 /* fence.c */, - F76C843F1EC4E7CC00FA49E2 /* tile_element.c */, - F76C84401EC4E7CC00FA49E2 /* tile_element.h */, - F76C84411EC4E7CC00FA49E2 /* path.c */, - F76C84421EC4E7CC00FA49E2 /* scenery.c */, - F76C84431EC4E7CC00FA49E2 /* large_scenery.c */, - F76C84441EC4E7CC00FA49E2 /* Surface.cpp */, - F76C84451EC4E7CC00FA49E2 /* surface.h */, + 4C6A669C1FE2787700694CB6 /* Banner.cpp */, + 4C6A669D1FE2787700694CB6 /* Entrance.cpp */, + 4C6A669E1FE2787700694CB6 /* Fence.cpp */, + 4C6A669F1FE2787700694CB6 /* LargeScenery.cpp */, + 4C6A66A01FE2787700694CB6 /* Path.cpp */, + 4C6A66A11FE2787700694CB6 /* SmallScenery.cpp */, + 4C6A66A21FE2787700694CB6 /* Surface.cpp */, + 4C6A66A31FE2787700694CB6 /* Surface.h */, + 4C6A66A41FE2787700694CB6 /* TileElement.cpp */, + 4C6A66A51FE2787700694CB6 /* TileElement.h */, ); path = tile_element; sourceTree = ""; @@ -2187,11 +2187,11 @@ F76C84491EC4E7CC00FA49E2 /* sprite */ = { isa = PBXGroup; children = ( - F76C844A1EC4E7CC00FA49E2 /* litter.c */, - F76C844B1EC4E7CC00FA49E2 /* misc.c */, - F76C844C1EC4E7CC00FA49E2 /* peep.c */, - F76C844D1EC4E7CC00FA49E2 /* sprite.c */, - F76C844E1EC4E7CC00FA49E2 /* sprite.h */, + 4C6A66931FE2786F00694CB6 /* Litter.cpp */, + 4C6A66941FE2786F00694CB6 /* Misc.cpp */, + 4C6A66951FE2786F00694CB6 /* Peep.cpp */, + 4C6A66961FE2786F00694CB6 /* Sprite.cpp */, + 4C6A66971FE2786F00694CB6 /* Sprite.h */, ); path = sprite; sourceTree = ""; @@ -2492,7 +2492,7 @@ children = ( F76C855C1EC4E7CD00FA49E2 /* Balloon.cpp */, F76C855D1EC4E7CD00FA49E2 /* Banner.cpp */, - F76C855E1EC4E7CD00FA49E2 /* banner.h */, + F76C855E1EC4E7CD00FA49E2 /* Banner.h */, F76C855F1EC4E7CD00FA49E2 /* Climate.cpp */, F76C85601EC4E7CD00FA49E2 /* Climate.h */, F76C85611EC4E7CD00FA49E2 /* Duck.cpp */, @@ -3079,6 +3079,7 @@ 4C93F1531F8B744400A9330D /* SuspendedSwingingCoaster.cpp in Sources */, C68313CB1FDB4EEC006DB3D8 /* Tooltip.cpp in Sources */, 4C93F18B1F8B747A00A9330D /* GoKarts.cpp in Sources */, + 4C6A66B71FE278C900694CB6 /* PaintHelpers.cpp in Sources */, C654DF2F1F69C0430040F43D /* Error.cpp in Sources */, 4C93F1791F8B745700A9330D /* SpiralSlide.cpp in Sources */, C64644F81F3FA4120026AC2D /* ClearScenery.cpp in Sources */, @@ -3090,6 +3091,7 @@ 4C93F1491F8B744400A9330D /* MineRide.cpp in Sources */, F76C88781EC5324E00FA49E2 /* AudioChannel.cpp in Sources */, C666EE6D1F37ACB10061AA04 /* Cheats.cpp in Sources */, + 4C6A66A81FE2787700694CB6 /* Fence.cpp in Sources */, C685E5191F8907850090598F /* NewRide.cpp in Sources */, 4C93F1561F8B744400A9330D /* VirginiaReel.cpp in Sources */, C654DF361F69C0430040F43D /* Player.cpp in Sources */, @@ -3100,7 +3102,9 @@ 4C93F1571F8B744400A9330D /* WildMouse.cpp in Sources */, D4974F1C1FA04A1900F7FD7F /* TransparencyDepth.cpp in Sources */, C666EE7A1F37ACB10061AA04 /* Themes.cpp in Sources */, + 4C6A66A61FE2787700694CB6 /* Banner.cpp in Sources */, 4C93F1781F8B745700A9330D /* SpaceRings.cpp in Sources */, + 4C6A66A91FE2787700694CB6 /* LargeScenery.cpp in Sources */, 4CFE4E8A1F950164005243C2 /* TrackDataOld.cpp in Sources */, C666EE7F1F37ACB10061AA04 /* Viewport.cpp in Sources */, C632C81F1F8A445700781F6D /* RideList.cpp in Sources */, @@ -3148,6 +3152,7 @@ 4C93F19C1F8B748200A9330D /* Monorail.cpp in Sources */, 4C93F14C1F8B744400A9330D /* MiniSuspendedCoaster.cpp in Sources */, C666EE721F37ACB10061AA04 /* Multiplayer.cpp in Sources */, + 4C6A66B81FE278C900694CB6 /* Supports.cpp in Sources */, 4CB832AB1EFFB8D100B88761 /* ttf_sdlport.c in Sources */, C654DF371F69C0430040F43D /* Sign.cpp in Sources */, 4C93F1751F8B745700A9330D /* MiniHelicopters.cpp in Sources */, @@ -3160,14 +3165,16 @@ C6E415511FAFD6DC00D4A52A /* RideConstruction.cpp in Sources */, C685E51B1F8907850090598F /* Guest.cpp in Sources */, C64644F91F3FA4120026AC2D /* EditorInventionsList.cpp in Sources */, + 4C6A66AD1FE2787700694CB6 /* TileElement.cpp in Sources */, 4CE4624C1FD1613D0001CD98 /* Platform.Posix.cpp in Sources */, + 4C6A669B1FE2786F00694CB6 /* Sprite.cpp in Sources */, C6D2BEE61F9BAACE008B557C /* TrackList.cpp in Sources */, 4C93F1AB1F8B748900A9330D /* WaterCoaster.cpp in Sources */, 4C93F16D1F8B745700A9330D /* Dodgems.cpp in Sources */, 4C93F1A81F8B748900A9330D /* RiverRapids.cpp in Sources */, C666EE701F37ACB10061AA04 /* LandRights.cpp in Sources */, 4C93F16F1F8B745700A9330D /* FlyingSaucers.cpp in Sources */, - 4CF788C01F1B787700C611BF /* Painter.cpp in Sources */, + 4C6A66AA1FE2787700694CB6 /* Path.cpp in Sources */, C666EE781F37ACB10061AA04 /* ServerList.cpp in Sources */, C654DF341F69C0430040F43D /* NewCampaign.cpp in Sources */, F76C887D1EC5324E00FA49E2 /* CursorData.cpp in Sources */, @@ -3181,13 +3188,16 @@ C666EE7B1F37ACB10061AA04 /* TitleExit.cpp in Sources */, F7D7747F1EC61E5100BE6EBC /* UiContext.macOS.mm in Sources */, F76C887E1EC5324E00FA49E2 /* CursorRepository.cpp in Sources */, + 4C6A66991FE2786F00694CB6 /* Misc.cpp in Sources */, 4CFE4E851F90AF41005243C2 /* Vehicle.cpp in Sources */, 4C93F16A1F8B745700A9330D /* CarRide.cpp in Sources */, C654DF331F69C0430040F43D /* LoadSave.cpp in Sources */, C68313C61FDB4EBA006DB3D8 /* input.cpp in Sources */, + 4C6A66A71FE2787700694CB6 /* Entrance.cpp in Sources */, C61ADB211FB7DC060024F2EF /* Scenery.cpp in Sources */, F775F5341EE35A6B001F00E7 /* DummyUiContext.cpp in Sources */, C654DF401F69C18C0040F43D /* Intent.cpp in Sources */, + 4C6A66981FE2786F00694CB6 /* Litter.cpp in Sources */, C666ED761F33DBB20061AA04 /* ShortcutKeyChange.cpp in Sources */, F76C887F1EC5324E00FA49E2 /* ApplyPaletteShader.cpp in Sources */, 4CE462411FD0710E0001CD98 /* Game.cpp in Sources */, @@ -3195,12 +3205,14 @@ F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */, 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */, 4C93F18F1F8B747A00A9330D /* PirateShip.cpp in Sources */, + 4C6A66B61FE278C900694CB6 /* Painter.cpp in Sources */, C654DF381F69C0430040F43D /* StaffFirePrompt.cpp in Sources */, C68313D51FDB4F4C006DB3D8 /* Graph.cpp in Sources */, C651A8D91F30204300443BCA /* Text.cpp in Sources */, F76C88801EC5324E00FA49E2 /* DrawRectShader.cpp in Sources */, C685E51D1F8907850090598F /* Research.cpp in Sources */, C64644FB1F3FA4120026AC2D /* EditorScenarioOptions.cpp in Sources */, + 4C6A66AB1FE2787700694CB6 /* SmallScenery.cpp in Sources */, F775F5371EE3724F001F00E7 /* DummyAudioContext.cpp in Sources */, 4C5DFF421FAC69D200CB093A /* Date.cpp in Sources */, 4C93F13C1F8B744400A9330D /* BolligerMabillardTrack.cpp in Sources */, @@ -3209,6 +3221,7 @@ C64644FF1F3FA4120026AC2D /* StaffList.cpp in Sources */, C6D2BEE81F9BAACE008B557C /* MazeConstruction.cpp in Sources */, C666EE771F37ACB10061AA04 /* SavePrompt.cpp in Sources */, + 4C6A669A1FE2786F00694CB6 /* Peep.cpp in Sources */, 4C93F16C1F8B745700A9330D /* CrookedHouse.cpp in Sources */, 4C93F18A1F8B747A00A9330D /* Enterprise.cpp in Sources */, 4CE4624A1FD1613D0001CD98 /* Platform.Linux.cpp in Sources */, @@ -3229,6 +3242,7 @@ C666EE731F37ACB10061AA04 /* MusicCredits.cpp in Sources */, 4C93F1511F8B744400A9330D /* StandUpRollerCoaster.cpp in Sources */, 4C93F18C1F8B747A00A9330D /* LaunchedFreefall.cpp in Sources */, + 4C6A66AC1FE2787700694CB6 /* Surface.cpp in Sources */, 4C93F1BB1F8E185600A9330D /* Finance.cpp in Sources */, 4C93F19A1F8B748200A9330D /* Lift.cpp in Sources */, C654DF351F69C0430040F43D /* Park.cpp in Sources */, @@ -3285,6 +3299,7 @@ F76C888A1EC5324E00FA49E2 /* TextComposition.cpp in Sources */, C68313CC1FDB4EEC006DB3D8 /* Dropdown.cpp in Sources */, C68313D61FDB4F4C006DB3D8 /* LandTool.cpp in Sources */, + 4C6A66B51FE278C900694CB6 /* Paint.cpp in Sources */, 4C93F1741F8B745700A9330D /* MiniGolf.cpp in Sources */, 4C93F1911F8B747A00A9330D /* SwingingInverterShip.cpp in Sources */, 4C93F1461F8B744400A9330D /* LayDownRollerCoaster.cpp in Sources */, @@ -3425,6 +3440,7 @@ F76C86971EC4E88400FA49E2 /* peep.c in Sources */, F76C86981EC4E88400FA49E2 /* sprite.c in Sources */, F76C869A1EC4E88400FA49E2 /* supports.c in Sources */, + C666EE141F33E3800061AA04 /* Dropdown.cpp in Sources */, F76C869C1EC4E88400FA49E2 /* ParkImporter.cpp in Sources */, F76C86A31EC4E88400FA49E2 /* Crash.cpp in Sources */, F76C86A51EC4E88400FA49E2 /* linux.c in Sources */, diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 1182a2d303..74f1f64cd2 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include using namespace OpenRCT2; using namespace OpenRCT2::Drawing; diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 7bc42e4dcb..210009c035 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index ec13d96979..4b9274fe30 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -19,8 +19,8 @@ #include #include - #include - #include + #include + #include #include enum WINDOW_DEBUG_PAINT_WIDGET_IDX diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 919d3e7788..7ecb4dd2be 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 0df807c8b6..eef1dd19ab 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index f003bb70d1..0f4683ebc2 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #pragma region Widgets diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 819d253bf9..7c60b4caad 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -52,9 +52,9 @@ #include "util/SawyerCoding.h" #include "util/Util.h" #include "windows/Intent.h" -#include "world/banner.h" +#include "world/Banner.h" #include "world/Climate.h" -#include "world/entrance.h" +#include "world/Entrance.h" #include "world/footpath.h" #include "world/map.h" #include "world/map_animation.h" diff --git a/src/openrct2/ObjectList.h b/src/openrct2/ObjectList.h index 6a705731e6..01fd42ed72 100644 --- a/src/openrct2/ObjectList.h +++ b/src/openrct2/ObjectList.h @@ -1,8 +1,8 @@ #pragma once #include "ride/ride.h" -#include "world/banner.h" -#include "world/entrance.h" +#include "world/Banner.h" +#include "world/Entrance.h" #include "world/footpath.h" #include "world/scenery.h" #include "world/water.h" diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index ce13a0e979..d68593ed58 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -22,7 +22,7 @@ #include "GameAction.h" #include "../Cheats.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" #include "../world/park.h" #include "../world/footpath.h" diff --git a/src/openrct2/drawing/lightfx.c b/src/openrct2/drawing/lightfx.c index 22e797754e..4263246523 100644 --- a/src/openrct2/drawing/lightfx.c +++ b/src/openrct2/drawing/lightfx.c @@ -20,7 +20,7 @@ #include "../Game.h" #include "../interface/viewport.h" #include "../interface/window.h" -#include "../paint/tile_element/tile_element.h" +#include "../paint/tile_element/TileElement.h" #include "../world/Climate.h" #include "../config/Config.h" #include "drawing.h" diff --git a/src/openrct2/drawing/scrolling_text.c b/src/openrct2/drawing/scrolling_text.c index f374704833..7d7a0e3b2d 100644 --- a/src/openrct2/drawing/scrolling_text.c +++ b/src/openrct2/drawing/scrolling_text.c @@ -17,7 +17,7 @@ #include "../config/Config.h" #include "../interface/colour.h" #include "../localisation/localisation.h" -#include "../paint/paint.h" +#include "../paint/Paint.h" #include "../sprites.h" #include "drawing.h" #include "ttf.h" diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index 5e3bf904da..b1edec2549 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -21,14 +21,14 @@ #include "../Input.h" #include "../localisation/localisation.h" #include "../OpenRCT2.h" -#include "../paint/paint.h" -#include "../paint/supports.h" +#include "../paint/Paint.h" +#include "../paint/Supports.h" #include "../peep/Staff.h" #include "../ride/ride_data.h" #include "../ride/TrackData.h" -#include "../world/banner.h" +#include "../world/Banner.h" #include "../world/Climate.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" #include "../world/footpath.h" #include "../world/map.h" #include "../world/scenery.h" diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/viewport.h index 7c92807f5b..0e7c94267b 100644 --- a/src/openrct2/interface/viewport.h +++ b/src/openrct2/interface/viewport.h @@ -19,7 +19,7 @@ #include "../world/map.h" #include "../world/sprite.h" -#include "../paint/paint.h" +#include "../paint/Paint.h" #include "window.h" enum { diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 7bad199627..978e487733 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -25,7 +25,7 @@ #include "../ride/Track.h" #include "../scenario/scenario.h" #include "../windows/Intent.h" -#include "../world/banner.h" +#include "../world/Banner.h" #include "../world/footpath.h" #include "../world/map.h" #include "../world/scenery.h" diff --git a/src/openrct2/object/EntranceObject.h b/src/openrct2/object/EntranceObject.h index 326fa3c4a3..7991754ce3 100644 --- a/src/openrct2/object/EntranceObject.h +++ b/src/openrct2/object/EntranceObject.h @@ -20,7 +20,7 @@ #include "Object.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" class EntranceObject final : public Object { diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 4a2c9af5b1..413e0a72a4 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -14,14 +14,14 @@ *****************************************************************************/ #pragma endregion -#include "paint.h" +#include "Paint.h" #include "../drawing/drawing.h" #include "../localisation/localisation.h" #include "../config/Config.h" #include "../interface/viewport.h" #include "../core/Math.hpp" -#include "tile_element/tile_element.h" -#include "sprite/sprite.h" +#include "tile_element/TileElement.h" +#include "sprite/Sprite.h" #include diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/Paint.h similarity index 99% rename from src/openrct2/paint/paint.h rename to src/openrct2/paint/Paint.h index c1fce3898b..13eda0e038 100644 --- a/src/openrct2/paint/paint.h +++ b/src/openrct2/paint/Paint.h @@ -14,8 +14,7 @@ *****************************************************************************/ #pragma endregion -#ifndef _PAINT_H -#define _PAINT_H +#pragma once #include "../common.h" #include "../world/map.h" @@ -231,5 +230,3 @@ void paint_draw_money_structs(rct_drawpixelinfo * dpi, paint_string_struct * ps) #ifdef __cplusplus } #endif - -#endif diff --git a/src/openrct2/paint/paint_helpers.c b/src/openrct2/paint/PaintHelpers.cpp similarity index 99% rename from src/openrct2/paint/paint_helpers.c rename to src/openrct2/paint/PaintHelpers.cpp index 7f2b45a24d..9496d4023a 100644 --- a/src/openrct2/paint/paint_helpers.c +++ b/src/openrct2/paint/PaintHelpers.cpp @@ -16,7 +16,7 @@ #include "../interface/viewport.h" #include "../ride/track_paint.h" -#include "paint.h" +#include "Paint.h" paint_struct * sub_98196C_rotated( paint_session * session, diff --git a/src/openrct2/paint/supports.c b/src/openrct2/paint/Supports.cpp similarity index 99% rename from src/openrct2/paint/supports.c rename to src/openrct2/paint/Supports.cpp index d2fac30dec..0aa3492c5f 100644 --- a/src/openrct2/paint/supports.c +++ b/src/openrct2/paint/Supports.cpp @@ -15,9 +15,9 @@ #pragma endregion #include "../interface/viewport.h" -#include "../paint/paint.h" -#include "supports.h" -#include "tile_element/tile_element.h" +#include "Paint.h" +#include "Supports.h" +#include "tile_element/TileElement.h" /** rct2: 0x0097AF20, 0x0097AF21 */ static const LocationXY8 loc_97AF20[] = { diff --git a/src/openrct2/paint/supports.h b/src/openrct2/paint/Supports.h similarity index 100% rename from src/openrct2/paint/supports.h rename to src/openrct2/paint/Supports.h diff --git a/src/openrct2/paint/sprite/litter.c b/src/openrct2/paint/sprite/Litter.cpp similarity index 98% rename from src/openrct2/paint/sprite/litter.c rename to src/openrct2/paint/sprite/Litter.cpp index 3e4d10424e..e94b743a0d 100644 --- a/src/openrct2/paint/sprite/litter.c +++ b/src/openrct2/paint/sprite/Litter.cpp @@ -14,10 +14,10 @@ *****************************************************************************/ #pragma endregion -#include "sprite.h" +#include "Sprite.h" #include "../../world/sprite.h" #include "../../interface/viewport.h" -#include "../paint.h" +#include "../Paint.h" enum { SPR_LITTER_SICK = 23101, diff --git a/src/openrct2/paint/sprite/misc.c b/src/openrct2/paint/sprite/Misc.cpp similarity index 99% rename from src/openrct2/paint/sprite/misc.c rename to src/openrct2/paint/sprite/Misc.cpp index 08124d1a24..7504104321 100644 --- a/src/openrct2/paint/sprite/misc.c +++ b/src/openrct2/paint/sprite/Misc.cpp @@ -17,8 +17,8 @@ #include "../../world/sprite.h" #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/sprite/sprite.h" -#include "../paint.h" +#include "Sprite.h" +#include "../Paint.h" #include "../../localisation/string_ids.h" /** rct2: 0x0097EDA4 */ diff --git a/src/openrct2/paint/sprite/peep.c b/src/openrct2/paint/sprite/Peep.cpp similarity index 98% rename from src/openrct2/paint/sprite/peep.c rename to src/openrct2/paint/sprite/Peep.cpp index 80c4739004..8e131f5d75 100644 --- a/src/openrct2/paint/sprite/peep.c +++ b/src/openrct2/paint/sprite/Peep.cpp @@ -17,10 +17,10 @@ #include "../../config/Config.h" #include "../../drawing/lightfx.h" #include "../../interface/viewport.h" -#include "../../paint/sprite/sprite.h" +#include "Sprite.h" #include "../../peep/Peep.h" #include "../../world/sprite.h" -#include "../paint.h" +#include "../Paint.h" /** * diff --git a/src/openrct2/paint/sprite/sprite.c b/src/openrct2/paint/sprite/Sprite.cpp similarity index 98% rename from src/openrct2/paint/sprite/sprite.c rename to src/openrct2/paint/sprite/Sprite.cpp index 283a0ea545..7a45216a08 100644 --- a/src/openrct2/paint/sprite/sprite.c +++ b/src/openrct2/paint/sprite/Sprite.cpp @@ -14,8 +14,8 @@ *****************************************************************************/ #pragma endregion -#include "sprite.h" -#include "../paint.h" +#include "Sprite.h" +#include "../Paint.h" #include "../../drawing/drawing.h" #include "../../world/sprite.h" #include "../../ride/ride_data.h" diff --git a/src/openrct2/paint/sprite/sprite.h b/src/openrct2/paint/sprite/Sprite.h similarity index 100% rename from src/openrct2/paint/sprite/sprite.h rename to src/openrct2/paint/sprite/Sprite.h diff --git a/src/openrct2/paint/tile_element/banner.c b/src/openrct2/paint/tile_element/Banner.cpp similarity index 97% rename from src/openrct2/paint/tile_element/banner.c rename to src/openrct2/paint/tile_element/Banner.cpp index 151a0ce53a..5559600851 100644 --- a/src/openrct2/paint/tile_element/banner.c +++ b/src/openrct2/paint/tile_element/Banner.cpp @@ -14,13 +14,13 @@ *****************************************************************************/ #pragma endregion -#include "../paint.h" +#include "../Paint.h" #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../world/banner.h" +#include "TileElement.h" +#include "../../world/Banner.h" #include "../../world/scenery.h" /** rct2: 0x0098D884 */ diff --git a/src/openrct2/paint/tile_element/entrance.c b/src/openrct2/paint/tile_element/Entrance.cpp similarity index 99% rename from src/openrct2/paint/tile_element/entrance.c rename to src/openrct2/paint/tile_element/Entrance.cpp index 7c3e04bf6b..5e1f48058b 100644 --- a/src/openrct2/paint/tile_element/entrance.c +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -19,11 +19,11 @@ #include "../../interface/viewport.h" #include "../../localisation/localisation.h" #include "../../ride/ride_data.h" -#include "../../world/entrance.h" +#include "../../world/Entrance.h" #include "../../world/footpath.h" -#include "../paint.h" -#include "../supports.h" -#include "tile_element.h" +#include "../Paint.h" +#include "../Supports.h" +#include "TileElement.h" #include "../../drawing/lightfx.h" static uint32 _unk9E32BC; diff --git a/src/openrct2/paint/tile_element/fence.c b/src/openrct2/paint/tile_element/Fence.cpp similarity index 83% rename from src/openrct2/paint/tile_element/fence.c rename to src/openrct2/paint/tile_element/Fence.cpp index 54cda14640..4cf0430c35 100644 --- a/src/openrct2/paint/tile_element/fence.c +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -25,8 +25,8 @@ #include "../../world/map.h" #include "../../world/scenery.h" #include "../../world/Wall.h" -#include "../paint.h" -#include "tile_element.h" +#include "../Paint.h" +#include "TileElement.h" static const uint8 byte_9A406C[] = { 2, 2, 22, 26, 30, 34, 34, 34, 34, 34, 30, 26, 22, 2, 6, 2, @@ -192,15 +192,15 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti case 0: imageId = sceneryEntry->image + byte_9A406C[animationFrame]; - boundsR1 = (LocationXYZ16) {1, 3, ah - 5}; - boundsR1_ = (LocationXYZ16) {1, 1, height + 1}; - boundsR2 = (LocationXYZ16) {1, 28, 3}; - boundsR2_ = (LocationXYZ16) {1, 1, height + ah - 9}; + boundsR1 = {1, 3, static_cast(ah - 5)}; + boundsR1_ = {1, 1, static_cast(height + 1)}; + boundsR2 = {1, 28, 3}; + boundsR2_ = {1, 1, static_cast(height + ah - 9)}; - boundsL1 = (LocationXYZ16) {1, 28, ah}; - boundsL1_ = (LocationXYZ16) {1, 1, height + 1}; + boundsL1 = {1, 28, ah}; + boundsL1_ = {1, 1, static_cast(height + 1)}; - offset = (LocationXYZ16) {0, 0, height}; + offset = {0, 0, static_cast(height)}; fence_paint_door(session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1, boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_); break; @@ -208,15 +208,15 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti case 1: imageId = sceneryEntry->image + byte_9A408C[animationFrame]; - boundsR1 = (LocationXYZ16) {3, 3, ah - 5}; - boundsR1_ = (LocationXYZ16) {1, 30, height + 1}; - boundsR2 = (LocationXYZ16) {29, 3, 2}; - boundsR2_ = (LocationXYZ16) {1, 30, height + ah - 8}; + boundsR1 = {3, 3, static_cast(ah - 5)}; + boundsR1_ = {1, 30, static_cast(height + 1)}; + boundsR2 = {29, 3, 2}; + boundsR2_ = {1, 30, static_cast(height + ah - 8)}; - boundsL1 = (LocationXYZ16) {29, 1, ah}; - boundsL1_ = (LocationXYZ16) {2, 30, height + 1}; + boundsL1 = {29, 1, ah}; + boundsL1_ = {2, 30, static_cast(height + 1)}; - offset = (LocationXYZ16) {1, 31, height}; + offset = {1, 31, static_cast(height)}; fence_paint_door(session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1, boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_); break; @@ -224,15 +224,15 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti case 2: imageId = sceneryEntry->image + byte_9A40AC[animationFrame]; - boundsR1 = (LocationXYZ16) {3, 3, ah - 5}; - boundsR1_ = (LocationXYZ16) {30, 1, height + 1}; - boundsR2 = (LocationXYZ16) {3, 29, 2}; - boundsR2_ = (LocationXYZ16) {30, 1, height + ah - 8}; + boundsR1 = {3, 3, static_cast(ah - 5)}; + boundsR1_ = {30, 1, static_cast(height + 1)}; + boundsR2 = {3, 29, 2}; + boundsR2_ = {30, 1, static_cast(height + ah - 8)}; - boundsL1 = (LocationXYZ16) {1, 29, ah}; - boundsL1_ = (LocationXYZ16) {30, 2, height + 1}; + boundsL1 = {1, 29, ah}; + boundsL1_ = {30, 2, static_cast(height + 1)}; - offset = (LocationXYZ16) {31, 0, height}; + offset = {31, 0, static_cast(height)}; fence_paint_door(session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1, boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_); break; @@ -240,15 +240,15 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti case 3: imageId = sceneryEntry->image + byte_9A40CC[animationFrame]; - boundsR1 = (LocationXYZ16) {3, 1, ah - 5}; - boundsR1_ = (LocationXYZ16) {1, 1, height + 1}; - boundsR2 = (LocationXYZ16) {28, 1, 3}; - boundsR2_ = (LocationXYZ16) {1, 1, height + ah - 9}; + boundsR1 = {3, 1, static_cast(ah - 5)}; + boundsR1_ = {1, 1, static_cast(height + 1)}; + boundsR2 = {28, 1, 3}; + boundsR2_ = {1, 1, static_cast(height + ah - 9)}; - boundsL1 = (LocationXYZ16) {28, 1, ah}; - boundsL1_ = (LocationXYZ16) {1, 1, height + 1}; + boundsL1 = {28, 1, ah}; + boundsL1_ = {1, 1, static_cast(height + 1)}; - offset = (LocationXYZ16) {2, 1, height}; + offset = {2, 1, static_cast(height)}; fence_paint_door(session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1, boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_); break; @@ -271,9 +271,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti imageOffset = 1; } - offset = (LocationXYZ16){0, 0, height}; - bounds = (LocationXYZ16){1, 28, ah}; - boundsOffset = (LocationXYZ16){1, 1, height + 1}; + offset = {0, 0, static_cast(height)}; + bounds = {1, 28, ah}; + boundsOffset = {1, 1, static_cast(height + 1)}; break; case 1: @@ -295,9 +295,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti } } - offset = (LocationXYZ16){1, 31, height}; - bounds = (LocationXYZ16){29, 1, ah}; - boundsOffset = (LocationXYZ16){2, 30, height + 1}; + offset = {1, 31, static_cast(height)}; + bounds = {29, 1, ah}; + boundsOffset = {2, 30, static_cast(height + 1)}; break; case 2: @@ -313,9 +313,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti imageOffset += 6; } - offset = (LocationXYZ16){31, 0, height}; - bounds = (LocationXYZ16){1, 29, ah}; - boundsOffset = (LocationXYZ16){30, 2, height + 1}; + offset = {31, 0, static_cast(height)}; + bounds = {1, 29, ah}; + boundsOffset = {30, 2, static_cast(height + 1)}; break; case 3: @@ -327,9 +327,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti imageOffset = 0; } - offset = (LocationXYZ16){2, 1, height}; - bounds = (LocationXYZ16){28, 1, ah}; - boundsOffset = (LocationXYZ16){1, 1, height + 1}; + offset = {2, 1, static_cast(height)}; + bounds = {28, 1, ah}; + boundsOffset = {1, 1, static_cast(height + 1)}; break; } diff --git a/src/openrct2/paint/tile_element/large_scenery.c b/src/openrct2/paint/tile_element/LargeScenery.cpp similarity index 98% rename from src/openrct2/paint/tile_element/large_scenery.c rename to src/openrct2/paint/tile_element/LargeScenery.cpp index 6a6ca3c88f..9752c691e1 100644 --- a/src/openrct2/paint/tile_element/large_scenery.c +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -14,10 +14,8 @@ *****************************************************************************/ #pragma endregion -#include "tile_element.h" -#include "../paint.h" -#include "../supports.h" #include "../../config/Config.h" +#include "../../core/Util.hpp" #include "../../Game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" @@ -25,6 +23,9 @@ #include "../../world/map.h" #include "../../world/LargeScenery.h" #include "../../world/scenery.h" +#include "../Paint.h" +#include "../Supports.h" +#include "TileElement.h" // 6B8172: static void large_scenery_paint_supports(paint_session * session, uint8 direction, uint16 height, rct_tile_element *tileElement, uint32 dword_F4387C, rct_large_scenery_tile *tile) @@ -62,8 +63,8 @@ static void large_scenery_paint_supports(paint_session * session, uint8 directio static rct_large_scenery_text_glyph *large_scenery_sign_get_glyph(rct_large_scenery_text *text, uint32 codepoint) { - if (codepoint >= countof(text->glyphs)) { - return &text->glyphs['?']; + if (codepoint >= Util::CountOf(text->glyphs)) { + return &text->glyphs[(size_t)'?']; } return &text->glyphs[codepoint]; } diff --git a/src/openrct2/paint/tile_element/path.c b/src/openrct2/paint/tile_element/Path.cpp similarity index 98% rename from src/openrct2/paint/tile_element/path.c rename to src/openrct2/paint/tile_element/Path.cpp index eb45ed01f6..b8bcd78a5f 100644 --- a/src/openrct2/paint/tile_element/path.c +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -24,10 +24,10 @@ #include "../../ride/track_paint.h" #include "../../world/footpath.h" #include "../../world/scenery.h" -#include "../paint.h" -#include "../supports.h" -#include "tile_element.h" -#include "surface.h" +#include "../Paint.h" +#include "../Supports.h" +#include "TileElement.h" +#include "Surface.h" #include "../../world/map.h" #include "../../drawing/lightfx.h" @@ -371,9 +371,9 @@ static void sub_6A4101(paint_session * session, rct_tile_element * tile_element, direction &= 3; LocationXYZ16 boundBoxOffsets = { - .x = BannerBoundBoxes[direction][0].x, - .y = BannerBoundBoxes[direction][0].y, - .z = height + 2 + BannerBoundBoxes[direction][0].x, + BannerBoundBoxes[direction][0].y, + static_cast(height + 2) }; uint32 imageId = (direction << 1) + base_image_id + 101; @@ -805,8 +805,8 @@ void path_paint_box_support(paint_session * session, rct_tile_element * tileElem (((tileElement->properties.path.edges >> 4) << get_current_rotation()) >> 4); - LocationXY16 boundBoxOffset = {.x =stru_98D804[edges][0], .y = stru_98D804[edges][1]}; - LocationXY16 boundBoxSize = {.x =stru_98D804[edges][2], .y = stru_98D804[edges][3]}; + LocationXY16 boundBoxOffset = {stru_98D804[edges][0], stru_98D804[edges][1]}; + LocationXY16 boundBoxSize = {stru_98D804[edges][2], stru_98D804[edges][3]}; uint16 edi = edges | (corners << 4); @@ -920,13 +920,13 @@ void path_paint_pole_support(paint_session * session, rct_tile_element* tileElem (((tileElement->properties.path.edges & 0xF) << get_current_rotation()) >> 4); LocationXY16 boundBoxOffset = { - .x = stru_98D804[edges][0], - .y = stru_98D804[edges][1] + stru_98D804[edges][0], + stru_98D804[edges][1] }; LocationXY16 boundBoxSize = { - .x = stru_98D804[edges][2], - .y = stru_98D804[edges][3] + stru_98D804[edges][2], + stru_98D804[edges][3] }; uint8 corners = (((tileElement->properties.path.edges >> 4) << get_current_rotation()) & 0xF) | diff --git a/src/openrct2/paint/tile_element/scenery.c b/src/openrct2/paint/tile_element/SmallScenery.cpp similarity index 99% rename from src/openrct2/paint/tile_element/scenery.c rename to src/openrct2/paint/tile_element/SmallScenery.cpp index 75c94d1613..364686baca 100644 --- a/src/openrct2/paint/tile_element/scenery.c +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -14,13 +14,13 @@ *****************************************************************************/ #pragma endregion -#include "tile_element.h" +#include "TileElement.h" #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" #include "../../localisation/date.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../Paint.h" +#include "../Supports.h" #include "../../world/map.h" #include "../../world/scenery.h" #include "../../world/SmallScenery.h" diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp index 79f19135c5..f175f5d92a 100644 --- a/src/openrct2/paint/tile_element/Surface.cpp +++ b/src/openrct2/paint/tile_element/Surface.cpp @@ -22,8 +22,8 @@ #include "../../interface/viewport.h" #include "../../peep/Staff.h" #include "../../sprites.h" -#include "surface.h" -#include "tile_element.h" +#include "Surface.h" +#include "TileElement.h" static constexpr const uint8 byte_97B444[] = { diff --git a/src/openrct2/paint/tile_element/surface.h b/src/openrct2/paint/tile_element/Surface.h similarity index 100% rename from src/openrct2/paint/tile_element/surface.h rename to src/openrct2/paint/tile_element/Surface.h diff --git a/src/openrct2/paint/tile_element/tile_element.c b/src/openrct2/paint/tile_element/TileElement.cpp similarity index 93% rename from src/openrct2/paint/tile_element/tile_element.c rename to src/openrct2/paint/tile_element/TileElement.cpp index f308a35364..543a86334e 100644 --- a/src/openrct2/paint/tile_element/tile_element.c +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -14,23 +14,25 @@ *****************************************************************************/ #pragma endregion -#include "../paint.h" -#include "../../interface/viewport.h" -#include "tile_element.h" +#include "../../config/Config.h" +#include "../../core/Math.hpp" #include "../../drawing/drawing.h" +#include "../../Game.h" +#include "../../interface/viewport.h" +#include "../../localisation/localisation.h" #include "../../ride/ride_data.h" #include "../../ride/TrackData.h" #include "../../ride/track_paint.h" -#include "../../config/Config.h" #include "../../world/sprite.h" -#include "../../world/banner.h" -#include "../../world/entrance.h" +#include "../../world/Banner.h" +#include "../../world/Entrance.h" #include "../../world/footpath.h" #include "../../world/scenery.h" #include "../../sprites.h" -#include "../../localisation/localisation.h" -#include "../../Game.h" -#include "../supports.h" +#include "../Paint.h" +#include "../Supports.h" +#include "TileElement.h" + #ifdef __TESTPAINT__ uint16 testPaintVerticalTunnelHeight; @@ -140,8 +142,8 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) session->LeftTunnelCount = 0; session->RightTunnelCount = 0; - session->LeftTunnels[0] = (tunnel_entry){0xFF, 0xFF}; - session->RightTunnels[0] = (tunnel_entry){0xFF, 0xFF}; + session->LeftTunnels[0] = {0xFF, 0xFF}; + session->RightTunnels[0] = {0xFF, 0xFF}; session->VerticalTunnelHeight = 0xFF; session->MapPosition.x = x; session->MapPosition.y = y; @@ -195,7 +197,7 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) session->SpritePosition.y = y; session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; - sub_98197C(session, imageId, 0, 0, 32, 32, 0xFF, arrowZ, 0, 0, arrowZ + 18, rotation); + sub_98197C(session, imageId, 0, 0, 32, 32, -1, arrowZ, 0, 0, arrowZ + 18, rotation); } sint32 bx = dx + 52; @@ -204,9 +206,9 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) const rct_tile_element* element = tile_element;//push tile_element - sint16 max_height = 0; + uint16 max_height = 0; do{ - max_height = max(max_height, element->clearance_height); + max_height = Math::Max(max_height, (uint16)element->clearance_height); } while (!tile_element_is_last_for_tile(element++)); element--; @@ -355,18 +357,18 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) void paint_util_push_tunnel_left(paint_session * session, uint16 height, uint8 type) { - session->LeftTunnels[session->LeftTunnelCount] = (tunnel_entry){.height = (height / 16), .type = type}; + session->LeftTunnels[session->LeftTunnelCount] = {static_cast((height / 16)), type}; if (session->LeftTunnelCount < TUNNEL_MAX_COUNT - 1) { - session->LeftTunnels[session->LeftTunnelCount + 1] = (tunnel_entry) {0xFF, 0xFF}; + session->LeftTunnels[session->LeftTunnelCount + 1] = {0xFF, 0xFF}; session->LeftTunnelCount++; } } void paint_util_push_tunnel_right(paint_session * session, uint16 height, uint8 type) { - session->RightTunnels[session->RightTunnelCount] = (tunnel_entry){.height = (height / 16), .type = type}; + session->RightTunnels[session->RightTunnelCount] = {static_cast((height / 16)), type}; if (session->RightTunnelCount < TUNNEL_MAX_COUNT - 1) { - session->RightTunnels[session->RightTunnelCount + 1] = (tunnel_entry) {0xFF, 0xFF}; + session->RightTunnels[session->RightTunnelCount + 1] = {0xFF, 0xFF}; session->RightTunnelCount++; } } diff --git a/src/openrct2/paint/tile_element/tile_element.h b/src/openrct2/paint/tile_element/TileElement.h similarity index 100% rename from src/openrct2/paint/tile_element/tile_element.h rename to src/openrct2/paint/tile_element/TileElement.h diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 807da9fee4..84a87cb56a 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -40,7 +40,7 @@ #include "../sprites.h" #include "../util/Util.h" #include "../world/Climate.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" #include "../world/footpath.h" #include "../world/map.h" #include "../world/LargeScenery.h" diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 8bbdf83b1f..5cafcd3a11 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -27,10 +27,10 @@ #include "../management/Finance.h" #include "../network/network.h" #include "../ObjectList.h" -#include "../paint/tile_element/tile_element.h" +#include "../paint/tile_element/TileElement.h" #include "../scenario/scenario.h" #include "../util/Util.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" #include "../world/footpath.h" #include "../world/scenery.h" #include "../world/sprite.h" diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index f35e3d34bf..6c27d44ded 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -22,7 +22,7 @@ #include "management/Research.h" #include "rct12.h" #include "ride/ride.h" -#include "world/banner.h" +#include "world/Banner.h" #include "world/map.h" #include "world/sprite.h" #include "world/map_animation.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 79a28bcb8f..67320f438a 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -57,7 +57,7 @@ #include "../world/footpath.h" #include "../world/map_animation.h" #include "../world/park.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" #include "../world/LargeScenery.h" #include "../world/scenery.h" #include "../world/SmallScenery.h" diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 30b6a890f7..ba2703ddf0 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -46,7 +46,7 @@ #include "../scenario/scenario.h" #include "../util/SawyerCoding.h" #include "../world/Climate.h" -#include "../world/entrance.h" +#include "../world/Entrance.h" #include "../world/map_animation.h" #include "../world/park.h" diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index a6f64878cb..a371a0d805 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index d684c8e129..8e399daaa6 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 36a5692bb3..08a9d36314 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index a96bf20f1c..858f5b77d3 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index b91fa313d1..e7adbe2308 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 2d75e148bb..8f9726b35d 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 2bc2703472..d20c4f5802 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 4b405b7982..5f326516a2 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 4d4ff40210..34e03dd674 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 1ae6578c35..9865aed725 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index bed35c670d..96a283acff 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index bbbaf17dc6..7bfe90f03b 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -19,8 +19,8 @@ #include "../../interface/viewport.h" #include "../../interface/window.h" #include "../../localisation/localisation.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/JuniorRollerCoaster.h index 88416d9ee3..05dde44cde 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.h @@ -18,7 +18,7 @@ #define _JUNIOR_ROLLER_COASTER_H #include "../../common.h" -#include "../../paint/tile_element/tile_element.h" +#include "../../paint/tile_element/TileElement.h" typedef enum JUNIOR_RC_CHAINTYPE { diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index e976edf60a..0228d965fe 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index d1271fb1d2..f086c7e41b 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index 64bc103c69..dc66d75744 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 3ca9339f1a..d3bac1916f 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index e510e7ff4c..c17a809197 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index f7030ba61b..20408fc8a2 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index dce2ca0351..34a7fd686a 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index fef0df812b..93559f438b 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 19752f1d6b..1238444fdb 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 74d4c890ae..3f541284d5 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 7f390c1a0a..171be6db77 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 93a5769a86..c2200f0fd3 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 1a8cea9902..a8e2baa7cc 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index bdfc70a6ec..76bc7ec09c 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index deaefc72db..e8f5e6e6e0 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index 3c11ffd81d..97b9b54309 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../drawing/drawing.h" -#include "../../paint/supports.h" +#include "../../paint/Supports.h" #include "../TrackData.h" #include "BolligerMabillardTrack.h" diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index bd99bc4398..30bdbd97ab 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -17,8 +17,8 @@ #include "../../common.h" #include "../../core/Util.hpp" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 7ef84825dd..c165a1bb1e 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 62c0298db8..450e2dcc39 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index 737900fbad..2edd7cd83a 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 6bd540f509..d726fc95cc 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../ride_data.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp index 0bb2e46383..3751ab4da4 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 88e2aa62be..3b91a96be4 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index d982022aa4..b8f300fed9 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index d3f1b9a005..fd5285b0ae 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index c2f9b90f60..8ded0f8c51 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index db950c77f7..f9cb397e51 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../ride_data.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 13709159fc..3343b4949c 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 4fe3ef2c7b..2cf23c7919 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -15,9 +15,9 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/tile_element/surface.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/Surface.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 7d113d04ca..7a15297c34 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index b1364412a0..e781c2695d 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -17,8 +17,8 @@ #include "../../config/Config.h" #include "../../core/Util.hpp" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../ride_data.h" #include "../TrackData.h" diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index e537201126..7c6c9fce43 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../ride_data.h" #include "../Track.h" diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index df0c806585..612c0db05e 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 20677ba12a..748ffd12e7 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index a2c94c69e7..bd53559273 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index 968751316c..e3ab911054 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index dd827919ea..81706a4ebe 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -40,7 +40,7 @@ #include "../scenario/scenario.h" #include "../util/Util.h" #include "../windows/Intent.h" -#include "../world/banner.h" +#include "../world/Banner.h" #include "../world/Climate.h" #include "../world/footpath.h" #include "../world/map.h" diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index 527938a5a9..7f6fdae426 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../Track.h" diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index 1fbf11abba..fc67bf4eb0 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../Track.h" diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 157f3cf728..7ae35f88c4 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 22625dc907..1ff1b6e799 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 342472b92a..648cc77b64 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index a84c01716a..bb3a3937ab 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -17,8 +17,8 @@ #include "../../common.h" #include "../../config/Config.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index 24b2d9433f..93c2b2b36e 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index e89eba01c8..0b6f2e211d 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index 32f994c5db..f87ce2eacf 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index c4acd20e00..935b810c05 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 9013a8c931..52ab7f281e 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 5cd8bea5ed..b48de21f9a 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -17,8 +17,8 @@ #include "../../core/Util.hpp" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 8b97f48055..3a4b7b4019 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index 941fe5499c..0c934b36a1 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -16,9 +16,9 @@ #include "../config/Config.h" #include "../drawing/drawing.h" -#include "../paint/supports.h" +#include "../paint/Supports.h" #include "../interface/viewport.h" -#include "../paint/paint.h" +#include "../paint/Paint.h" #include "../interface/window.h" #include "../localisation/localisation.h" #include "../sprites.h" @@ -27,7 +27,7 @@ #include "ride_data.h" #include "TrackData.h" #include "track_paint.h" -#include "../paint/tile_element/tile_element.h" +#include "../paint/tile_element/TileElement.h" /* rct2: 0x007667AC */ static LocationXY16 loc_7667AC[] = { diff --git a/src/openrct2/ride/track_paint.h b/src/openrct2/ride/track_paint.h index e59139490e..401ddd84aa 100644 --- a/src/openrct2/ride/track_paint.h +++ b/src/openrct2/ride/track_paint.h @@ -19,8 +19,8 @@ #include "ride_data.h" #include "../common.h" -#include "../paint/tile_element/tile_element.h" -#include "../paint/paint.h" +#include "../paint/tile_element/TileElement.h" +#include "../paint/Paint.h" #include "../world/map.h" #ifdef __cplusplus diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index 418b886e69..1881b6d9a8 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../ride.h" #include "../ride_data.h" diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index b9da66e781..2303fe6813 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 2c942563cc..da304a51e7 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../ride_data.h" diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 4199b79d47..ba711087d4 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -16,8 +16,8 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../ride_data.h" #include "../Track.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 84d7fd2053..313921fe73 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -16,9 +16,9 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/tile_element/tile_element.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/tile_element/TileElement.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/map.h" #include "../../world/sprite.h" diff --git a/src/openrct2/ride/vehicle_paint.c b/src/openrct2/ride/vehicle_paint.c index df5097dc6f..7981a329f5 100644 --- a/src/openrct2/ride/vehicle_paint.c +++ b/src/openrct2/ride/vehicle_paint.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../paint/paint.h" +#include "../paint/Paint.h" #include "../drawing/drawing.h" #include "../world/sprite.h" #include "../ride/ride_data.h" diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index 6ee09dab25..e0ae831b8e 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -16,7 +16,7 @@ #include "../../common.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" +#include "../../paint/Paint.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index 22e89fa0dc..1e4ee5a47d 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index 891b4ca309..9dd2ad7af1 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index 22601cb8a2..eb0cd7401a 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -17,8 +17,8 @@ #include "../../config/Config.h" #include "../../Game.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/map.h" #include "../../world/sprite.h" #include "../Track.h" diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 84eaaed942..4b55c14c8d 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -16,8 +16,8 @@ #include "../../config/Config.h" #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 8cabfdbb64..d5faa9388e 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -15,8 +15,8 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/paint.h" -#include "../../paint/supports.h" +#include "../../paint/Paint.h" +#include "../../paint/Supports.h" #include "../ride_data.h" #include "../Track.h" #include "../track_paint.h" diff --git a/src/openrct2/scenario/scenario.h b/src/openrct2/scenario/scenario.h index e8f17d196b..36fb362ccb 100644 --- a/src/openrct2/scenario/scenario.h +++ b/src/openrct2/scenario/scenario.h @@ -25,7 +25,7 @@ #include "../rct2.h" #include "../ride/ride.h" #include "../ride/ride_ratings.h" -#include "../world/banner.h" +#include "../world/Banner.h" #include "../world/map.h" #include "../world/map_animation.h" #include "../world/sprite.h" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 7477fae554..774209e55d 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -22,7 +22,7 @@ #include "../core/String.hpp" #include "../network/network.h" -#include "banner.h" +#include "Banner.h" #include "map.h" #include "park.h" #include "scenery.h" diff --git a/src/openrct2/world/banner.h b/src/openrct2/world/Banner.h similarity index 100% rename from src/openrct2/world/banner.h rename to src/openrct2/world/Banner.h diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index fe8fefc3ad..f1d9b793e9 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -17,7 +17,7 @@ #include "../network/network.h" #include "../OpenRCT2.h" -#include "entrance.h" +#include "Entrance.h" #include "footpath.h" #include "map.h" #include "park.h" diff --git a/src/openrct2/world/entrance.h b/src/openrct2/world/Entrance.h similarity index 100% rename from src/openrct2/world/entrance.h rename to src/openrct2/world/Entrance.h diff --git a/src/openrct2/world/Particle.cpp b/src/openrct2/world/Particle.cpp index 9b4d458aa9..0f85302301 100644 --- a/src/openrct2/world/Particle.cpp +++ b/src/openrct2/world/Particle.cpp @@ -17,7 +17,7 @@ #include "../audio/audio.h" #include "../core/Util.hpp" #include "../scenario/scenario.h" -#include "../paint/sprite/sprite.h" +#include "../paint/sprite/Sprite.h" #include "sprite.h" /** diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index 5be0bf3e8a..e4a16777fc 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -32,7 +32,7 @@ #include "../scenario/scenario.h" #include "../util/Util.h" #include "../windows/Intent.h" -#include "banner.h" +#include "Banner.h" #include "Climate.h" #include "footpath.h" #include "LargeScenery.h" diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c index 9283f1df60..94ab39112e 100644 --- a/src/openrct2/world/park.c +++ b/src/openrct2/world/park.c @@ -33,7 +33,7 @@ #include "../ride/ride_data.h" #include "../scenario/scenario.h" #include "../world/map.h" -#include "entrance.h" +#include "Entrance.h" #include "park.h" #include "sprite.h" diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index 319be66bb2..8d2cacbf13 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -61,8 +61,8 @@ file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c" "${OPENRCT2_SRCPATH}/rct2/addresses.c" "${OPENRCT2_SRCPATH}/Diagnostic.cpp" "${OPENRCT2_SRCPATH}/rct2/hook.c" - "${OPENRCT2_SRCPATH}/paint/tile_element/tile_element.c" - "${OPENRCT2_SRCPATH}/paint/paint_helpers.c") + "${OPENRCT2_SRCPATH}/paint/tile_element/TileElement.cpp" + "${OPENRCT2_SRCPATH}/paint/PaintHelpers.cpp") file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.c" "${CMAKE_CURRENT_LIST_DIR}/*.cpp" "${CMAKE_CURRENT_LIST_DIR}/*.h") diff --git a/test/testpaint/PaintIntercept.cpp b/test/testpaint/PaintIntercept.cpp index 45b5fbe4dc..357b2ed919 100644 --- a/test/testpaint/PaintIntercept.cpp +++ b/test/testpaint/PaintIntercept.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include paint_session gPaintSession; diff --git a/test/testpaint/SegmentSupportHeightCall.cpp b/test/testpaint/SegmentSupportHeightCall.cpp index 99749d496b..4eebb7942c 100644 --- a/test/testpaint/SegmentSupportHeightCall.cpp +++ b/test/testpaint/SegmentSupportHeightCall.cpp @@ -19,7 +19,7 @@ #include "SegmentSupportHeightCall.hpp" -#include +#include static bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs) { diff --git a/test/testpaint/SegmentSupportHeightCall.hpp b/test/testpaint/SegmentSupportHeightCall.hpp index e50749d110..bd73eab37f 100644 --- a/test/testpaint/SegmentSupportHeightCall.hpp +++ b/test/testpaint/SegmentSupportHeightCall.hpp @@ -21,7 +21,7 @@ #include extern "C" { - #include + #include } struct SegmentSupportCall diff --git a/test/testpaint/SideTunnelCall.hpp b/test/testpaint/SideTunnelCall.hpp index 39eb003be8..d831dd6485 100644 --- a/test/testpaint/SideTunnelCall.hpp +++ b/test/testpaint/SideTunnelCall.hpp @@ -19,7 +19,7 @@ #include extern "C" { -#include +#include } enum { diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp index 9077a3efac..ff3ae0726c 100644 --- a/test/testpaint/TestPaint.cpp +++ b/test/testpaint/TestPaint.cpp @@ -24,8 +24,8 @@ #include "TestPaint.hpp" #include "Utils.hpp" -#include -#include +#include +#include #include #include diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index 22968bca0b..03c2b7d816 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -24,8 +24,8 @@ extern "C" { #include #include - #include - #include + #include + #include } #include "addresses.h" diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index de87ced9f0..3c6603e1b6 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -29,8 +29,8 @@ #include "Utils.hpp" #include "VerticalTunnelCall.hpp" -#include -#include +#include +#include #include #include #include diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index c3d815d98e..1c0437150c 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "addresses.h"