From cd5a1ba8880f31e0d2e2518247a58da0d728c3be Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 11 Jan 2018 10:59:26 +0100 Subject: [PATCH] Compile files in world folder as C++ --- OpenRCT2.xcodeproj/project.pbxproj | 234 +++++++++--------- src/openrct2-ui/input/MouseInput.cpp | 4 +- src/openrct2-ui/windows/Banner.cpp | 2 +- src/openrct2-ui/windows/ClearScenery.cpp | 2 +- .../windows/EditorBottomToolbar.cpp | 2 +- .../windows/EditorInventionsList.cpp | 2 +- src/openrct2-ui/windows/EditorMain.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/Main.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 4 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/Sign.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 4 +- src/openrct2-ui/windows/TopToolbar.cpp | 4 +- src/openrct2/Cheats.cpp | 6 +- src/openrct2/EditorObjectSelectionSession.cpp | 2 +- src/openrct2/Game.cpp | 10 +- .../actions/PlaceParkEntranceAction.hpp | 2 +- src/openrct2/drawing/Drawing.cpp | 2 +- src/openrct2/interface/Console.cpp | 2 +- src/openrct2/interface/Viewport.cpp | 6 +- src/openrct2/interface/Viewport.h | 2 +- .../interface/ViewportInteraction.cpp | 6 +- src/openrct2/interface/Window.cpp | 2 +- src/openrct2/management/Finance.cpp | 2 +- src/openrct2/management/NewsItem.cpp | 2 +- src/openrct2/management/Research.cpp | 2 +- src/openrct2/network/NetworkPlayer.h | 2 +- src/openrct2/network/Twitch.cpp | 2 +- src/openrct2/object/BannerObject.h | 2 +- src/openrct2/object/FootpathItemObject.h | 2 +- src/openrct2/object/FootpathObject.cpp | 2 +- src/openrct2/object/FootpathObject.h | 2 +- src/openrct2/object/LargeSceneryObject.h | 2 +- src/openrct2/object/ObjectList.h | 6 +- src/openrct2/object/SceneryGroupObject.h | 2 +- src/openrct2/object/SmallSceneryObject.cpp | 2 +- src/openrct2/object/SmallSceneryObject.h | 2 +- src/openrct2/object/WallObject.h | 2 +- src/openrct2/object/WaterObject.h | 2 +- src/openrct2/paint/Supports.h | 2 +- src/openrct2/paint/sprite/Litter.cpp | 2 +- src/openrct2/paint/sprite/Misc.cpp | 2 +- src/openrct2/paint/sprite/Peep.cpp | 2 +- src/openrct2/paint/sprite/Sprite.cpp | 2 +- src/openrct2/paint/sprite/Sprite.h | 2 +- src/openrct2/paint/tile_element/Banner.cpp | 2 +- src/openrct2/paint/tile_element/Entrance.cpp | 2 +- src/openrct2/paint/tile_element/Fence.cpp | 2 +- .../paint/tile_element/LargeScenery.cpp | 2 +- src/openrct2/paint/tile_element/Path.cpp | 4 +- .../paint/tile_element/SmallScenery.cpp | 2 +- .../paint/tile_element/TileElement.cpp | 6 +- src/openrct2/peep/Peep.cpp | 6 +- src/openrct2/peep/PeepData.cpp | 2 +- src/openrct2/peep/Staff.cpp | 6 +- src/openrct2/rct1/RCT1.h | 4 +- src/openrct2/rct1/S4Importer.cpp | 6 +- src/openrct2/rct2/S6Exporter.cpp | 4 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/CableLift.cpp | 2 +- src/openrct2/ride/Ride.cpp | 8 +- src/openrct2/ride/Track.cpp | 6 +- src/openrct2/ride/TrackDesign.cpp | 4 +- src/openrct2/ride/TrackPaint.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 6 +- src/openrct2/ride/VehiclePaint.cpp | 2 +- .../coaster/AirPoweredVerticalCoaster.cpp | 2 +- .../ride/coaster/BobsleighCoaster.cpp | 2 +- .../ride/coaster/BolligerMabillardTrack.cpp | 2 +- .../ride/coaster/CompactInvertedCoaster.cpp | 2 +- .../ride/coaster/CorkscrewRollerCoaster.cpp | 2 +- .../ride/coaster/FlyingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/GigaCoaster.cpp | 2 +- .../ride/coaster/HeartlineTwisterCoaster.cpp | 2 +- .../ride/coaster/InvertedHairpinCoaster.cpp | 2 +- .../ride/coaster/InvertedImpulseCoaster.cpp | 2 +- .../ride/coaster/InvertedRollerCoaster.cpp | 2 +- .../ride/coaster/JuniorRollerCoaster.cpp | 2 +- .../ride/coaster/LayDownRollerCoaster.cpp | 2 +- .../ride/coaster/LimLaunchedRollerCoaster.cpp | 2 +- .../ride/coaster/LoopingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/MineRide.cpp | 2 +- .../ride/coaster/MineTrainCoaster.cpp | 2 +- .../ride/coaster/MiniRollerCoaster.cpp | 2 +- .../ride/coaster/MiniSuspendedCoaster.cpp | 2 +- .../coaster/MultiDimensionRollerCoaster.cpp | 2 +- .../ride/coaster/ReverseFreefallCoaster.cpp | 2 +- .../ride/coaster/ReverserRollerCoaster.cpp | 2 +- .../coaster/SideFrictionRollerCoaster.cpp | 2 +- .../ride/coaster/StandUpRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/Steeplechase.cpp | 2 +- .../ride/coaster/SuspendedSwingingCoaster.cpp | 2 +- .../ride/coaster/TwisterRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/WildMouse.cpp | 2 +- .../ride/coaster/WoodenRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 2 +- src/openrct2/ride/ride_ratings.c | 2 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 2 +- src/openrct2/ride/track_design_save.c | 4 +- .../ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/ride/water/DingySlide.cpp | 2 +- src/openrct2/ride/water/LogFlume.cpp | 2 +- src/openrct2/ride/water/RiverRapids.cpp | 2 +- src/openrct2/ride/water/SplashBoats.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 6 +- src/openrct2/scenario/Scenario.h | 4 +- src/openrct2/title/TitleSequencePlayer.cpp | 2 +- src/openrct2/windows/_legacy.c | 2 +- src/openrct2/world/Balloon.cpp | 2 +- src/openrct2/world/Banner.cpp | 2 +- src/openrct2/world/Duck.cpp | 2 +- src/openrct2/world/Entrance.cpp | 2 +- .../world/{footpath.c => Footpath.cpp} | 12 +- src/openrct2/world/{footpath.h => Footpath.h} | 0 src/openrct2/world/Fountain.cpp | 6 +- src/openrct2/world/Fountain.h | 2 +- src/openrct2/world/Map.cpp | 6 +- .../{map_animation.c => MapAnimation.cpp} | 30 ++- .../world/{map_animation.h => MapAnimation.h} | 0 src/openrct2/world/MapGen.cpp | 4 +- .../world/{map_helpers.c => MapHelpers.cpp} | 54 ++-- .../world/{map_helpers.h => MapHelpers.h} | 0 src/openrct2/world/MoneyEffect.cpp | 2 +- src/openrct2/world/Park.cpp | 2 +- src/openrct2/world/Particle.cpp | 2 +- src/openrct2/world/{scenery.c => Scenery.cpp} | 4 +- src/openrct2/world/{scenery.h => Scenery.h} | 0 src/openrct2/world/SmallScenery.cpp | 4 +- src/openrct2/world/SmallScenery.h | 2 +- src/openrct2/world/{sprite.c => Sprite.cpp} | 15 +- src/openrct2/world/{sprite.h => Sprite.h} | 0 src/openrct2/world/TileInspector.cpp | 2 +- src/openrct2/world/Wall.cpp | 2 +- src/openrct2/world/{water.h => Water.h} | 0 test/testpaint/compat.c | 2 +- test/testpaint/generate.cpp | 2 +- 144 files changed, 353 insertions(+), 350 deletions(-) rename src/openrct2/world/{footpath.c => Footpath.cpp} (99%) rename src/openrct2/world/{footpath.h => Footpath.h} (100%) rename src/openrct2/world/{map_animation.c => MapAnimation.cpp} (98%) rename src/openrct2/world/{map_animation.h => MapAnimation.h} (100%) rename src/openrct2/world/{map_helpers.c => MapHelpers.cpp} (87%) rename src/openrct2/world/{map_helpers.h => MapHelpers.h} (100%) rename src/openrct2/world/{scenery.c => Scenery.cpp} (99%) rename src/openrct2/world/{scenery.h => Scenery.h} (100%) rename src/openrct2/world/{sprite.c => Sprite.cpp} (99%) rename src/openrct2/world/{sprite.h => Sprite.h} (100%) rename src/openrct2/world/{water.h => Water.h} (100%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 35a1ed76c8..1a60b235bd 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -21,7 +21,6 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 4C31B2E41FB6115600F6A38A /* MapGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C31B2E21FB6115600F6A38A /* MapGen.cpp */; }; 4C4C1E981F58226500560300 /* TrackDesign.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C4C1E971F58226500560300 /* TrackDesign.cpp */; }; 4C5DFF421FAC69D200CB093A /* Date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C5DFF401FAC69D200CB093A /* Date.cpp */; }; 4C6A668E1FE14C3A00694CB6 /* SawyerCoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A668A1FE14C3A00694CB6 /* SawyerCoding.cpp */; }; @@ -48,12 +47,7 @@ 4C6A66C21FF9322A00694CB6 /* Ride.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C6A66BF1FF9322A00694CB6 /* Ride.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 */; }; - 4C729BC51FC2E5F3001DFF2F /* TileInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BC31FC2E5F3001DFF2F /* TileInspector.cpp */; }; - 4C729BC71FC2E6AB001DFF2F /* Particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BC61FC2E6AB001DFF2F /* Particle.cpp */; }; - 4C729BC91FC2E6E9001DFF2F /* MoneyEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C729BC81FC2E6E9001DFF2F /* MoneyEffect.cpp */; }; 4C7B53A51FFC180400A52E21 /* ObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A31FFC180400A52E21 /* ObjectList.cpp */; }; - 4C7B53A81FFD15B200A52E21 /* Map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53A61FFD15B200A52E21 /* Map.cpp */; }; 4C7B53BC1FFF935B00A52E21 /* Convert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */; }; 4C7B53BD1FFF935B00A52E21 /* Currency.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */; }; 4C7B53BE1FFF935B00A52E21 /* Date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AD1FFF935B00A52E21 /* Date.cpp */; }; @@ -89,6 +83,26 @@ 4C7B540D20060D8100A52E21 /* TrackPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B540B20060D8100A52E21 /* TrackPaint.cpp */; }; 4C7B541C20060D8E00A52E21 /* RideData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B541420060D8E00A52E21 /* RideData.cpp */; }; 4C7B540120015AC600A52E21 /* VirtualFloor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B540020015AC600A52E21 /* VirtualFloor.cpp */; }; + 4C7B54432007646A00A52E21 /* Balloon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B541D2007646A00A52E21 /* Balloon.cpp */; }; + 4C7B54442007646A00A52E21 /* Banner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B541E2007646A00A52E21 /* Banner.cpp */; }; + 4C7B54452007646A00A52E21 /* Climate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54202007646A00A52E21 /* Climate.cpp */; }; + 4C7B54462007646A00A52E21 /* Duck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54222007646A00A52E21 /* Duck.cpp */; }; + 4C7B54472007646A00A52E21 /* Entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54232007646A00A52E21 /* Entrance.cpp */; }; + 4C7B54482007646A00A52E21 /* Footpath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54252007646A00A52E21 /* Footpath.cpp */; }; + 4C7B54492007646A00A52E21 /* Fountain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54272007646A00A52E21 /* Fountain.cpp */; }; + 4C7B544A2007646A00A52E21 /* LargeScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54292007646A00A52E21 /* LargeScenery.cpp */; }; + 4C7B544B2007646A00A52E21 /* Map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B542C2007646A00A52E21 /* Map.cpp */; }; + 4C7B544C2007646A00A52E21 /* MapAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B542E2007646A00A52E21 /* MapAnimation.cpp */; }; + 4C7B544D2007646A00A52E21 /* MapGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54302007646A00A52E21 /* MapGen.cpp */; }; + 4C7B544E2007646A00A52E21 /* MapHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54322007646A00A52E21 /* MapHelpers.cpp */; }; + 4C7B544F2007646A00A52E21 /* MoneyEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54342007646A00A52E21 /* MoneyEffect.cpp */; }; + 4C7B54502007646A00A52E21 /* Park.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54352007646A00A52E21 /* Park.cpp */; }; + 4C7B54512007646A00A52E21 /* Particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54372007646A00A52E21 /* Particle.cpp */; }; + 4C7B54522007646A00A52E21 /* Scenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54382007646A00A52E21 /* Scenery.cpp */; }; + 4C7B54532007646A00A52E21 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B543A2007646A00A52E21 /* SmallScenery.cpp */; }; + 4C7B54542007646A00A52E21 /* Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B543C2007646A00A52E21 /* Sprite.cpp */; }; + 4C7B54552007646A00A52E21 /* TileInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B543E2007646A00A52E21 /* TileInspector.cpp */; }; + 4C7B54562007646A00A52E21 /* Wall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54402007646A00A52E21 /* Wall.cpp */; }; 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */; }; 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */; }; 4C8B42721EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B42711EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp */; }; @@ -183,7 +197,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 */; }; - 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 */; }; 4CFE4E821F90A3F1005243C2 /* Staff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7E1F90A3F1005243C2 /* Staff.cpp */; }; @@ -440,18 +453,6 @@ F76C87911EC4E88400FA49E2 /* (null) in Sources */ = {isa = PBXBuildFile; }; F76C87921EC4E88400FA49E2 /* (null) in Sources */ = {isa = PBXBuildFile; }; F76C87931EC4E88400FA49E2 /* (null) in Sources */ = {isa = PBXBuildFile; }; - F76C87941EC4E88400FA49E2 /* Balloon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C855C1EC4E7CD00FA49E2 /* Balloon.cpp */; }; - F76C87951EC4E88400FA49E2 /* Banner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C855D1EC4E7CD00FA49E2 /* Banner.cpp */; }; - F76C87971EC4E88400FA49E2 /* Climate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C855F1EC4E7CD00FA49E2 /* Climate.cpp */; }; - F76C87991EC4E88400FA49E2 /* Duck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85611EC4E7CD00FA49E2 /* Duck.cpp */; }; - F76C879A1EC4E88400FA49E2 /* Entrance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85621EC4E7CD00FA49E2 /* Entrance.cpp */; }; - F76C879C1EC4E88400FA49E2 /* footpath.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85641EC4E7CD00FA49E2 /* footpath.c */; }; - F76C879E1EC4E88400FA49E2 /* Fountain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85661EC4E7CD00FA49E2 /* Fountain.cpp */; }; - F76C87A21EC4E88400FA49E2 /* map_animation.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C856A1EC4E7CD00FA49E2 /* map_animation.c */; }; - F76C87A41EC4E88500FA49E2 /* map_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C856C1EC4E7CD00FA49E2 /* map_helpers.c */; }; - F76C87AC1EC4E88500FA49E2 /* scenery.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85741EC4E7CD00FA49E2 /* scenery.c */; }; - F76C87AE1EC4E88500FA49E2 /* sprite.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C85761EC4E7CD00FA49E2 /* sprite.c */; }; - F76C87B21EC4E88500FA49E2 /* Wall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C857A1EC4E7CD00FA49E2 /* Wall.cpp */; }; F76C88781EC5324E00FA49E2 /* AudioChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85821EC4E82600FA49E2 /* AudioChannel.cpp */; }; F76C88791EC5324E00FA49E2 /* AudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85831EC4E82600FA49E2 /* AudioContext.cpp */; }; F76C887A1EC5324E00FA49E2 /* AudioMixer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85861EC4E82600FA49E2 /* AudioMixer.cpp */; }; @@ -479,8 +480,6 @@ F775F5351EE35A89001F00E7 /* DummyUiContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F775F5331EE35A6B001F00E7 /* DummyUiContext.cpp */; }; F775F5371EE3724F001F00E7 /* DummyAudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F775F5361EE3724F001F00E7 /* DummyAudioContext.cpp */; }; F775F5381EE3725C001F00E7 /* DummyAudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F775F5361EE3724F001F00E7 /* DummyAudioContext.cpp */; }; - F79F42881F2E07E1009E42F8 /* Park.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F79F42871F2E07E1009E42F8 /* Park.cpp */; }; - F79F42891F2E0837009E42F8 /* Park.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F79F42871F2E07E1009E42F8 /* Park.cpp */; }; F79F428F1F3260F1009E42F8 /* changelog.txt in Resources */ = {isa = PBXBuildFile; fileRef = F79F428E1F3260F1009E42F8 /* changelog.txt */; }; F7CB863F1EEDA0B50030C877 /* WindowManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7CB863D1EEDA0B50030C877 /* WindowManager.cpp */; }; F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7CB86471EEDA1330030C877 /* KeyboardShortcuts.cpp */; }; @@ -603,9 +602,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 4C31B2E21FB6115600F6A38A /* MapGen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapGen.cpp; sourceTree = ""; }; - 4C31B2E31FB6115600F6A38A /* MapGen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapGen.h; sourceTree = ""; }; - 4C31B2E51FB6116100F6A38A /* Location.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Location.h; sourceTree = ""; }; 4C4C1E971F58226500560300 /* TrackDesign.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackDesign.cpp; sourceTree = ""; }; 4C4C1E991F5832AA00560300 /* TrackDesign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackDesign.h; sourceTree = ""; }; 4C5DFF401FAC69D200CB093A /* Date.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Date.cpp; sourceTree = ""; }; @@ -647,20 +643,9 @@ 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 = ""; }; 4C6AC2111F9E1CB3004324AA /* CableLift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CableLift.h; sourceTree = ""; }; - 4C729BBE1FC2E1BE001DFF2F /* LargeScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LargeScenery.cpp; sourceTree = ""; }; - 4C729BBF1FC2E1BE001DFF2F /* LargeScenery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LargeScenery.h; sourceTree = ""; }; - 4C729BC11FC2E1C9001DFF2F /* Wall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Wall.h; sourceTree = ""; }; - 4C729BC21FC2E1CF001DFF2F /* SmallScenery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallScenery.h; sourceTree = ""; }; - 4C729BC31FC2E5F3001DFF2F /* TileInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileInspector.cpp; sourceTree = ""; }; - 4C729BC41FC2E5F3001DFF2F /* TileInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileInspector.h; sourceTree = ""; }; - 4C729BC61FC2E6AB001DFF2F /* Particle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Particle.cpp; sourceTree = ""; }; - 4C729BC81FC2E6E9001DFF2F /* MoneyEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MoneyEffect.cpp; sourceTree = ""; }; 4C7B53A21FFC15ED00A52E21 /* ObjectLimits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectLimits.h; sourceTree = ""; }; 4C7B53A31FFC180400A52E21 /* ObjectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectList.cpp; sourceTree = ""; }; 4C7B53A41FFC180400A52E21 /* ObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectList.h; sourceTree = ""; }; - 4C7B53A61FFD15B200A52E21 /* Map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Map.cpp; sourceTree = ""; }; - 4C7B53A71FFD15B200A52E21 /* Map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Map.h; sourceTree = ""; }; - 4C7B53A91FFD15BB00A52E21 /* Park.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Park.h; sourceTree = ""; }; 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Convert.cpp; sourceTree = ""; }; 4C7B53AB1FFF935B00A52E21 /* Currency.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Currency.cpp; sourceTree = ""; }; 4C7B53AC1FFF935B00A52E21 /* Currency.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Currency.h; sourceTree = ""; }; @@ -724,6 +709,44 @@ 4C7B541420060D8E00A52E21 /* RideData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideData.cpp; sourceTree = ""; }; 4C7B541520060D8E00A52E21 /* RideData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideData.h; sourceTree = ""; }; 4C7B540020015AC600A52E21 /* VirtualFloor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualFloor.cpp; sourceTree = ""; }; + 4C7B541D2007646A00A52E21 /* Balloon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Balloon.cpp; sourceTree = ""; }; + 4C7B541E2007646A00A52E21 /* Banner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Banner.cpp; sourceTree = ""; }; + 4C7B541F2007646A00A52E21 /* Banner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Banner.h; sourceTree = ""; }; + 4C7B54202007646A00A52E21 /* Climate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Climate.cpp; sourceTree = ""; }; + 4C7B54212007646A00A52E21 /* Climate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Climate.h; sourceTree = ""; }; + 4C7B54222007646A00A52E21 /* Duck.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Duck.cpp; sourceTree = ""; }; + 4C7B54232007646A00A52E21 /* Entrance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Entrance.cpp; sourceTree = ""; }; + 4C7B54242007646A00A52E21 /* Entrance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Entrance.h; sourceTree = ""; }; + 4C7B54252007646A00A52E21 /* Footpath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Footpath.cpp; sourceTree = ""; }; + 4C7B54262007646A00A52E21 /* Footpath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Footpath.h; sourceTree = ""; }; + 4C7B54272007646A00A52E21 /* Fountain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Fountain.cpp; sourceTree = ""; }; + 4C7B54282007646A00A52E21 /* Fountain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fountain.h; sourceTree = ""; }; + 4C7B54292007646A00A52E21 /* LargeScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LargeScenery.cpp; sourceTree = ""; }; + 4C7B542A2007646A00A52E21 /* LargeScenery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LargeScenery.h; sourceTree = ""; }; + 4C7B542B2007646A00A52E21 /* Location.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Location.h; sourceTree = ""; }; + 4C7B542C2007646A00A52E21 /* Map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Map.cpp; sourceTree = ""; }; + 4C7B542D2007646A00A52E21 /* Map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Map.h; sourceTree = ""; }; + 4C7B542E2007646A00A52E21 /* MapAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapAnimation.cpp; sourceTree = ""; }; + 4C7B542F2007646A00A52E21 /* MapAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapAnimation.h; sourceTree = ""; }; + 4C7B54302007646A00A52E21 /* MapGen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapGen.cpp; sourceTree = ""; }; + 4C7B54312007646A00A52E21 /* MapGen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapGen.h; sourceTree = ""; }; + 4C7B54322007646A00A52E21 /* MapHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapHelpers.cpp; sourceTree = ""; }; + 4C7B54332007646A00A52E21 /* MapHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapHelpers.h; sourceTree = ""; }; + 4C7B54342007646A00A52E21 /* MoneyEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MoneyEffect.cpp; sourceTree = ""; }; + 4C7B54352007646A00A52E21 /* Park.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Park.cpp; sourceTree = ""; }; + 4C7B54362007646A00A52E21 /* Park.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Park.h; sourceTree = ""; }; + 4C7B54372007646A00A52E21 /* Particle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Particle.cpp; sourceTree = ""; }; + 4C7B54382007646A00A52E21 /* Scenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scenery.cpp; sourceTree = ""; }; + 4C7B54392007646A00A52E21 /* Scenery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scenery.h; sourceTree = ""; }; + 4C7B543A2007646A00A52E21 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = ""; }; + 4C7B543B2007646A00A52E21 /* SmallScenery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallScenery.h; sourceTree = ""; }; + 4C7B543C2007646A00A52E21 /* Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sprite.cpp; sourceTree = ""; }; + 4C7B543D2007646A00A52E21 /* Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sprite.h; sourceTree = ""; }; + 4C7B543E2007646A00A52E21 /* TileInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileInspector.cpp; sourceTree = ""; }; + 4C7B543F2007646A00A52E21 /* TileInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileInspector.h; sourceTree = ""; }; + 4C7B54402007646A00A52E21 /* Wall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Wall.cpp; sourceTree = ""; }; + 4C7B54412007646A00A52E21 /* Wall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Wall.h; sourceTree = ""; }; + 4C7B54422007646A00A52E21 /* Water.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Water.h; sourceTree = ""; }; 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = ""; }; 4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = ""; }; 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = ""; }; @@ -834,7 +857,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 = ""; }; - 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 = ""; }; 4CFE4E7D1F90A3F1005243C2 /* PeepData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeepData.cpp; sourceTree = ""; }; @@ -1339,28 +1361,6 @@ F76C850B1EC4E7CD00FA49E2 /* Version.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Version.cpp; sourceTree = ""; }; F76C850C1EC4E7CD00FA49E2 /* Version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Version.h; sourceTree = ""; }; 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 = ""; }; - 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 = ""; }; - F76C85621EC4E7CD00FA49E2 /* Entrance.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Entrance.cpp; sourceTree = ""; }; - F76C85631EC4E7CD00FA49E2 /* entrance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = entrance.h; sourceTree = ""; }; - F76C85641EC4E7CD00FA49E2 /* footpath.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = footpath.c; sourceTree = ""; }; - F76C85651EC4E7CD00FA49E2 /* footpath.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = footpath.h; sourceTree = ""; }; - F76C85661EC4E7CD00FA49E2 /* Fountain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Fountain.cpp; sourceTree = ""; }; - F76C85671EC4E7CD00FA49E2 /* Fountain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fountain.h; sourceTree = ""; }; - F76C856A1EC4E7CD00FA49E2 /* map_animation.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map_animation.c; sourceTree = ""; }; - F76C856B1EC4E7CD00FA49E2 /* map_animation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = map_animation.h; sourceTree = ""; }; - F76C856C1EC4E7CD00FA49E2 /* map_helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map_helpers.c; sourceTree = ""; }; - F76C856D1EC4E7CD00FA49E2 /* map_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = map_helpers.h; sourceTree = ""; }; - F76C85741EC4E7CD00FA49E2 /* scenery.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = scenery.c; sourceTree = ""; }; - F76C85751EC4E7CD00FA49E2 /* scenery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = scenery.h; sourceTree = ""; }; - F76C85761EC4E7CD00FA49E2 /* sprite.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sprite.c; sourceTree = ""; }; - F76C85771EC4E7CD00FA49E2 /* sprite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = ""; }; - F76C857A1EC4E7CD00FA49E2 /* Wall.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Wall.cpp; sourceTree = ""; }; - F76C857B1EC4E7CD00FA49E2 /* water.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = water.h; sourceTree = ""; }; F76C857D1EC4E80E00FA49E2 /* Cli.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Cli.cpp; sourceTree = ""; }; F76C85821EC4E82600FA49E2 /* AudioChannel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioChannel.cpp; sourceTree = ""; }; F76C85831EC4E82600FA49E2 /* AudioContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioContext.cpp; sourceTree = ""; }; @@ -1404,7 +1404,6 @@ F775F5321EE35A48001F00E7 /* Ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ui.h; sourceTree = ""; }; F775F5331EE35A6B001F00E7 /* DummyUiContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DummyUiContext.cpp; sourceTree = ""; }; F775F5361EE3724F001F00E7 /* DummyAudioContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DummyAudioContext.cpp; sourceTree = ""; }; - F79F42871F2E07E1009E42F8 /* Park.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Park.cpp; sourceTree = ""; }; F79F428E1F3260F1009E42F8 /* changelog.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = changelog.txt; path = distribution/changelog.txt; sourceTree = SOURCE_ROOT; }; F7CB863D1EEDA0B50030C877 /* WindowManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowManager.cpp; sourceTree = ""; }; F7CB863E1EEDA0B50030C877 /* WindowManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowManager.h; sourceTree = ""; }; @@ -2506,44 +2505,44 @@ F76C855B1EC4E7CD00FA49E2 /* world */ = { isa = PBXGroup; children = ( - F76C855C1EC4E7CD00FA49E2 /* Balloon.cpp */, - F76C855D1EC4E7CD00FA49E2 /* Banner.cpp */, - F76C855E1EC4E7CD00FA49E2 /* Banner.h */, - F76C855F1EC4E7CD00FA49E2 /* Climate.cpp */, - F76C85601EC4E7CD00FA49E2 /* Climate.h */, - F76C85611EC4E7CD00FA49E2 /* Duck.cpp */, - F76C85621EC4E7CD00FA49E2 /* Entrance.cpp */, - F76C85631EC4E7CD00FA49E2 /* entrance.h */, - F76C85641EC4E7CD00FA49E2 /* footpath.c */, - F76C85651EC4E7CD00FA49E2 /* footpath.h */, - F76C85661EC4E7CD00FA49E2 /* Fountain.cpp */, - F76C85671EC4E7CD00FA49E2 /* Fountain.h */, - 4C729BBE1FC2E1BE001DFF2F /* LargeScenery.cpp */, - 4C729BBF1FC2E1BE001DFF2F /* LargeScenery.h */, - 4C31B2E51FB6116100F6A38A /* Location.h */, - 4C7B53A61FFD15B200A52E21 /* Map.cpp */, - 4C7B53A71FFD15B200A52E21 /* Map.h */, - F76C856A1EC4E7CD00FA49E2 /* map_animation.c */, - F76C856B1EC4E7CD00FA49E2 /* map_animation.h */, - F76C856C1EC4E7CD00FA49E2 /* map_helpers.c */, - F76C856D1EC4E7CD00FA49E2 /* map_helpers.h */, - 4C31B2E21FB6115600F6A38A /* MapGen.cpp */, - 4C31B2E31FB6115600F6A38A /* MapGen.h */, - 4C729BC81FC2E6E9001DFF2F /* MoneyEffect.cpp */, - F79F42871F2E07E1009E42F8 /* Park.cpp */, - 4C7B53A91FFD15BB00A52E21 /* Park.h */, - 4C729BC61FC2E6AB001DFF2F /* Particle.cpp */, - F76C85741EC4E7CD00FA49E2 /* scenery.c */, - F76C85751EC4E7CD00FA49E2 /* scenery.h */, - 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */, - 4C729BC31FC2E5F3001DFF2F /* TileInspector.cpp */, - 4C729BC41FC2E5F3001DFF2F /* TileInspector.h */, - 4C729BC21FC2E1CF001DFF2F /* SmallScenery.h */, - F76C85761EC4E7CD00FA49E2 /* sprite.c */, - F76C85771EC4E7CD00FA49E2 /* sprite.h */, - F76C857A1EC4E7CD00FA49E2 /* Wall.cpp */, - 4C729BC11FC2E1C9001DFF2F /* Wall.h */, - F76C857B1EC4E7CD00FA49E2 /* water.h */, + 4C7B541D2007646A00A52E21 /* Balloon.cpp */, + 4C7B541E2007646A00A52E21 /* Banner.cpp */, + 4C7B541F2007646A00A52E21 /* Banner.h */, + 4C7B54202007646A00A52E21 /* Climate.cpp */, + 4C7B54212007646A00A52E21 /* Climate.h */, + 4C7B54222007646A00A52E21 /* Duck.cpp */, + 4C7B54232007646A00A52E21 /* Entrance.cpp */, + 4C7B54242007646A00A52E21 /* Entrance.h */, + 4C7B54252007646A00A52E21 /* Footpath.cpp */, + 4C7B54262007646A00A52E21 /* Footpath.h */, + 4C7B54272007646A00A52E21 /* Fountain.cpp */, + 4C7B54282007646A00A52E21 /* Fountain.h */, + 4C7B54292007646A00A52E21 /* LargeScenery.cpp */, + 4C7B542A2007646A00A52E21 /* LargeScenery.h */, + 4C7B542B2007646A00A52E21 /* Location.h */, + 4C7B542C2007646A00A52E21 /* Map.cpp */, + 4C7B542D2007646A00A52E21 /* Map.h */, + 4C7B542E2007646A00A52E21 /* MapAnimation.cpp */, + 4C7B542F2007646A00A52E21 /* MapAnimation.h */, + 4C7B54302007646A00A52E21 /* MapGen.cpp */, + 4C7B54312007646A00A52E21 /* MapGen.h */, + 4C7B54322007646A00A52E21 /* MapHelpers.cpp */, + 4C7B54332007646A00A52E21 /* MapHelpers.h */, + 4C7B54342007646A00A52E21 /* MoneyEffect.cpp */, + 4C7B54352007646A00A52E21 /* Park.cpp */, + 4C7B54362007646A00A52E21 /* Park.h */, + 4C7B54372007646A00A52E21 /* Particle.cpp */, + 4C7B54382007646A00A52E21 /* Scenery.cpp */, + 4C7B54392007646A00A52E21 /* Scenery.h */, + 4C7B543A2007646A00A52E21 /* SmallScenery.cpp */, + 4C7B543B2007646A00A52E21 /* SmallScenery.h */, + 4C7B543C2007646A00A52E21 /* Sprite.cpp */, + 4C7B543D2007646A00A52E21 /* Sprite.h */, + 4C7B543E2007646A00A52E21 /* TileInspector.cpp */, + 4C7B543F2007646A00A52E21 /* TileInspector.h */, + 4C7B54402007646A00A52E21 /* Wall.cpp */, + 4C7B54412007646A00A52E21 /* Wall.h */, + 4C7B54422007646A00A52E21 /* Water.h */, ); path = world; sourceTree = ""; @@ -3122,6 +3121,7 @@ C666EE7A1F37ACB10061AA04 /* Themes.cpp in Sources */, 4C6A66A61FE2787700694CB6 /* Banner.cpp in Sources */, 4C6A66C21FF9322A00694CB6 /* Ride.cpp in Sources */, + 4C7B54542007646A00A52E21 /* Sprite.cpp in Sources */, 4C93F1781F8B745700A9330D /* SpaceRings.cpp in Sources */, 4C6A66A91FE2787700694CB6 /* LargeScenery.cpp in Sources */, 4CFE4E8A1F950164005243C2 /* TrackDataOld.cpp in Sources */, @@ -3138,10 +3138,12 @@ 4C93F14E1F8B744400A9330D /* ReverseFreefallCoaster.cpp in Sources */, C654DF3B1F69C0430040F43D /* TitleScenarioSelect.cpp in Sources */, C64645001F3FA4120026AC2D /* ViewClipping.cpp in Sources */, + 4C7B54462007646A00A52E21 /* Duck.cpp in Sources */, 4C93F1411F8B744400A9330D /* HeartlineTwisterCoaster.cpp in Sources */, 4C93F1BC1F8E185600A9330D /* Marketing.cpp in Sources */, C666EE791F37ACB10061AA04 /* ServerStart.cpp in Sources */, C61ADB231FBBCB8B0024F2EF /* GameBottomToolbar.cpp in Sources */, + 4C7B54522007646A00A52E21 /* Scenery.cpp in Sources */, C666EE7E1F37ACB10061AA04 /* TitleOptions.cpp in Sources */, 4C8B42721EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp in Sources */, 4C93F1BA1F8E185600A9330D /* Award.cpp in Sources */, @@ -3165,6 +3167,7 @@ C666EE6C1F37ACB10061AA04 /* Changelog.cpp in Sources */, 4C93F1441F8B744400A9330D /* InvertedRollerCoaster.cpp in Sources */, C64644FC1F3FA4120026AC2D /* Footpath.cpp in Sources */, + 4C7B54442007646A00A52E21 /* Banner.cpp in Sources */, F7CB864D1EEDA1A80030C877 /* DummyWindowManager.cpp in Sources */, F76C887C1EC5324E00FA49E2 /* MemoryAudioSource.cpp in Sources */, 4C93F1AF1F8CD9F600A9330D /* KeyboardShortcut.cpp in Sources */, @@ -3193,6 +3196,7 @@ C64644F91F3FA4120026AC2D /* EditorInventionsList.cpp in Sources */, 4C7B54062005735F00A52E21 /* VehicleData.cpp in Sources */, 4C7B53FC200143C200A52E21 /* Widget.cpp in Sources */, + 4C7B54512007646A00A52E21 /* Particle.cpp in Sources */, 4C6A66AD1FE2787700694CB6 /* TileElement.cpp in Sources */, 4CE4624C1FD1613D0001CD98 /* Platform.Posix.cpp in Sources */, 4C6A669B1FE2786F00694CB6 /* Sprite.cpp in Sources */, @@ -3208,11 +3212,11 @@ C666EE781F37ACB10061AA04 /* ServerList.cpp in Sources */, C654DF341F69C0430040F43D /* NewCampaign.cpp in Sources */, F76C887D1EC5324E00FA49E2 /* CursorData.cpp in Sources */, + 4C7B544E2007646A00A52E21 /* MapHelpers.cpp in Sources */, 4C93F1761F8B745700A9330D /* MonorailCycles.cpp in Sources */, 4C93F13E1F8B744400A9330D /* CorkscrewRollerCoaster.cpp in Sources */, C6D2BEE71F9BAACE008B557C /* MapTooltip.cpp in Sources */, 4C93F1401F8B744400A9330D /* GigaCoaster.cpp in Sources */, - 4C7B53A81FFD15B200A52E21 /* Map.cpp in Sources */, 4C93F1541F8B744400A9330D /* TwisterRollerCoaster.cpp in Sources */, 4CC4B8E71FE00C4E00660D62 /* Diagnostic.cpp in Sources */, C666EE7B1F37ACB10061AA04 /* TitleExit.cpp in Sources */, @@ -3220,6 +3224,7 @@ F76C887E1EC5324E00FA49E2 /* CursorRepository.cpp in Sources */, 4C7B53FD200143C200A52E21 /* Window.cpp in Sources */, 4C6A66991FE2786F00694CB6 /* Misc.cpp in Sources */, + 4C7B544F2007646A00A52E21 /* MoneyEffect.cpp in Sources */, 4CFE4E851F90AF41005243C2 /* Vehicle.cpp in Sources */, 4C7B540D20060D8100A52E21 /* TrackPaint.cpp in Sources */, 4C93F16A1F8B745700A9330D /* CarRide.cpp in Sources */, @@ -3238,6 +3243,7 @@ F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */, 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */, 4C7B53BD1FFF935B00A52E21 /* Currency.cpp in Sources */, + 4C7B54502007646A00A52E21 /* Park.cpp in Sources */, 4C93F18F1F8B747A00A9330D /* PirateShip.cpp in Sources */, 4C6A66B61FE278C900694CB6 /* Painter.cpp in Sources */, C654DF381F69C0430040F43D /* StaffFirePrompt.cpp in Sources */, @@ -3256,12 +3262,15 @@ C6D2BEE81F9BAACE008B557C /* MazeConstruction.cpp in Sources */, C666EE771F37ACB10061AA04 /* SavePrompt.cpp in Sources */, 4C6A669A1FE2786F00694CB6 /* Peep.cpp in Sources */, + 4C7B54562007646A00A52E21 /* Wall.cpp in Sources */, 4C7B53C31FFF935B00A52E21 /* RealNames.cpp in Sources */, 4C93F16C1F8B745700A9330D /* CrookedHouse.cpp in Sources */, 4C93F18A1F8B747A00A9330D /* Enterprise.cpp in Sources */, 4CE4624A1FD1613D0001CD98 /* Platform.Linux.cpp in Sources */, C654DF391F69C0430040F43D /* TitleCommandEditor.cpp in Sources */, + 4C7B54452007646A00A52E21 /* Climate.cpp in Sources */, 4C93F13B1F8B744400A9330D /* BobsleighCoaster.cpp in Sources */, + 4C7B54472007646A00A52E21 /* Entrance.cpp in Sources */, 4C93F1701F8B745700A9330D /* GhostTrain.cpp in Sources */, 4CFE4E901F9625B0005243C2 /* Track.cpp in Sources */, 4C93F1771F8B745700A9330D /* ObservationTower.cpp in Sources */, @@ -3271,6 +3280,7 @@ C62D83871FCC7D1A008C04F1 /* EditorObjectSelection.cpp in Sources */, F76C88811EC5324E00FA49E2 /* DrawLineShader.cpp in Sources */, 4C93F13A1F8B744400A9330D /* AirPoweredVerticalCoaster.cpp in Sources */, + 4C7B544D2007646A00A52E21 /* MapGen.cpp in Sources */, 4C93F1421F8B744400A9330D /* InvertedHairpinCoaster.cpp in Sources */, 4CE4624D1FD1613D0001CD98 /* Platform.Win32.cpp in Sources */, C67CCD661FBBCFDB004FAE4C /* EditorBottomToolbar.cpp in Sources */, @@ -3282,13 +3292,12 @@ 4C93F19A1F8B748200A9330D /* Lift.cpp in Sources */, 4C7B53BF1FFF935B00A52E21 /* FormatCodes.cpp in Sources */, C654DF351F69C0430040F43D /* Park.cpp in Sources */, + 4C7B54432007646A00A52E21 /* Balloon.cpp in Sources */, 4C93F1901F8B747A00A9330D /* RotoDrop.cpp in Sources */, 4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */, C654DF3A1F69C0430040F43D /* TitleEditor.cpp in Sources */, - 4C729BC71FC2E6AB001DFF2F /* Particle.cpp in Sources */, C666EE6F1F37ACB10061AA04 /* DebugPaint.cpp in Sources */, F76C88831EC5324E00FA49E2 /* OpenGLAPI.cpp in Sources */, - 4C729BC91FC2E6E9001DFF2F /* MoneyEffect.cpp in Sources */, 4C93F1521F8B744400A9330D /* Steeplechase.cpp in Sources */, 4CC4B8ED1FE00C5D00660D62 /* Intro.cpp in Sources */, 4C93F1BD1F8E185600A9330D /* NewsItem.cpp in Sources */, @@ -3299,6 +3308,7 @@ F70839921FFC0AFF002DCEFA /* Scenario.cpp in Sources */, 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */, C654DF301F69C0430040F43D /* Finances.cpp in Sources */, + 4C7B54492007646A00A52E21 /* Fountain.cpp in Sources */, 4C6A668E1FE14C3A00694CB6 /* SawyerCoding.cpp in Sources */, 4C6AC2121F9E1CB3004324AA /* CableLift.cpp in Sources */, 4C6A66C11FF9322A00694CB6 /* music_list.c in Sources */, @@ -3309,8 +3319,10 @@ 4C93F1AD1F8CD9F000A9330D /* Input.cpp in Sources */, 4C93F1BE1F8E185600A9330D /* Research.cpp in Sources */, 4C7B53CE200029CE00A52E21 /* Line.cpp in Sources */, + 4C7B544C2007646A00A52E21 /* MapAnimation.cpp in Sources */, C666EE761F37ACB10061AA04 /* Options.cpp in Sources */, 4C6A66921FE14C9500694CB6 /* Cheats.cpp in Sources */, + 4C7B544B2007646A00A52E21 /* Map.cpp in Sources */, C666EE6E1F37ACB10061AA04 /* CustomCurrency.cpp in Sources */, 4C93F1711F8B745700A9330D /* HauntedHouse.cpp in Sources */, 4C7B53FA200143C200A52E21 /* Viewport.cpp in Sources */, @@ -3326,7 +3338,6 @@ 4C7B53D1200029D900A52E21 /* Rect.cpp in Sources */, F76C88851EC5324E00FA49E2 /* OpenGLFramebuffer.cpp in Sources */, 4C7B53F7200143C200A52E21 /* Fonts.cpp in Sources */, - 4C729BC01FC2E1BE001DFF2F /* LargeScenery.cpp in Sources */, 4C93F1451F8B744400A9330D /* JuniorRollerCoaster.cpp in Sources */, 4C7B53D2200029D900A52E21 /* ScrollingText.cpp in Sources */, C61FB2721FA3E25D0095FB9D /* ObjectLoadError.cpp in Sources */, @@ -3342,7 +3353,6 @@ 4C93F1A91F8B748900A9330D /* SplashBoats.cpp in Sources */, 4C93F1721F8B745700A9330D /* Maze.cpp in Sources */, C64644FA1F3FA4120026AC2D /* EditorObjectiveOptions.cpp in Sources */, - 4CFBCD5E1F27CD8000D74FB6 /* SmallScenery.cpp in Sources */, C666EE741F37ACB10061AA04 /* News.cpp in Sources */, 4C7B53FB200143C200A52E21 /* ViewportInteraction.cpp in Sources */, F76C888A1EC5324E00FA49E2 /* TextComposition.cpp in Sources */, @@ -3355,22 +3365,23 @@ 4C7B53C81FFF94F900A52E21 /* ConversionTables.cpp in Sources */, 4C93F1461F8B744400A9330D /* LayDownRollerCoaster.cpp in Sources */, 4C93F1991F8B748200A9330D /* Chairlift.cpp in Sources */, - 4C31B2E41FB6115600F6A38A /* MapGen.cpp in Sources */, 4C6AC20F1F9E1693004324AA /* Station.cpp in Sources */, C64644FE1F3FA4120026AC2D /* Main.cpp in Sources */, 4C93F16B1F8B745700A9330D /* CircusShow.cpp in Sources */, 4C7B53C01FFF935B00A52E21 /* Language.cpp in Sources */, + 4C7B544A2007646A00A52E21 /* LargeScenery.cpp in Sources */, 4C93F19B1F8B748200A9330D /* MiniatureRailway.cpp in Sources */, F76C888B1EC5324E00FA49E2 /* Ui.cpp in Sources */, + 4C7B54552007646A00A52E21 /* TileInspector.cpp in Sources */, C685E51A1F8907850090598F /* Staff.cpp in Sources */, F76C888C1EC5324E00FA49E2 /* UiContext.cpp in Sources */, + 4C7B54482007646A00A52E21 /* Footpath.cpp in Sources */, + 4C7B54532007646A00A52E21 /* SmallScenery.cpp in Sources */, C666EE7D1F37ACB10061AA04 /* TitleMenu.cpp in Sources */, F76C888D1EC5324E00FA49E2 /* UiContext.Linux.cpp in Sources */, 4C7B541C20060D8E00A52E21 /* RideData.cpp in Sources */, F76C888E1EC5324E00FA49E2 /* UiContext.Win32.cpp in Sources */, 4C93F16E1F8B745700A9330D /* FerrisWheel.cpp in Sources */, - 4C729BC51FC2E5F3001DFF2F /* TileInspector.cpp in Sources */, - F79F42881F2E07E1009E42F8 /* Park.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3379,7 +3390,6 @@ buildActionMask = 2147483647; files = ( F70839931FFC0B61002DCEFA /* Scenario.cpp in Sources */, - F79F42891F2E0837009E42F8 /* Park.cpp in Sources */, F7CB864E1EEDA2050030C877 /* DummyWindowManager.cpp in Sources */, F775F5381EE3725C001F00E7 /* DummyAudioContext.cpp in Sources */, F775F5351EE35A89001F00E7 /* DummyUiContext.cpp in Sources */, @@ -3505,18 +3515,6 @@ F76C87911EC4E88400FA49E2 /* (null) in Sources */, F76C87921EC4E88400FA49E2 /* (null) in Sources */, F76C87931EC4E88400FA49E2 /* (null) in Sources */, - F76C87941EC4E88400FA49E2 /* Balloon.cpp in Sources */, - F76C87951EC4E88400FA49E2 /* Banner.cpp in Sources */, - F76C87971EC4E88400FA49E2 /* Climate.cpp in Sources */, - F76C87991EC4E88400FA49E2 /* Duck.cpp in Sources */, - F76C879A1EC4E88400FA49E2 /* Entrance.cpp in Sources */, - F76C879C1EC4E88400FA49E2 /* footpath.c in Sources */, - F76C879E1EC4E88400FA49E2 /* Fountain.cpp in Sources */, - F76C87A21EC4E88400FA49E2 /* map_animation.c in Sources */, - F76C87A41EC4E88500FA49E2 /* map_helpers.c in Sources */, - F76C87AC1EC4E88500FA49E2 /* scenery.c in Sources */, - F76C87AE1EC4E88500FA49E2 /* sprite.c in Sources */, - F76C87B21EC4E88500FA49E2 /* Wall.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index b61b31c265..cc7147ce81 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include typedef struct rct_mouse_data { diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index abac4afd20..815ee200e7 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index fcbccf11fd..975f247ca1 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include enum WINDOW_CLEAR_SCENERY_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 244694bbec..6f04821bb9 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include enum { WIDX_PREVIOUS_IMAGE, // 1 diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 3bc5654931..a05d12d207 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #pragma region Widgets diff --git a/src/openrct2-ui/windows/EditorMain.cpp b/src/openrct2-ui/windows/EditorMain.cpp index c5ec4b7749..581ea6e49d 100644 --- a/src/openrct2-ui/windows/EditorMain.cpp +++ b/src/openrct2-ui/windows/EditorMain.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi); diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 9b93d482ca..2ce63f9c9f 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include enum diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 991d1c411c..3eb19cbffb 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include enum WINDOW_GUEST_PAGE { WINDOW_GUEST_OVERVIEW, diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index 79350a1dfe..d63c3029d1 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include static rct_widget window_main_widgets[] = { { WWT_VIEWPORT, 0, 0x0000, -1, 0x0000, -1, STR_VIEWPORT, 0xFFFF }, diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 03b6e6217e..1e9397686a 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 4f879756da..09a2f03244 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 0f7fb55671..76bab29db4 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 49fa12ae2c..9ccc2b4ab8 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 809a29c6a6..a335899226 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #define WINDOW_SCENERY_WIDTH 634 diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 38f85d4699..a6939a5e2a 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 6cccf717f1..1a0d4320cc 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 00cbe651f9..85b6793ac7 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 730864fcb0..c130b80d61 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -30,9 +30,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index dced841339..a1fac85616 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -38,9 +38,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index d684b1b95a..d092201587 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -25,11 +25,11 @@ #include "ride/Station.h" #include "util/Util.h" #include "world/Climate.h" -#include "world/footpath.h" +#include "world/Footpath.h" #include "world/Map.h" #include "world/Park.h" -#include "world/scenery.h" -#include "world/sprite.h" +#include "world/Scenery.h" +#include "world/Sprite.h" bool gCheatsSandboxMode = false; bool gCheatsDisableClearanceChecks = false; diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 27d5cc12af..59333a1a40 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -26,7 +26,7 @@ #include "ride/RideData.h" #include "windows/Intent.h" #include "windows/_legacy.h" -#include "world/footpath.h" +#include "world/Footpath.h" #include "world/LargeScenery.h" bool _maxObjectsWasHit; diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index f5058f567a..f78a091623 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -55,13 +55,13 @@ #include "world/Banner.h" #include "world/Climate.h" #include "world/Entrance.h" -#include "world/footpath.h" +#include "world/Footpath.h" #include "world/Map.h" -#include "world/map_animation.h" +#include "world/MapAnimation.h" #include "world/Park.h" -#include "world/scenery.h" -#include "world/sprite.h" -#include "world/water.h" +#include "world/Scenery.h" +#include "world/Sprite.h" +#include "world/Water.h" #include "object/ObjectList.h" #define NUMBER_OF_AUTOSAVES_TO_KEEP 9 diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index 4ede42fa0a..105811b9e8 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -24,7 +24,7 @@ #include "../Cheats.h" #include "../world/Entrance.h" #include "../world/Park.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" struct PlaceParkEntranceAction : public GameActionBase { diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 2f85a946a8..b06c3b892c 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -23,7 +23,7 @@ #include "../OpenRCT2.h" #include "../platform/platform.h" #include "../util/Util.h" -#include "../world/water.h" +#include "../world/Water.h" #include "Drawing.h" extern "C" diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/Console.cpp index 5c0dbbe1d4..d45f711b5b 100644 --- a/src/openrct2/interface/Console.cpp +++ b/src/openrct2/interface/Console.cpp @@ -48,7 +48,7 @@ #include "../windows/Intent.h" #include "../world/Climate.h" #include "../world/Park.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "Console.h" #include "Viewport.h" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 9c29088135..53faebd7a5 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -31,10 +31,10 @@ #include "../world/Banner.h" #include "../world/Climate.h" #include "../world/Entrance.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/Map.h" -#include "../world/scenery.h" -#include "../world/sprite.h" +#include "../world/Scenery.h" +#include "../world/Sprite.h" #include "Colour.h" #include "Viewport.h" #include "Window.h" diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index b005caebb2..7a04a679d7 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -18,7 +18,7 @@ #define _VIEWPORT_H_ #include "../world/Map.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "../paint/Paint.h" #include "Window.h" diff --git a/src/openrct2/interface/ViewportInteraction.cpp b/src/openrct2/interface/ViewportInteraction.cpp index 7f140f00ea..4308fa296d 100644 --- a/src/openrct2/interface/ViewportInteraction.cpp +++ b/src/openrct2/interface/ViewportInteraction.cpp @@ -27,11 +27,11 @@ #include "../scenario/Scenario.h" #include "../windows/Intent.h" #include "../world/Banner.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/Map.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "../world/LargeScenery.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "Viewport.h" #include "../Context.h" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index fc19d719e0..1bbcdf8e46 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -32,7 +32,7 @@ #include "../OpenRCT2.h" #include "../platform/platform.h" #include "../world/Map.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "Viewport.h" #include "Widget.h" #include "Window.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 1a1302d8b9..3712ff02a0 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -23,7 +23,7 @@ #include "../ride/Ride.h" #include "../util/Util.h" #include "../world/Park.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "Finance.h" /** diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 87639f587c..f443ca4e80 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -25,7 +25,7 @@ #include "../ride/Ride.h" #include "../util/Util.h" #include "../windows/Intent.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "NewsItem.h" NewsItem gNewsItems[MAX_NEWS_ITEMS]; diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index b57d271336..22dfb27585 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -30,7 +30,7 @@ #include "../ride/RideData.h" #include "../ride/RideGroupManager.h" #include "../ride/TrackData.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "NewsItem.h" #include "Finance.h" #include "Research.h" diff --git a/src/openrct2/network/NetworkPlayer.h b/src/openrct2/network/NetworkPlayer.h index 473df2b0a3..1cfde83757 100644 --- a/src/openrct2/network/NetworkPlayer.h +++ b/src/openrct2/network/NetworkPlayer.h @@ -23,7 +23,7 @@ #include "../peep/Peep.h" #include "../world/Map.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" class NetworkPacket; diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp index 7e603f8111..c8e99bc824 100644 --- a/src/openrct2/network/Twitch.cpp +++ b/src/openrct2/network/Twitch.cpp @@ -40,7 +40,7 @@ #include "../peep/Peep.h" #include "../platform/platform.h" #include "../util/Util.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "http.h" #include "twitch.h" diff --git a/src/openrct2/object/BannerObject.h b/src/openrct2/object/BannerObject.h index 4f69c25963..c6e47a85a7 100644 --- a/src/openrct2/object/BannerObject.h +++ b/src/openrct2/object/BannerObject.h @@ -20,7 +20,7 @@ #include "SceneryObject.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" class BannerObject final : public SceneryObject { diff --git a/src/openrct2/object/FootpathItemObject.h b/src/openrct2/object/FootpathItemObject.h index 545c114ea4..025e082430 100644 --- a/src/openrct2/object/FootpathItemObject.h +++ b/src/openrct2/object/FootpathItemObject.h @@ -20,7 +20,7 @@ #include "SceneryObject.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" class FootpathItemObject final : public SceneryObject { diff --git a/src/openrct2/object/FootpathObject.cpp b/src/openrct2/object/FootpathObject.cpp index 8a34b66eb1..a57ee453ae 100644 --- a/src/openrct2/object/FootpathObject.cpp +++ b/src/openrct2/object/FootpathObject.cpp @@ -19,7 +19,7 @@ #include "../drawing/Drawing.h" #include "../localisation/Language.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" void FootpathObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/FootpathObject.h b/src/openrct2/object/FootpathObject.h index 8bd9eb1905..d22f0ae82a 100644 --- a/src/openrct2/object/FootpathObject.h +++ b/src/openrct2/object/FootpathObject.h @@ -20,7 +20,7 @@ #include "Object.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" class FootpathObject final : public Object { diff --git a/src/openrct2/object/LargeSceneryObject.h b/src/openrct2/object/LargeSceneryObject.h index b4e75eecd0..4beaf0adf8 100644 --- a/src/openrct2/object/LargeSceneryObject.h +++ b/src/openrct2/object/LargeSceneryObject.h @@ -20,7 +20,7 @@ #include "SceneryObject.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" class LargeSceneryObject final : public SceneryObject { diff --git a/src/openrct2/object/ObjectList.h b/src/openrct2/object/ObjectList.h index c81c320eb2..891ba14a06 100644 --- a/src/openrct2/object/ObjectList.h +++ b/src/openrct2/object/ObjectList.h @@ -3,9 +3,9 @@ #include "../ride/Ride.h" #include "../world/Banner.h" #include "../world/Entrance.h" -#include "../world/footpath.h" -#include "../world/scenery.h" -#include "../world/water.h" +#include "../world/Footpath.h" +#include "../world/Scenery.h" +#include "../world/Water.h" #include "ObjectLimits.h" #ifdef __cplusplus diff --git a/src/openrct2/object/SceneryGroupObject.h b/src/openrct2/object/SceneryGroupObject.h index babf63643a..3a2c1fbf7e 100644 --- a/src/openrct2/object/SceneryGroupObject.h +++ b/src/openrct2/object/SceneryGroupObject.h @@ -20,7 +20,7 @@ #include "Object.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" struct ObjectRepositoryItem; diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index 78217849a7..4ae19891a5 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -22,7 +22,7 @@ #include "../drawing/Drawing.h" #include "../localisation/Language.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "../world/SmallScenery.h" SmallSceneryObject::~SmallSceneryObject() diff --git a/src/openrct2/object/SmallSceneryObject.h b/src/openrct2/object/SmallSceneryObject.h index 469aeb1cef..fbd6851999 100644 --- a/src/openrct2/object/SmallSceneryObject.h +++ b/src/openrct2/object/SmallSceneryObject.h @@ -20,7 +20,7 @@ #include "SceneryObject.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" class SmallSceneryObject final : public SceneryObject { diff --git a/src/openrct2/object/WallObject.h b/src/openrct2/object/WallObject.h index ef7fc28c59..f62404e536 100644 --- a/src/openrct2/object/WallObject.h +++ b/src/openrct2/object/WallObject.h @@ -20,7 +20,7 @@ #include "SceneryObject.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" class WallObject final : public SceneryObject { diff --git a/src/openrct2/object/WaterObject.h b/src/openrct2/object/WaterObject.h index ecc69a6a91..8f09715166 100644 --- a/src/openrct2/object/WaterObject.h +++ b/src/openrct2/object/WaterObject.h @@ -20,7 +20,7 @@ #include "Object.h" -#include "../world/water.h" +#include "../world/Water.h" class WaterObject final : public Object { diff --git a/src/openrct2/paint/Supports.h b/src/openrct2/paint/Supports.h index 6bef8dae67..9336214a45 100644 --- a/src/openrct2/paint/Supports.h +++ b/src/openrct2/paint/Supports.h @@ -18,7 +18,7 @@ #define _DRAWING_SUPPORTS_H_ #include "../common.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/paint/sprite/Litter.cpp b/src/openrct2/paint/sprite/Litter.cpp index 620b4aeac9..a990fef658 100644 --- a/src/openrct2/paint/sprite/Litter.cpp +++ b/src/openrct2/paint/sprite/Litter.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "Sprite.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../../interface/Viewport.h" #include "../Paint.h" diff --git a/src/openrct2/paint/sprite/Misc.cpp b/src/openrct2/paint/sprite/Misc.cpp index fc9180a303..9db4a4ccf7 100644 --- a/src/openrct2/paint/sprite/Misc.cpp +++ b/src/openrct2/paint/sprite/Misc.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" #include "Sprite.h" diff --git a/src/openrct2/paint/sprite/Peep.cpp b/src/openrct2/paint/sprite/Peep.cpp index 2ea5182b62..4368d69274 100644 --- a/src/openrct2/paint/sprite/Peep.cpp +++ b/src/openrct2/paint/sprite/Peep.cpp @@ -19,7 +19,7 @@ #include "../../interface/Viewport.h" #include "Sprite.h" #include "../../peep/Peep.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../Paint.h" /** diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Sprite.cpp index 0b1a0c8553..537ea44745 100644 --- a/src/openrct2/paint/sprite/Sprite.cpp +++ b/src/openrct2/paint/sprite/Sprite.cpp @@ -17,7 +17,7 @@ #include "Sprite.h" #include "../Paint.h" #include "../../drawing/Drawing.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../../ride/RideData.h" #include "../../interface/Viewport.h" #include "../../ride/VehiclePaint.h" diff --git a/src/openrct2/paint/sprite/Sprite.h b/src/openrct2/paint/sprite/Sprite.h index b2515a3ce3..2952e4a346 100644 --- a/src/openrct2/paint/sprite/Sprite.h +++ b/src/openrct2/paint/sprite/Sprite.h @@ -18,7 +18,7 @@ #define _PAINT_SPRITE_H #include "../../common.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Banner.cpp index ea6eaf101b..a4c5da7439 100644 --- a/src/openrct2/paint/tile_element/Banner.cpp +++ b/src/openrct2/paint/tile_element/Banner.cpp @@ -21,7 +21,7 @@ #include "../../localisation/Localisation.h" #include "TileElement.h" #include "../../world/Banner.h" -#include "../../world/scenery.h" +#include "../../world/Scenery.h" /** rct2: 0x0098D884 */ // BannerBoundBoxes[rotation][0] is for the pole in the back diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Entrance.cpp index 3c4f371870..159b836d94 100644 --- a/src/openrct2/paint/tile_element/Entrance.cpp +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -20,7 +20,7 @@ #include "../../localisation/Localisation.h" #include "../../ride/RideData.h" #include "../../world/Entrance.h" -#include "../../world/footpath.h" +#include "../../world/Footpath.h" #include "../Paint.h" #include "../Supports.h" #include "TileElement.h" diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Fence.cpp index ab9a1549f5..7087cfa84a 100644 --- a/src/openrct2/paint/tile_element/Fence.cpp +++ b/src/openrct2/paint/tile_element/Fence.cpp @@ -23,7 +23,7 @@ #include "../../interface/Viewport.h" #include "../../ride/Track.h" #include "../../world/Map.h" -#include "../../world/scenery.h" +#include "../../world/Scenery.h" #include "../../world/Wall.h" #include "../Paint.h" #include "TileElement.h" diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/LargeScenery.cpp index b3b16e2b7d..e9a0c55e59 100644 --- a/src/openrct2/paint/tile_element/LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/LargeScenery.cpp @@ -22,7 +22,7 @@ #include "../../util/Util.h" #include "../../world/Map.h" #include "../../world/LargeScenery.h" -#include "../../world/scenery.h" +#include "../../world/Scenery.h" #include "../Paint.h" #include "../Supports.h" #include "TileElement.h" diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index 9f950bd3b4..a6ccefa0c2 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -22,8 +22,8 @@ #include "../../peep/Staff.h" #include "../../ride/Track.h" #include "../../ride/TrackPaint.h" -#include "../../world/footpath.h" -#include "../../world/scenery.h" +#include "../../world/Footpath.h" +#include "../../world/Scenery.h" #include "../Paint.h" #include "../Supports.h" #include "TileElement.h" diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/SmallScenery.cpp index 8eca9f607a..769db0cf11 100644 --- a/src/openrct2/paint/tile_element/SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/SmallScenery.cpp @@ -22,7 +22,7 @@ #include "../Paint.h" #include "../Supports.h" #include "../../world/Map.h" -#include "../../world/scenery.h" +#include "../../world/Scenery.h" #include "../../world/SmallScenery.h" static const LocationXY16 offsets[] = { diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index 542d9bf7de..68515d5742 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -24,11 +24,11 @@ #include "../../ride/RideData.h" #include "../../ride/TrackData.h" #include "../../ride/TrackPaint.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../../world/Banner.h" #include "../../world/Entrance.h" -#include "../../world/footpath.h" -#include "../../world/scenery.h" +#include "../../world/Footpath.h" +#include "../../world/Scenery.h" #include "../../sprites.h" #include "../Paint.h" #include "../Supports.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 2ae9c5ffe7..de5aed4282 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -41,12 +41,12 @@ #include "../util/Util.h" #include "../world/Climate.h" #include "../world/Entrance.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/Map.h" #include "../world/LargeScenery.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "../world/SmallScenery.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "Peep.h" #include "Staff.h" diff --git a/src/openrct2/peep/PeepData.cpp b/src/openrct2/peep/PeepData.cpp index 9dd7ac0fd8..8e70b778c8 100644 --- a/src/openrct2/peep/PeepData.cpp +++ b/src/openrct2/peep/PeepData.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../core/Util.hpp" -#include "../world/sprite.h" +#include "../world/Sprite.h" // clang-format off static const uint8 PeepSpriteImage_Normal_00_sequence[] = { 0, 1, 2, 3, 4, 5 }; diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index c68027f453..ef5f7c082a 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -31,9 +31,9 @@ #include "../scenario/Scenario.h" #include "../util/Util.h" #include "../world/Entrance.h" -#include "../world/footpath.h" -#include "../world/scenery.h" -#include "../world/sprite.h" +#include "../world/Footpath.h" +#include "../world/Scenery.h" +#include "../world/Sprite.h" #include "Peep.h" #include "Staff.h" diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index a9ecc7693f..23233fb075 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -24,8 +24,8 @@ #include "../ride/Ride.h" #include "../world/Banner.h" #include "../world/Map.h" -#include "../world/sprite.h" -#include "../world/map_animation.h" +#include "../world/Sprite.h" +#include "../world/MapAnimation.h" #define RCT1_MAX_TILE_ELEMENTS 0xC000 #define RCT1_MAX_SPRITES 5000 diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index bec6cd1d36..f38b9ddf07 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -53,12 +53,12 @@ #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/Climate.h" -#include "../world/footpath.h" -#include "../world/map_animation.h" +#include "../world/Footpath.h" +#include "../world/MapAnimation.h" #include "../world/Park.h" #include "../world/Entrance.h" #include "../world/LargeScenery.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "../world/SmallScenery.h" class EntryList diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index d4cb17dc50..ec6ea3d66f 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -47,9 +47,9 @@ #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../world/Climate.h" -#include "../world/map_animation.h" +#include "../world/MapAnimation.h" #include "../world/Park.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" S6Exporter::S6Exporter() { diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 23f51bcb75..0bf4b9d23b 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -46,7 +46,7 @@ #include "../util/SawyerCoding.h" #include "../world/Climate.h" #include "../world/Entrance.h" -#include "../world/map_animation.h" +#include "../world/MapAnimation.h" #include "../world/Park.h" class ObjectLoadException : public std::runtime_error diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 43b3b9a4a2..d3a9509e3c 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -17,7 +17,7 @@ #include "../core/Math.hpp" #include "../rct12/RCT12.h" #include "../util/Util.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "CableLift.h" #include "Ride.h" #include "Track.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 5dae26cad5..151b92a878 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -43,11 +43,11 @@ #include "../windows/Intent.h" #include "../world/Banner.h" #include "../world/Climate.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/Map.h" -#include "../world/map_animation.h" -#include "../world/scenery.h" -#include "../world/sprite.h" +#include "../world/MapAnimation.h" +#include "../world/Scenery.h" +#include "../world/Sprite.h" #include "CableLift.h" #include "music_list.h" #include "Ride.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 774ef8db04..d22f3fecd3 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -26,11 +26,11 @@ #include "../rct1/RCT1.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/Map.h" -#include "../world/map_animation.h" +#include "../world/MapAnimation.h" #include "../world/Park.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "Ride.h" #include "RideData.h" #include "ride_ratings.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index bbbee9cb84..30d0758523 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -32,8 +32,8 @@ #include "../rct1/RCT1.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" -#include "../world/footpath.h" -#include "../world/scenery.h" +#include "../world/Footpath.h" +#include "../world/Scenery.h" #include "../world/SmallScenery.h" #include "Ride.h" #include "RideData.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 7dc80a23b3..b7bdacac88 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -24,7 +24,7 @@ #include "../paint/tile_element/TileElement.h" #include "../sprites.h" #include "../world/Map.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "TrackData.h" #include "RideData.h" #include "TrackPaint.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index fd8c9084d5..67b73a62bd 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -31,10 +31,10 @@ #include "../rct12/RCT12.h" #include "../scenario/Scenario.h" #include "../util/Util.h" -#include "../world/map_animation.h" -#include "../world/scenery.h" +#include "../world/MapAnimation.h" +#include "../world/Scenery.h" #include "../world/SmallScenery.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "Vehicle.h" #include "CableLift.h" #include "Ride.h" diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index b7c09e3c3b..da5dd7a0c7 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -21,7 +21,7 @@ #include "../interface/Viewport.h" #include "../paint/Paint.h" #include "../ride/RideData.h" -#include "../world/sprite.h" +#include "../world/Sprite.h" #include "Track.h" #include "VehiclePaint.h" diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index 7dc0c6a0ac..b1cfb305ab 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 40ead1bb29..7ede72d362 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 4648e6f9bc..64d9694d14 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 7ecfd05465..09a02f87f6 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 7d5c94871d..109922b035 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index a5c4044d5e..87aa8798b0 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index a6883926a4..3269ea0d46 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 967fb67ea4..d78cca6c96 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 6166b5eece..78134ab1e7 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 8df2037aaf..d23759c1b4 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index a9b82c2378..cec247e974 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index bd09bad485..abb69f5256 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index d37bd646d4..72b50ccf4b 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index d8d3448b8c..b128eab713 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index 6e9abcba87..842e986563 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 5d8b8163b3..a34c553846 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 9571c038ca..dc54a77a92 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 16d0f0f3b6..5a3f829c49 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 4fe0da8bca..13c8945428 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index f34b114d6b..ccf96d9a0f 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 67168649af..ec574ee8b4 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 08f4546265..d4b40e1e58 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 91ddd608a2..1a9518871c 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 192390adf6..7052132320 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 65b53c8a70..6db4c8d5d3 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 2d89170228..3afac6fcf5 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 3d03320f30..80077ef636 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 5e210179b5..c5a83b2af8 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 98b880051f..8de8846703 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index f9935d11d5..5b7efd5930 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index 18e3be0b9c..5ec84d21ac 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -18,7 +18,7 @@ #include "../interface/Window.h" #include "../localisation/Date.h" #include "../OpenRCT2.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/Map.h" #include "Ride.h" #include "RideData.h" diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index d1f95e078d..895c381482 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -19,7 +19,7 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../Track.h" #include "../TrackPaint.h" #include "../VehiclePaint.h" diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index ea19fe3ed5..6f4a545026 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index f89c7e12d6..000b5150c7 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -24,9 +24,9 @@ #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../windows/Intent.h" -#include "../world/footpath.h" +#include "../world/Footpath.h" #include "../world/LargeScenery.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #include "../world/SmallScenery.h" #include "../world/Wall.h" #include "RideData.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index ef589202ff..e3d5166034 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -21,7 +21,7 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../RideData.h" #include "../TrackData.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index 5622feb34f..45ee0bae1c 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -17,7 +17,7 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../Track.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index 0bb4be8b8f..ea3efa1be4 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -17,7 +17,7 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../Track.h" #include "../TrackPaint.h" diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index 52bb0923f9..cba7a93f9b 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -20,7 +20,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../Track.h" #include "../TrackPaint.h" #include "../VehiclePaint.h" diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index c97a251e59..c9e4949cd4 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -18,7 +18,7 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../../world/sprite.h" +#include "../../world/Sprite.h" #include "../Track.h" #include "../TrackPaint.h" #include "../VehiclePaint.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 49380a78a4..ce2434f263 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -41,9 +41,9 @@ #include "../world/Climate.h" #include "../world/Map.h" #include "../world/Park.h" -#include "../world/scenery.h" -#include "../world/sprite.h" -#include "../world/water.h" +#include "../world/Scenery.h" +#include "../world/Sprite.h" +#include "../world/Water.h" #include "ScenarioRepository.h" #include "ScenarioSources.h" #include "Scenario.h" diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 1ccb163323..555ed80111 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -27,8 +27,8 @@ #include "../ride/ride_ratings.h" #include "../world/Banner.h" #include "../world/Map.h" -#include "../world/map_animation.h" -#include "../world/sprite.h" +#include "../world/MapAnimation.h" +#include "../world/Sprite.h" typedef struct ParkLoadResult ParkLoadResult; diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index 29fdf586fe..3b97914241 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -36,7 +36,7 @@ #include "../interface/Window.h" #include "../management/NewsItem.h" #include "../windows/Intent.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" using namespace OpenRCT2; diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c index 71e2da1650..8bd6302221 100644 --- a/src/openrct2/windows/_legacy.c +++ b/src/openrct2/windows/_legacy.c @@ -27,7 +27,7 @@ #include "../ride/TrackData.h" #include "../Cheats.h" #include "../network/network.h" -#include "../world/scenery.h" +#include "../world/Scenery.h" #pragma warning(disable : 4295) // 'identifier': array is too small to include a terminating null character diff --git a/src/openrct2/world/Balloon.cpp b/src/openrct2/world/Balloon.cpp index 95b2262026..69deefb8e9 100644 --- a/src/openrct2/world/Balloon.cpp +++ b/src/openrct2/world/Balloon.cpp @@ -19,7 +19,7 @@ #include "../audio/audio.h" #include "../scenario/Scenario.h" #include "../util/Util.h" -#include "sprite.h" +#include "Sprite.h" bool rct_sprite::IsBalloon() { diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 60278851ea..4788390a85 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -25,7 +25,7 @@ #include "Banner.h" #include "Map.h" #include "Park.h" -#include "scenery.h" +#include "Scenery.h" #include "../Game.h" #include "../interface/Window.h" #include "../localisation/Localisation.h" diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/world/Duck.cpp index f14a61ccc6..6c98ca842a 100644 --- a/src/openrct2/world/Duck.cpp +++ b/src/openrct2/world/Duck.cpp @@ -22,7 +22,7 @@ #include "../Game.h" #include "../localisation/Date.h" #include "../scenario/Scenario.h" -#include "sprite.h" +#include "Sprite.h" enum DUCK_STATE { diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 239747a510..ce37851f6d 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -18,7 +18,7 @@ #include "../OpenRCT2.h" #include "Entrance.h" -#include "footpath.h" +#include "Footpath.h" #include "Map.h" #include "Park.h" #include "../Cheats.h" diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/Footpath.cpp similarity index 99% rename from src/openrct2/world/footpath.c rename to src/openrct2/world/Footpath.cpp index eaced711da..d0a1633e31 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/Footpath.cpp @@ -15,6 +15,8 @@ #pragma endregion #include "../Cheats.h" +#include "../core/Math.hpp" +#include "../core/Util.hpp" #include "../Game.h" #include "../localisation/Localisation.h" #include "../network/network.h" @@ -836,7 +838,7 @@ void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x } LocationXY16 minPosition = position; - LocationXY16 maxPosition = { position.x + 31, position.y + 31 }; + LocationXY16 maxPosition = { sint16(position.x + 31), sint16(position.y + 31) }; position.x += 16; position.y += 16; @@ -855,8 +857,8 @@ void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x z = tile_element_height(position.x, position.y); } position = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z); - position.x = clamp(minPosition.x, position.x, maxPosition.x); - position.y = clamp(minPosition.y, position.y, maxPosition.y); + position.x = Math::Clamp(minPosition.x, position.x, maxPosition.x); + position.y = Math::Clamp(minPosition.y, position.y, maxPosition.y); } // Determine to which edge the cursor is closest @@ -1473,7 +1475,7 @@ void footpath_connect_edges(sint32 x, sint32 y, rct_tile_element *tileElement, s } } - neighbourList.count = min(neighbourList.count, 2); + neighbourList.count = std::min(neighbourList.count, 2); } while (neighbour_list_pop(&neighbourList, &neighbour)) { @@ -1605,7 +1607,7 @@ void footpath_queue_chain_reset() void footpath_queue_chain_push(uint8 rideIndex) { if (rideIndex != 255) { - uint8 * lastSlot = _footpathQueueChain + countof(_footpathQueueChain) - 1; + uint8 * lastSlot = _footpathQueueChain + Util::CountOf(_footpathQueueChain) - 1; if (_footpathQueueChainNext <= lastSlot) { *_footpathQueueChainNext++ = rideIndex; } diff --git a/src/openrct2/world/footpath.h b/src/openrct2/world/Footpath.h similarity index 100% rename from src/openrct2/world/footpath.h rename to src/openrct2/world/Footpath.h diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp index 25264d9945..9338a0d752 100644 --- a/src/openrct2/world/Fountain.cpp +++ b/src/openrct2/world/Fountain.cpp @@ -18,10 +18,10 @@ #include "../Game.h" #include "../scenario/Scenario.h" -#include "footpath.h" +#include "Footpath.h" #include "Map.h" -#include "scenery.h" -#include "sprite.h" +#include "Scenery.h" +#include "Sprite.h" enum class PATTERN { diff --git a/src/openrct2/world/Fountain.h b/src/openrct2/world/Fountain.h index 6abbb6f078..951a2cdc56 100644 --- a/src/openrct2/world/Fountain.h +++ b/src/openrct2/world/Fountain.h @@ -19,7 +19,7 @@ #include "../common.h" #include "Map.h" -#include "sprite.h" +#include "Sprite.h" enum { diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 9da6813215..06b82d331a 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -37,12 +37,12 @@ #include "../windows/Intent.h" #include "Banner.h" #include "Climate.h" -#include "footpath.h" +#include "Footpath.h" #include "LargeScenery.h" #include "Map.h" -#include "map_animation.h" +#include "MapAnimation.h" #include "Park.h" -#include "scenery.h" +#include "Scenery.h" #include "SmallScenery.h" #include "TileInspector.h" #include "Wall.h" diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/MapAnimation.cpp similarity index 98% rename from src/openrct2/world/map_animation.c rename to src/openrct2/world/MapAnimation.cpp index 8424715cb5..eadebb5e54 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/MapAnimation.cpp @@ -19,19 +19,17 @@ #include "../ride/RideData.h" #include "../ride/Track.h" #include "../interface/Viewport.h" -#include "map_animation.h" +#include "MapAnimation.h" #include "Map.h" -#include "scenery.h" +#include "Scenery.h" #include "SmallScenery.h" -#include "sprite.h" -#include "footpath.h" +#include "Sprite.h" +#include "Footpath.h" typedef bool (*map_animation_invalidate_event_handler)(sint32 x, sint32 y, sint32 baseZ); static bool map_animation_invalidate(rct_map_animation *obj); -static const map_animation_invalidate_event_handler _animatedObjectEventHandlers[MAP_ANIMATION_TYPE_COUNT]; - uint16 gNumMapAnimations; rct_map_animation gAnimatedObjects[MAX_ANIMATED_OBJECTS]; @@ -95,16 +93,6 @@ void map_animation_invalidate_all() } } -/** - * @returns true if the animation should be removed. - */ -static bool map_animation_invalidate(rct_map_animation *obj) -{ - assert(obj->type < MAP_ANIMATION_TYPE_COUNT); - - return _animatedObjectEventHandlers[obj->type](obj->x, obj->y, obj->baseZ); -} - /** * * rct2: 0x00666670 @@ -556,3 +544,13 @@ static const map_animation_invalidate_event_handler _animatedObjectEventHandlers map_animation_invalidate_wall_door, map_animation_invalidate_wall }; + +/** + * @returns true if the animation should be removed. + */ +static bool map_animation_invalidate(rct_map_animation *obj) +{ + assert(obj->type < MAP_ANIMATION_TYPE_COUNT); + + return _animatedObjectEventHandlers[obj->type](obj->x, obj->y, obj->baseZ); +} diff --git a/src/openrct2/world/map_animation.h b/src/openrct2/world/MapAnimation.h similarity index 100% rename from src/openrct2/world/map_animation.h rename to src/openrct2/world/MapAnimation.h diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 93682fe7d3..bb29f0aee2 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -30,9 +30,9 @@ #include "../platform/platform.h" #include "../util/Util.h" #include "Map.h" -#include "map_helpers.h" +#include "MapHelpers.h" #include "MapGen.h" -#include "scenery.h" +#include "Scenery.h" #include "SmallScenery.h" #pragma region Height map struct diff --git a/src/openrct2/world/map_helpers.c b/src/openrct2/world/MapHelpers.cpp similarity index 87% rename from src/openrct2/world/map_helpers.c rename to src/openrct2/world/MapHelpers.cpp index 3daa99afec..a5da10dcf0 100644 --- a/src/openrct2/world/map_helpers.c +++ b/src/openrct2/world/MapHelpers.cpp @@ -14,15 +14,18 @@ *****************************************************************************/ #pragma endregion +#include +#include "../core/Math.hpp" #include "Map.h" -#include "map_helpers.h" +#include "MapHelpers.h" /** * Not perfect, this still leaves some particular tiles unsmoothed. */ sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) { - sint32 i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; + sint32 i, x, y, count, doubleCorner, raisedLand = 0; + uint8 highest, cornerHeights[4]; rct_tile_element *tileElement, *tileElement2; for (y = t; y < b; y++) { for (x = l; x < r; x++) { @@ -31,10 +34,10 @@ sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) // Raise to edge height - 2 highest = tileElement->base_height; - highest = max(highest, map_get_surface_element_at(x - 1, y + 0)->base_height); - highest = max(highest, map_get_surface_element_at(x + 1, y + 0)->base_height); - highest = max(highest, map_get_surface_element_at(x + 0, y - 1)->base_height); - highest = max(highest, map_get_surface_element_at(x + 0, y + 1)->base_height); + highest = std::max(highest, map_get_surface_element_at(x - 1, y + 0)->base_height); + highest = std::max(highest, map_get_surface_element_at(x + 1, y + 0)->base_height); + highest = std::max(highest, map_get_surface_element_at(x + 0, y - 1)->base_height); + highest = std::max(highest, map_get_surface_element_at(x + 0, y + 1)->base_height); if (tileElement->base_height < highest - 2) { raisedLand = 1; tileElement->base_height = tileElement->clearance_height = highest - 2; @@ -48,7 +51,7 @@ sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) cornerHeights[3] = map_get_surface_element_at(x - 1, y + 1)->base_height; highest = tileElement->base_height; for (i = 0; i < 4; i++) - highest = max(highest, cornerHeights[i]); + highest = std::max(highest, cornerHeights[i]); if (highest >= tileElement->base_height + 4) { count = 0; @@ -64,22 +67,22 @@ sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) switch (i){ default: case 0: - highestOnLowestSide = max( + highestOnLowestSide = std::max( map_get_surface_element_at(x + 1, y)->base_height, map_get_surface_element_at(x, y + 1)->base_height); break; case 1: - highestOnLowestSide = max( + highestOnLowestSide = std::max( map_get_surface_element_at(x - 1, y)->base_height, map_get_surface_element_at(x, y + 1)->base_height); break; case 2: - highestOnLowestSide = max( + highestOnLowestSide = std::max( map_get_surface_element_at(x - 1, y)->base_height, map_get_surface_element_at(x, y - 1)->base_height); break; case 3: - highestOnLowestSide = max( + highestOnLowestSide = std::max( map_get_surface_element_at(x + 1, y)->base_height, map_get_surface_element_at(x, y - 1)->base_height); break; @@ -209,7 +212,8 @@ static sint32 map_get_corner_height(sint32 x, sint32 y, sint32 corner) */ static sint32 map_smooth_wavy(sint32 l, sint32 t, sint32 r, sint32 b) { - sint32 i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; + sint32 i, x, y, count, doubleCorner, raisedLand = 0; + uint8 highest, cornerHeights[4]; rct_tile_element *tileElement; for (y = t; y < b; y++) { @@ -220,10 +224,10 @@ static sint32 map_smooth_wavy(sint32 l, sint32 t, sint32 r, sint32 b) // Raise to edge height - 2 highest = tileElement->base_height; - highest = max(highest, map_get_surface_element_at(x - 1, y + 0)->base_height); - highest = max(highest, map_get_surface_element_at(x + 1, y + 0)->base_height); - highest = max(highest, map_get_surface_element_at(x + 0, y - 1)->base_height); - highest = max(highest, map_get_surface_element_at(x + 0, y + 1)->base_height); + highest = std::max(highest, map_get_surface_element_at(x - 1, y + 0)->base_height); + highest = std::max(highest, map_get_surface_element_at(x + 1, y + 0)->base_height); + highest = std::max(highest, map_get_surface_element_at(x + 0, y - 1)->base_height); + highest = std::max(highest, map_get_surface_element_at(x + 0, y + 1)->base_height); if (tileElement->base_height < highest - 2) { raisedLand = 1; tileElement->base_height = tileElement->clearance_height = highest - 2; @@ -231,13 +235,13 @@ static sint32 map_smooth_wavy(sint32 l, sint32 t, sint32 r, sint32 b) // Check corners doubleCorner = -1; - cornerHeights[0] = max(map_get_corner_height(x - 1, y - 1, 0), max(map_get_corner_height(x + 1, y + 0, 1), map_get_corner_height(x + 0, y + 1, 2))); - cornerHeights[1] = max(map_get_corner_height(x + 1, y - 1, 1), max(map_get_corner_height(x - 1, y + 0, 0), map_get_corner_height(x + 0, y + 1, 3))); - cornerHeights[2] = max(map_get_corner_height(x + 1, y + 1, 3), max(map_get_corner_height(x + 1, y + 0, 3), map_get_corner_height(x + 0, y - 1, 0))); - cornerHeights[3] = max(map_get_corner_height(x - 1, y + 1, 2), max(map_get_corner_height(x - 1, y + 0, 2), map_get_corner_height(x + 0, y - 1, 1))); + cornerHeights[0] = std::max(map_get_corner_height(x - 1, y - 1, 0), std::max(map_get_corner_height(x + 1, y + 0, 1), map_get_corner_height(x + 0, y + 1, 2))); + cornerHeights[1] = std::max(map_get_corner_height(x + 1, y - 1, 1), std::max(map_get_corner_height(x - 1, y + 0, 0), map_get_corner_height(x + 0, y + 1, 3))); + cornerHeights[2] = std::max(map_get_corner_height(x + 1, y + 1, 3), std::max(map_get_corner_height(x + 1, y + 0, 3), map_get_corner_height(x + 0, y - 1, 0))); + cornerHeights[3] = std::max(map_get_corner_height(x - 1, y + 1, 2), std::max(map_get_corner_height(x - 1, y + 0, 2), map_get_corner_height(x + 0, y - 1, 1))); highest = tileElement->base_height; for (i = 0; i < 4; i++) - highest = max(highest, cornerHeights[i]); + highest = std::max(highest, cornerHeights[i]); if (highest >= tileElement->base_height + 4) { count = 0; @@ -381,10 +385,10 @@ sint32 tile_smooth(sint32 x, sint32 y) } // Count number from the three tiles that is currently higher - sint8 thresholdW = clamp(neighbourHeightOffset.SW, 0, 1) + clamp(neighbourHeightOffset.W, 0, 1) + clamp(neighbourHeightOffset.NW, 0, 1); - sint8 thresholdN = clamp(neighbourHeightOffset.NW, 0, 1) + clamp(neighbourHeightOffset.N, 0, 1) + clamp(neighbourHeightOffset.NE, 0, 1); - sint8 thresholdE = clamp(neighbourHeightOffset.NE, 0, 1) + clamp(neighbourHeightOffset.E, 0, 1) + clamp(neighbourHeightOffset.SE, 0, 1); - sint8 thresholdS = clamp(neighbourHeightOffset.SE, 0, 1) + clamp(neighbourHeightOffset.S, 0, 1) + clamp(neighbourHeightOffset.SW, 0, 1); + sint8 thresholdW = Math::Clamp(neighbourHeightOffset.SW, 0, 1) + Math::Clamp(neighbourHeightOffset.W, 0, 1) + Math::Clamp(neighbourHeightOffset.NW, 0, 1); + sint8 thresholdN = Math::Clamp(neighbourHeightOffset.NW, 0, 1) + Math::Clamp(neighbourHeightOffset.N, 0, 1) + Math::Clamp(neighbourHeightOffset.NE, 0, 1); + sint8 thresholdE = Math::Clamp(neighbourHeightOffset.NE, 0, 1) + Math::Clamp(neighbourHeightOffset.E, 0, 1) + Math::Clamp(neighbourHeightOffset.SE, 0, 1); + sint8 thresholdS = Math::Clamp(neighbourHeightOffset.SE, 0, 1) + Math::Clamp(neighbourHeightOffset.S, 0, 1) + Math::Clamp(neighbourHeightOffset.SW, 0, 1); uint8 slope = TILE_ELEMENT_SLOPE_FLAT; slope |= (thresholdW >= 1) ? SLOPE_W_THRESHOLD_FLAGS : 0; diff --git a/src/openrct2/world/map_helpers.h b/src/openrct2/world/MapHelpers.h similarity index 100% rename from src/openrct2/world/map_helpers.h rename to src/openrct2/world/MapHelpers.h diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp index 03a1c25a8b..811ccf15e7 100644 --- a/src/openrct2/world/MoneyEffect.cpp +++ b/src/openrct2/world/MoneyEffect.cpp @@ -18,7 +18,7 @@ #include "../interface/Viewport.h" #include "../interface/Window.h" #include "../OpenRCT2.h" -#include "sprite.h" +#include "Sprite.h" static const LocationXY16 _moneyEffectMoveOffset[] = { {1, -1}, diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index df4e09054a..1224ab84ba 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -38,7 +38,7 @@ #include "Entrance.h" #include "Map.h" #include "Park.h" -#include "sprite.h" +#include "Sprite.h" rct_string_id gParkName; diff --git a/src/openrct2/world/Particle.cpp b/src/openrct2/world/Particle.cpp index df2e2395a6..16daabb6ea 100644 --- a/src/openrct2/world/Particle.cpp +++ b/src/openrct2/world/Particle.cpp @@ -18,7 +18,7 @@ #include "../core/Util.hpp" #include "../scenario/Scenario.h" #include "../paint/sprite/Sprite.h" -#include "sprite.h" +#include "Sprite.h" /** * diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/Scenery.cpp similarity index 99% rename from src/openrct2/world/scenery.c rename to src/openrct2/world/Scenery.cpp index d6d4241d60..e749b63921 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/Scenery.cpp @@ -22,11 +22,11 @@ #include "../object/ObjectList.h" #include "../scenario/Scenario.h" #include "Climate.h" -#include "footpath.h" +#include "Footpath.h" #include "Fountain.h" #include "Map.h" #include "Park.h" -#include "scenery.h" +#include "Scenery.h" #include "SmallScenery.h" uint8 gWindowSceneryActiveTabIndex; diff --git a/src/openrct2/world/scenery.h b/src/openrct2/world/Scenery.h similarity index 100% rename from src/openrct2/world/scenery.h rename to src/openrct2/world/Scenery.h diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 54fc965dc4..2fc80abef7 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -18,10 +18,10 @@ #include "../network/network.h" #include "../OpenRCT2.h" #include "../ride/TrackDesign.h" -#include "footpath.h" +#include "Footpath.h" #include "Map.h" #include "Park.h" -#include "scenery.h" +#include "Scenery.h" #include "SmallScenery.h" static money32 SmallSceneryRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 quadrant, uint8 sceneryType, uint8 flags) diff --git a/src/openrct2/world/SmallScenery.h b/src/openrct2/world/SmallScenery.h index a58e58b926..f395a39c27 100644 --- a/src/openrct2/world/SmallScenery.h +++ b/src/openrct2/world/SmallScenery.h @@ -18,7 +18,7 @@ #include "../common.h" #include "Map.h" -#include "scenery.h" +#include "Scenery.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/Sprite.cpp similarity index 99% rename from src/openrct2/world/sprite.c rename to src/openrct2/world/Sprite.cpp index 3fe76c29d3..629dafb463 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/Sprite.cpp @@ -16,6 +16,7 @@ #include "../audio/audio.h" #include "../Cheats.h" +#include "../core/Math.hpp" #include "../Game.h" #include "../interface/Viewport.h" #include "../localisation/Date.h" @@ -23,7 +24,7 @@ #include "../OpenRCT2.h" #include "../scenario/Scenario.h" #include "Fountain.h" -#include "sprite.h" +#include "Sprite.h" uint16 gSpriteListHead[6]; uint16 gSpriteListCount[6]; @@ -189,8 +190,8 @@ static size_t GetSpatialIndexOffset(sint32 x, sint32 y) { size_t index = SPATIAL_INDEX_LOCATION_NULL; if (x != LOCATION_NULL) { - x = clamp(0, x, 0xFFFF); - y = clamp(0, y, 0xFFFF); + x = Math::Clamp(0, x, 0xFFFF); + y = Math::Clamp(0, y, 0xFFFF); sint16 flooredX = floor2(x, 32); uint8 tileY = y >> 5; @@ -835,7 +836,7 @@ static rct_sprite * find_sprite_list_cycle(uint16 sprite_idx) { if (sprite_idx == SPRITE_INDEX_NULL) { - return false; + return nullptr; } const rct_sprite * fast = get_sprite(sprite_idx); const rct_sprite * slow = fast; @@ -870,7 +871,7 @@ static rct_sprite * find_sprite_quadrant_cycle(uint16 sprite_idx) { if (sprite_idx == SPRITE_INDEX_NULL) { - return false; + return nullptr; } const rct_sprite * fast = get_sprite(sprite_idx); const rct_sprite * slow = fast; @@ -949,7 +950,7 @@ sint32 check_for_sprite_list_cycles(bool fix) // Now re-add remainder of the cycle back to list, safely. // Add each sprite to the list until we encounter one that is already part of the list. - while (!index_is_in_list(cycle_next, i)) + while (!index_is_in_list(cycle_next, (SPRITE_LIST)i)) { rct_sprite * spr = get_sprite(cycle_next); @@ -1027,7 +1028,7 @@ sint32 check_for_spatial_index_cycles(bool fix) // Now re-add remainder of the cycle back to list, safely. // Add each sprite to the list until we encounter one that is already part of the list. - while (!index_is_in_list(cycle_next, i)) + while (!index_is_in_list(cycle_next, (SPRITE_LIST)i)) { rct_sprite * spr = get_sprite(cycle_next); diff --git a/src/openrct2/world/sprite.h b/src/openrct2/world/Sprite.h similarity index 100% rename from src/openrct2/world/sprite.h rename to src/openrct2/world/Sprite.h diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 2a1bb0295e..1cc85bbf3f 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -22,7 +22,7 @@ #include "../ride/Track.h" #include "../windows/Intent.h" #include "../windows/tile_inspector.h" -#include "footpath.h" +#include "Footpath.h" #include "Map.h" #include "TileInspector.h" diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index f7f24750bc..0252c64762 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -26,7 +26,7 @@ #include "LargeScenery.h" #include "Map.h" #include "Park.h" -#include "scenery.h" +#include "Scenery.h" #include "SmallScenery.h" #include "Wall.h" diff --git a/src/openrct2/world/water.h b/src/openrct2/world/Water.h similarity index 100% rename from src/openrct2/world/water.h rename to src/openrct2/world/Water.h diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index c0ed541fd7..fb2b98c74c 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include "addresses.h" diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 33c1527632..9e10057939 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -111,7 +111,7 @@ private: "../../paint/paint.h", "../../sprites.h", "../../world/Map.h", - "../../world/sprite.h", + "../../world/Sprite.h", "../ride_data.h", "../TrackData.h", "../track_paint.h",