From 469e142c7ba455231b8bf11b97534efd820fe313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 10 Jan 2018 00:00:09 +0100 Subject: [PATCH] Change casing of header files --- src/openrct2-ui/input/KeyboardShortcut.cpp | 2 +- src/openrct2-ui/input/MouseInput.cpp | 2 +- src/openrct2-ui/windows/DebugPaint.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/NewCampaign.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2/EditorObjectSelectionSession.cpp | 2 +- src/openrct2/actions/RideCreateAction.hpp | 2 +- src/openrct2/interface/Console.cpp | 2 +- src/openrct2/interface/Viewport.cpp | 2 +- src/openrct2/interface/ViewportInteraction.cpp | 2 +- src/openrct2/management/Marketing.cpp | 2 +- src/openrct2/management/Research.cpp | 2 +- src/openrct2/paint/PaintHelpers.cpp | 2 +- src/openrct2/paint/sprite/Sprite.cpp | 4 ++-- src/openrct2/paint/tile_element/Entrance.cpp | 2 +- src/openrct2/paint/tile_element/Path.cpp | 2 +- src/openrct2/paint/tile_element/TileElement.cpp | 4 ++-- src/openrct2/peep/Peep.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/ride/CableLift.cpp | 4 ++-- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideData.cpp | 2 +- src/openrct2/ride/{ride_data.h => RideData.h} | 0 src/openrct2/ride/RideGroupManager.cpp | 2 +- src/openrct2/ride/RideGroupManager.h | 2 +- src/openrct2/ride/Track.cpp | 2 +- src/openrct2/ride/TrackData.cpp | 2 +- src/openrct2/ride/TrackData.h | 2 +- src/openrct2/ride/TrackDesign.cpp | 2 +- src/openrct2/ride/TrackPaint.cpp | 4 ++-- src/openrct2/ride/{track_paint.h => TrackPaint.h} | 2 +- src/openrct2/ride/Vehicle.cpp | 4 ++-- src/openrct2/ride/VehicleData.cpp | 2 +- src/openrct2/ride/{vehicle_data.h => VehicleData.h} | 0 src/openrct2/ride/VehiclePaint.cpp | 4 ++-- src/openrct2/ride/{vehicle_paint.h => VehiclePaint.h} | 0 src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/BobsleighCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/BolligerMabillardTrack.cpp | 4 ++-- src/openrct2/ride/coaster/CompactInvertedCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/FlyingRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/GigaCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/InvertedRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/JuniorRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/LayDownRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/LoopingRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/MineRide.cpp | 4 ++-- src/openrct2/ride/coaster/MineTrainCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/MiniRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/ReverserRollerCoaster.cpp | 6 +++--- src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/StandUpRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/Steeplechase.cpp | 4 ++-- src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/TwisterRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/VirginiaReel.cpp | 4 ++-- src/openrct2/ride/coaster/WildMouse.cpp | 4 ++-- src/openrct2/ride/coaster/WoodenRollerCoaster.cpp | 4 ++-- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 4 ++-- src/openrct2/ride/gentle/CarRide.cpp | 6 +++--- src/openrct2/ride/gentle/CircusShow.cpp | 2 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 2 +- src/openrct2/ride/gentle/Dodgems.cpp | 2 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 2 +- src/openrct2/ride/gentle/FlyingSaucers.cpp | 2 +- src/openrct2/ride/gentle/GhostTrain.cpp | 6 +++--- src/openrct2/ride/gentle/HauntedHouse.cpp | 2 +- src/openrct2/ride/gentle/Maze.cpp | 2 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 2 +- src/openrct2/ride/gentle/MiniGolf.cpp | 6 +++--- src/openrct2/ride/gentle/MiniHelicopters.cpp | 6 +++--- src/openrct2/ride/gentle/MonorailCycles.cpp | 4 ++-- src/openrct2/ride/gentle/ObservationTower.cpp | 4 ++-- src/openrct2/ride/gentle/SpaceRings.cpp | 2 +- src/openrct2/ride/gentle/SpiralSlide.cpp | 2 +- src/openrct2/ride/ride_ratings.c | 2 +- src/openrct2/ride/shops/Facility.cpp | 2 +- src/openrct2/ride/shops/Shop.cpp | 2 +- src/openrct2/ride/thrill/3dCinema.cpp | 2 +- src/openrct2/ride/thrill/Enterprise.cpp | 2 +- src/openrct2/ride/thrill/GoKarts.cpp | 4 ++-- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 4 ++-- src/openrct2/ride/thrill/MagicCarpet.cpp | 2 +- src/openrct2/ride/thrill/MotionSimulator.cpp | 2 +- src/openrct2/ride/thrill/PirateShip.cpp | 2 +- src/openrct2/ride/thrill/RotoDrop.cpp | 4 ++-- src/openrct2/ride/thrill/SwingingInverterShip.cpp | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 4 ++-- src/openrct2/ride/thrill/Twist.cpp | 2 +- src/openrct2/ride/track_design_save.c | 2 +- src/openrct2/ride/transport/Chairlift.cpp | 4 ++-- src/openrct2/ride/transport/Lift.cpp | 2 +- src/openrct2/ride/transport/MiniatureRailway.cpp | 6 +++--- src/openrct2/ride/transport/Monorail.cpp | 6 +++--- src/openrct2/ride/transport/SuspendedMonorail.cpp | 4 ++-- src/openrct2/ride/water/BoatHire.cpp | 2 +- src/openrct2/ride/water/DingySlide.cpp | 2 +- src/openrct2/ride/water/LogFlume.cpp | 2 +- src/openrct2/ride/water/RiverRapids.cpp | 4 ++-- src/openrct2/ride/water/SplashBoats.cpp | 4 ++-- src/openrct2/ride/water/SubmarineRide.cpp | 6 +++--- src/openrct2/ride/water/WaterCoaster.cpp | 2 +- src/openrct2/world/Map.cpp | 2 +- src/openrct2/world/Park.cpp | 2 +- src/openrct2/world/map_animation.c | 2 +- 118 files changed, 177 insertions(+), 177 deletions(-) rename src/openrct2/ride/{ride_data.h => RideData.h} (100%) rename src/openrct2/ride/{track_paint.h => TrackPaint.h} (99%) rename src/openrct2/ride/{vehicle_data.h => VehicleData.h} (100%) rename src/openrct2/ride/{vehicle_paint.h => VehiclePaint.h} (100%) diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index cd9255dcf6..168b4780cf 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 6f4e55820d..b61b31c265 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 103071d397..121e45c382 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -21,7 +21,7 @@ #include #include #include - #include + #include enum WINDOW_DEBUG_PAINT_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 4ba88ec769..5326958386 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index cb061af7e1..991d1c411c 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 1449fd8fed..a8a02b449e 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index d98c532173..c3c54ecaa4 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 3689c622f0..8521666bc3 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index e8ac31f982..1a0b4c750a 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 3b69005ef8..730864fcb0 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 28a3835140..27d5cc12af 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -23,7 +23,7 @@ #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "OpenRCT2.h" -#include "ride/ride_data.h" +#include "ride/RideData.h" #include "windows/Intent.h" #include "windows/_legacy.h" #include "world/footpath.h" diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 7a6e841021..655f895e64 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -26,7 +26,7 @@ #include "../interface/Window.h" #include "../world/Park.h" #include "../rct1/RCT1.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/Ride.h" #include "../ride/Station.h" diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/Console.cpp index b66404f5f9..5c0dbbe1d4 100644 --- a/src/openrct2/interface/Console.cpp +++ b/src/openrct2/interface/Console.cpp @@ -41,7 +41,7 @@ #include "../peep/Staff.h" #include "../platform/platform.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" #include "../Version.h" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 6297394f37..9c29088135 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -26,7 +26,7 @@ #include "../paint/Paint.h" #include "../paint/Supports.h" #include "../peep/Staff.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/TrackData.h" #include "../world/Banner.h" #include "../world/Climate.h" diff --git a/src/openrct2/interface/ViewportInteraction.cpp b/src/openrct2/interface/ViewportInteraction.cpp index 254d3cbb22..7f140f00ea 100644 --- a/src/openrct2/interface/ViewportInteraction.cpp +++ b/src/openrct2/interface/ViewportInteraction.cpp @@ -22,7 +22,7 @@ #include "../localisation/Localisation.h" #include "../OpenRCT2.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/Track.h" #include "../scenario/Scenario.h" #include "../windows/Intent.h" diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index f13ef74503..8b1beb1583 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -20,7 +20,7 @@ #include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../Cheats.h" #include "Finance.h" #include "Marketing.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index f0165ae004..b57d271336 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -27,7 +27,7 @@ #include "../scenario/Scenario.h" #include "../rct1/RCT1.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/RideGroupManager.h" #include "../ride/TrackData.h" #include "../world/scenery.h" diff --git a/src/openrct2/paint/PaintHelpers.cpp b/src/openrct2/paint/PaintHelpers.cpp index bfd83132f0..6c0350feef 100644 --- a/src/openrct2/paint/PaintHelpers.cpp +++ b/src/openrct2/paint/PaintHelpers.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../interface/Viewport.h" -#include "../ride/track_paint.h" +#include "../ride/TrackPaint.h" #include "Paint.h" paint_struct * sub_98196C_rotated( diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Sprite.cpp index 7a29b36362..0b1a0c8553 100644 --- a/src/openrct2/paint/sprite/Sprite.cpp +++ b/src/openrct2/paint/sprite/Sprite.cpp @@ -18,9 +18,9 @@ #include "../Paint.h" #include "../../drawing/Drawing.h" #include "../../world/sprite.h" -#include "../../ride/ride_data.h" +#include "../../ride/RideData.h" #include "../../interface/Viewport.h" -#include "../../ride/vehicle_paint.h" +#include "../../ride/VehiclePaint.h" /** * Paint Quadrant diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Entrance.cpp index ada162cccd..3c4f371870 100644 --- a/src/openrct2/paint/tile_element/Entrance.cpp +++ b/src/openrct2/paint/tile_element/Entrance.cpp @@ -18,7 +18,7 @@ #include "../../Game.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" -#include "../../ride/ride_data.h" +#include "../../ride/RideData.h" #include "../../world/Entrance.h" #include "../../world/footpath.h" #include "../Paint.h" diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Path.cpp index d1683d5f68..9f950bd3b4 100644 --- a/src/openrct2/paint/tile_element/Path.cpp +++ b/src/openrct2/paint/tile_element/Path.cpp @@ -21,7 +21,7 @@ #include "../../object/ObjectList.h" #include "../../peep/Staff.h" #include "../../ride/Track.h" -#include "../../ride/track_paint.h" +#include "../../ride/TrackPaint.h" #include "../../world/footpath.h" #include "../../world/scenery.h" #include "../Paint.h" diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index 4799ddaa1c..52cf91a113 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -20,9 +20,9 @@ #include "../../Game.h" #include "../../interface/Viewport.h" #include "../../localisation/Localisation.h" -#include "../../ride/ride_data.h" +#include "../../ride/RideData.h" #include "../../ride/TrackData.h" -#include "../../ride/track_paint.h" +#include "../../ride/TrackPaint.h" #include "../../world/sprite.h" #include "../../world/Banner.h" #include "../../world/Entrance.h" diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 600aa50feb..2ae9c5ffe7 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -35,7 +35,7 @@ #include "../ride/Station.h" #include "../ride/Track.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../scenario/Scenario.h" #include "../sprites.h" #include "../util/Util.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 4c7204c4cb..bec6cd1d36 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -48,7 +48,7 @@ #include "../peep/Peep.h" #include "../peep/Staff.h" #include "RCT1.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/Track.h" #include "../util/SawyerCoding.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 12ddff71e5..43b3b9a4a2 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -21,8 +21,8 @@ #include "CableLift.h" #include "Ride.h" #include "Track.h" -#include "ride_data.h" -#include "vehicle_data.h" +#include "RideData.h" +#include "VehicleData.h" static void cable_lift_update_moving_to_end_of_station(rct_vehicle * vehicle); static void cable_lift_update_waiting_to_depart(rct_vehicle * vehicle); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 3d713da48e..56a8c71040 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -51,7 +51,7 @@ #include "CableLift.h" #include "music_list.h" #include "Ride.h" -#include "ride_data.h" +#include "RideData.h" #include "RideGroupManager.h" #include "Station.h" #include "Track.h" diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index c6639da99e..75cc4ed6d6 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -31,7 +31,7 @@ #include "../sprites.h" #include "Ride.h" #include "Track.h" -#include "ride_data.h" +#include "RideData.h" // clang-format off const bool hasRunningTrack[RIDE_TYPE_COUNT] = { diff --git a/src/openrct2/ride/ride_data.h b/src/openrct2/ride/RideData.h similarity index 100% rename from src/openrct2/ride/ride_data.h rename to src/openrct2/ride/RideData.h diff --git a/src/openrct2/ride/RideGroupManager.cpp b/src/openrct2/ride/RideGroupManager.cpp index 5fef4b53a2..05c5b4c213 100644 --- a/src/openrct2/ride/RideGroupManager.cpp +++ b/src/openrct2/ride/RideGroupManager.cpp @@ -23,7 +23,7 @@ #include "../localisation/StringIds.h" #include "../management/Research.h" #include "Ride.h" -#include "ride_data.h" +#include "RideData.h" #include "Track.h" #include "TrackData.h" diff --git a/src/openrct2/ride/RideGroupManager.h b/src/openrct2/ride/RideGroupManager.h index ec6fed4eee..cf34ffb982 100644 --- a/src/openrct2/ride/RideGroupManager.h +++ b/src/openrct2/ride/RideGroupManager.h @@ -23,7 +23,7 @@ extern "C" { #endif #include "../common.h" - #include "ride_data.h" + #include "RideData.h" #ifdef __cplusplus } #endif diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index ac635a9c7d..774ef8db04 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -32,7 +32,7 @@ #include "../world/Park.h" #include "../world/scenery.h" #include "Ride.h" -#include "ride_data.h" +#include "RideData.h" #include "ride_ratings.h" #include "RideGroupManager.h" #include "Station.h" diff --git a/src/openrct2/ride/TrackData.cpp b/src/openrct2/ride/TrackData.cpp index d70aea2a5a..cf74e840c0 100644 --- a/src/openrct2/ride/TrackData.cpp +++ b/src/openrct2/ride/TrackData.cpp @@ -17,7 +17,7 @@ #include "../core/Util.hpp" #include "Track.h" #include "TrackData.h" -#include "track_paint.h" +#include "TrackPaint.h" // clang-format off const rct_track_coordinates FlatTrackCoordinates[] = { diff --git a/src/openrct2/ride/TrackData.h b/src/openrct2/ride/TrackData.h index 7b45a72894..f3e695ee8f 100644 --- a/src/openrct2/ride/TrackData.h +++ b/src/openrct2/ride/TrackData.h @@ -18,7 +18,7 @@ #include "../common.h" #include "Track.h" -#include "track_paint.h" +#include "TrackPaint.h" #ifdef __cplusplus extern "C" { diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 2e441e6400..bbbee9cb84 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -36,7 +36,7 @@ #include "../world/scenery.h" #include "../world/SmallScenery.h" #include "Ride.h" -#include "ride_data.h" +#include "RideData.h" #include "Track.h" #include "TrackData.h" #include "TrackDesign.h" diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 9ebe8cce7f..e4ef747536 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -26,8 +26,8 @@ #include "../world/Map.h" #include "../world/sprite.h" #include "TrackData.h" -#include "ride_data.h" -#include "track_paint.h" +#include "RideData.h" +#include "TrackPaint.h" // clang-format off /* rct2: 0x007667AC */ diff --git a/src/openrct2/ride/track_paint.h b/src/openrct2/ride/TrackPaint.h similarity index 99% rename from src/openrct2/ride/track_paint.h rename to src/openrct2/ride/TrackPaint.h index 1da4b474d8..321fb63f04 100644 --- a/src/openrct2/ride/track_paint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -17,7 +17,7 @@ #ifndef _TRACK_PAINT_H #define _TRACK_PAINT_H -#include "ride_data.h" +#include "RideData.h" #include "../common.h" #include "../paint/tile_element/TileElement.h" #include "../paint/Paint.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index c186ec3609..fd8c9084d5 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -38,11 +38,11 @@ #include "Vehicle.h" #include "CableLift.h" #include "Ride.h" -#include "ride_data.h" +#include "RideData.h" #include "Station.h" #include "Track.h" #include "TrackData.h" -#include "vehicle_data.h" +#include "VehicleData.h" static void vehicle_update(rct_vehicle * vehicle); diff --git a/src/openrct2/ride/VehicleData.cpp b/src/openrct2/ride/VehicleData.cpp index 6492e7e9f8..a7f17c55d6 100644 --- a/src/openrct2/ride/VehicleData.cpp +++ b/src/openrct2/ride/VehicleData.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../core/Util.hpp" -#include "vehicle_data.h" +#include "VehicleData.h" // clang-format off /** rct2: 0x0099F100 */ diff --git a/src/openrct2/ride/vehicle_data.h b/src/openrct2/ride/VehicleData.h similarity index 100% rename from src/openrct2/ride/vehicle_data.h rename to src/openrct2/ride/VehicleData.h diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp index ed1fa2e045..b7c09e3c3b 100644 --- a/src/openrct2/ride/VehiclePaint.cpp +++ b/src/openrct2/ride/VehiclePaint.cpp @@ -20,10 +20,10 @@ #include "../drawing/LightFX.h" #include "../interface/Viewport.h" #include "../paint/Paint.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../world/sprite.h" #include "Track.h" -#include "vehicle_paint.h" +#include "VehiclePaint.h" // clang-format off // 0x0098E52C: diff --git a/src/openrct2/ride/vehicle_paint.h b/src/openrct2/ride/VehiclePaint.h similarity index 100% rename from src/openrct2/ride/vehicle_paint.h rename to src/openrct2/ride/VehiclePaint.h diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index cbde71c982..7dc0c6a0ac 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 3a7ef52222..40ead1bb29 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x006FE5B4 */ static void bobsleigh_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 1af4297f43..4648e6f9bc 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" #include "BolligerMabillardTrack.h" void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 9d49638c16..7ecfd05465 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008AE6E0 */ static void compact_inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index fe57153992..7d5c94871d 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A7AF8 */ static void corkscrew_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 6c12dd130d..a5c4044d5e 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x007C6FF4 */ static void flying_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 3882e2ccc7..a6883926a4 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008AD674 */ static void giga_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 81a0b54df7..967fb67ea4 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x0087694C */ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 5811f6eb5d..6166b5eece 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x00890CB4 */ static void inverted_hairpin_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 71c4b2dbe2..8df2037aaf 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008B0460 */ static void inverted_impulse_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 8efcbc453b..a9b82c2378 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A92E8 */ static void inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index f21d55819e..bd09bad485 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -24,9 +24,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" #include "JuniorRollerCoaster.h" enum diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 3a5cce0977..d37bd646d4 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x0082491C */ static void lay_down_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index ea779a9175..d8d3448b8c 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */ static void lim_launched_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index dbb60edc7a..6e9abcba87 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" #define LOOPING_RC_BOOSTER_NE_SW (SPR_CSG_BEGIN + 55679) #define LOOPING_RC_BOOSTER_NW_SE (SPR_CSG_BEGIN + 55680) diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index d9617b4bc7..5d8b8163b3 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008B08D0 */ static void mine_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index a77e1909d8..9571c038ca 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x0071BFA4 */ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index ed8f93e6a3..16d0f0f3b6 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A4ABC */ static void mini_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 7c9f73ce3f..4fe0da8bca 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008AFE9C */ static void mini_suspended_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 44068245a9..f34b114d6b 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x00792D88 */ static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index dd786f381b..67168649af 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index a6521dddc9..08f4546265 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -22,10 +22,10 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" #ifndef NO_VEHICLES /** diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 681b778afd..91ddd608a2 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x0077839C */ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 73b28e64d3..192390adf6 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A7114 */ static void stand_up_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 10c8617fb8..65b53c8a70 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A59A8 */ static void steeplechase_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 4acc807874..2d89170228 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A8958 */ static void suspended_swinging_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 08f3c35a98..3d03320f30 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" #include "BolligerMabillardTrack.h" /** rct2: 0x008AB6A4 */ diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index 106982415c..c47cc6f209 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -20,8 +20,8 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" // 0x009927E6: static const vehicle_boundbox _virginiaReelBoundbox[] = { diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index e54b165845..5e210179b5 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index ea6620b50b..98b880051f 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" typedef struct sprite_bb_2 { diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index c536cd7308..f9935d11d5 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index 22410c1dce..03e25f5917 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -19,10 +19,10 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp index 1feacf4a18..bf525fee50 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** * rct2: 0x0077084A diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index abfcc0fa55..b1f9280dd5 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" typedef struct rct_crooked_house_bound_box { diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index d17a21262a..a29e73f5c9 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 878fc5b8d7..37e41dc2cd 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" static const uint8 edges_1x4_ne_sw[] = { EDGE_NW | EDGE_SE, diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index 3a9eea224d..06bca96a0e 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index 2561ea7ee0..a306d74d76 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -18,10 +18,10 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index a8fc64c048..e02da94b01 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" typedef struct haunted_house_bound_box { diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 169f33331e..6ce0586213 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -21,7 +21,7 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index f5cdb6fe5b..098b0934b5 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x0142805C */ static const uint32 merry_go_round_rider_offsets[] = { 0, 32, 64, 96, 16, 48, 80, 112 }; diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 6954ca427f..6f2cd7a40b 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -20,10 +20,10 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index 9634d8b5f2..9c33e8cfe6 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -18,10 +18,10 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" /** rct2: 0x */ static void paint_mini_helicopters_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index ce058ab5a2..60ef8d1630 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -20,8 +20,8 @@ #include "../../paint/Supports.h" #include "../../world/Map.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 84b60d6bbd..d386f8c655 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -20,8 +20,8 @@ #include "../../paint/Supports.h" #include "../../world/Map.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index ece0c51345..d32b2a93f6 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -19,7 +19,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index d61dd819b4..2e928ffe52 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index 86a64b6755..18e3be0b9c 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -21,7 +21,7 @@ #include "../world/footpath.h" #include "../world/Map.h" #include "Ride.h" -#include "ride_data.h" +#include "RideData.h" #include "ride_ratings.h" #include "Station.h" #include "Track.h" diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index 9edcbef048..02d308d740 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -20,7 +20,7 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** * diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index fd568ed63b..403ad2105b 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -20,7 +20,7 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** * diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index b57841fad8..60c50a0dec 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** * rct2: 0x007664C2 diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index ce33700144..c6eba8cf40 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -19,7 +19,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008A2ABC */ static void paint_enterprise_structure(paint_session * session, Ride * ride, sint8 xOffset, sint8 yOffset, uint16 height, diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 62a2282e09..13a5834460 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -20,8 +20,8 @@ #include "../../paint/Supports.h" #include "../../world/Map.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index f5f9e2df8f..d1f95e078d 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -21,8 +21,8 @@ #include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index 21cf1141bb..520dd4c9f4 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 6536c77774..3d0655d41c 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index b701955493..2db4578259 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" // 1 2 0 3 4 static const uint8 track_map_1x5[][5] = { diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 9f87c67241..4dc762368e 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -19,8 +19,8 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index aa131a1475..285fb571c0 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -18,7 +18,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x01428010 */ static const uint32 swinging_inverter_ship_base_sprite_offset[] = { 0, 16, 0, 16 }; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index da43eaa9dd..ea19fe3ed5 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x014280BC */ static sint16 TopSpinSeatHeightOffset[] = { diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 334c619e37..c2b70cf5b3 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -19,7 +19,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x0076E5C9 */ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 direction, sint8 xOffset, sint8 yOffset, diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 7a4781024e..f89c7e12d6 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -29,7 +29,7 @@ #include "../world/scenery.h" #include "../world/SmallScenery.h" #include "../world/Wall.h" -#include "ride_data.h" +#include "RideData.h" #include "Track.h" #include "TrackData.h" #include "TrackDesign.h" diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index 1adfbf643f..5191e59c0e 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -19,9 +19,9 @@ #include "../../paint/Supports.h" #include "../../world/Map.h" #include "../Ride.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 3603f6df3b..fa89cc8421 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -19,7 +19,7 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 2f6e538708..d3f882cf2e 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -20,10 +20,10 @@ #include "../../paint/Supports.h" #include "../../sprites.h" #include "../../world/Map.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 38d9980b80..906964ccf8 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -19,10 +19,10 @@ #include "../../paint/Paint.h" #include "../../paint/Supports.h" #include "../../world/Map.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 7ce0fd019e..ef589202ff 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -22,9 +22,9 @@ #include "../../sprites.h" #include "../../world/Map.h" #include "../../world/sprite.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../TrackData.h" -#include "../track_paint.h" +#include "../TrackPaint.h" /** rct2: 0x008636F4 */ static void suspended_monorail_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index 135d0cf03d..2d07d2e586 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -18,7 +18,7 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index 54e9c1a70b..5622feb34f 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -19,7 +19,7 @@ #include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index 9679c0b49f..0bb4be8b8f 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -19,7 +19,7 @@ #include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" enum { diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index 063d67f7fa..52bb0923f9 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -22,8 +22,8 @@ #include "../../world/Map.h" #include "../../world/sprite.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" #ifndef NO_VEHICLES // 0x0099279E: diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index bc3f38bda9..c97a251e59 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -20,8 +20,8 @@ #include "../../paint/Supports.h" #include "../../world/sprite.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" enum { diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index e3669e89b2..8845810a77 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -17,10 +17,10 @@ #include "../../interface/Viewport.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" -#include "../ride_data.h" +#include "../RideData.h" #include "../Track.h" -#include "../track_paint.h" -#include "../vehicle_paint.h" +#include "../TrackPaint.h" +#include "../VehiclePaint.h" #ifndef NO_VEHICLES /** diff --git a/src/openrct2/ride/water/WaterCoaster.cpp b/src/openrct2/ride/water/WaterCoaster.cpp index 4368d49a4a..22eed21413 100644 --- a/src/openrct2/ride/water/WaterCoaster.cpp +++ b/src/openrct2/ride/water/WaterCoaster.cpp @@ -17,7 +17,7 @@ #include "../../common.h" #include "../coaster/JuniorRollerCoaster.h" #include "../Track.h" -#include "../track_paint.h" +#include "../TrackPaint.h" static void water_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * tileElement) diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 84467c6f54..74d7f7054a 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -28,7 +28,7 @@ #include "../management/Finance.h" #include "../network/network.h" #include "../OpenRCT2.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/Track.h" #include "../ride/TrackData.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index ad1c4a30b9..df4e09054a 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -33,7 +33,7 @@ #include "../peep/Peep.h" #include "../peep/Staff.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../scenario/Scenario.h" #include "Entrance.h" #include "Map.h" diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c index 01407db8ba..8424715cb5 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/map_animation.c @@ -16,7 +16,7 @@ #include "../Game.h" #include "../ride/Ride.h" -#include "../ride/ride_data.h" +#include "../ride/RideData.h" #include "../ride/Track.h" #include "../interface/Viewport.h" #include "map_animation.h"