From 90a14205c85e2fd87cf1ae2dc15cfe7eb4d7f6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 16 Oct 2017 12:02:23 +0200 Subject: [PATCH] Compile track_data.c as C++ --- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2/interface/viewport.c | 2 +- src/openrct2/management/Research.cpp | 2 +- src/openrct2/paint/map_element/map_element.c | 2 +- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/ride/RideGroupManager.cpp | 2 +- src/openrct2/ride/Track.cpp | 2 +- src/openrct2/ride/{track_data.c => TrackData.cpp} | 2 +- src/openrct2/ride/{track_data.h => TrackData.h} | 0 src/openrct2/ride/TrackDesign.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 2 +- src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp | 2 +- src/openrct2/ride/coaster/BobsleighCoaster.cpp | 2 +- src/openrct2/ride/coaster/BolligerMabillardTrack.cpp | 2 +- src/openrct2/ride/coaster/CompactInvertedCoaster.cpp | 2 +- src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/FlyingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/GigaCoaster.cpp | 2 +- src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp | 2 +- src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp | 2 +- src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp | 2 +- src/openrct2/ride/coaster/InvertedRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/JuniorRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/LayDownRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/LoopingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/MineRide.cpp | 2 +- src/openrct2/ride/coaster/MineTrainCoaster.cpp | 2 +- src/openrct2/ride/coaster/MiniRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp | 2 +- src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp | 2 +- src/openrct2/ride/coaster/ReverserRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/StandUpRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/Steeplechase.cpp | 2 +- src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp | 2 +- src/openrct2/ride/coaster/TwisterRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/WildMouse.cpp | 2 +- src/openrct2/ride/coaster/WoodenRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 2 +- src/openrct2/ride/gentle/MiniGolf.cpp | 2 +- src/openrct2/ride/ride.c | 2 +- src/openrct2/ride/thrill/TopSpin.cpp | 2 +- src/openrct2/ride/track_data_old.c | 2 +- src/openrct2/ride/track_design_save.c | 2 +- src/openrct2/ride/track_paint.c | 2 +- src/openrct2/ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/windows/Ride.cpp | 2 +- src/openrct2/windows/RideConstruction.cpp | 2 +- src/openrct2/world/Wall.cpp | 2 +- src/openrct2/world/footpath.c | 2 +- src/openrct2/world/map.c | 2 +- test/testpaint/CMakeLists.txt | 2 +- test/testpaint/TestPaint.cpp | 2 +- test/testpaint/TestTrack.cpp | 2 +- test/testpaint/Utils.cpp | 2 +- test/testpaint/generate.cpp | 4 ++-- test/testpaint/main.cpp | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) rename src/openrct2/ride/{track_data.c => TrackData.cpp} (99%) rename src/openrct2/ride/{track_data.h => TrackData.h} (100%) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 3acf0c25ef..e5e638d4db 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 8ee24f45f4..25f965a7e6 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #define TRACK_MINI_PREVIEW_WIDTH 168 diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index d3438ea8cb..18140ae932 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -24,7 +24,7 @@ #include "../paint/supports.h" #include "../peep/Staff.h" #include "../ride/ride_data.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../world/banner.h" #include "../world/Climate.h" #include "../world/entrance.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index d1af39015d..bc38234262 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -29,7 +29,7 @@ #include "../ride/ride.h" #include "../ride/ride_data.h" #include "../ride/RideGroupManager.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../world/scenery.h" #include "NewsItem.h" #include "Finance.h" diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/map_element/map_element.c index 82dbedc247..f46ed74e80 100644 --- a/src/openrct2/paint/map_element/map_element.c +++ b/src/openrct2/paint/map_element/map_element.c @@ -19,7 +19,7 @@ #include "map_element.h" #include "../../drawing/drawing.h" #include "../../ride/ride_data.h" -#include "../../ride/track_data.h" +#include "../../ride/TrackData.h" #include "../../ride/track_paint.h" #include "../../config/Config.h" #include "../../world/sprite.h" diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 8c8cd38305..bea99e832b 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -42,7 +42,7 @@ #include "../peep/Staff.h" #include "../ride/ride.h" #include "../ride/ride_ratings.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../scenario/scenario.h" #include "../util/sawyercoding.h" #include "../util/util.h" diff --git a/src/openrct2/ride/RideGroupManager.cpp b/src/openrct2/ride/RideGroupManager.cpp index d31af75273..22c8d55232 100644 --- a/src/openrct2/ride/RideGroupManager.cpp +++ b/src/openrct2/ride/RideGroupManager.cpp @@ -25,7 +25,7 @@ #include "ride.h" #include "ride_data.h" #include "Track.h" -#include "track_data.h" +#include "TrackData.h" static const RideGroup ride_group_corkscrew_rc = { /*.RideType =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index f6fd315e62..42898a1590 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -37,7 +37,7 @@ #include "RideGroupManager.h" #include "Station.h" #include "Track.h" -#include "track_data.h" +#include "TrackData.h" uint8 gTrackGroundFlags; diff --git a/src/openrct2/ride/track_data.c b/src/openrct2/ride/TrackData.cpp similarity index 99% rename from src/openrct2/ride/track_data.c rename to src/openrct2/ride/TrackData.cpp index 96ef96b226..36983c1ac6 100644 --- a/src/openrct2/ride/track_data.c +++ b/src/openrct2/ride/TrackData.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "Track.h" -#include "track_data.h" +#include "TrackData.h" #include "track_paint.h" const rct_track_coordinates FlatTrackCoordinates[] = { diff --git a/src/openrct2/ride/track_data.h b/src/openrct2/ride/TrackData.h similarity index 100% rename from src/openrct2/ride/track_data.h rename to src/openrct2/ride/TrackData.h diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 83ad2d572b..cf0d6160ff 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -37,7 +37,7 @@ #include "ride.h" #include "ride_data.h" #include "Track.h" -#include "track_data.h" +#include "TrackData.h" #include "TrackDesign.h" typedef struct map_backup diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index b7706f5ca6..dfcfbd6493 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -40,7 +40,7 @@ #include "ride_data.h" #include "Station.h" #include "Track.h" -#include "track_data.h" +#include "TrackData.h" #include "vehicle_data.h" static void vehicle_update(rct_vehicle * vehicle); diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index 719816ed41..d7cda84217 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" enum diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index ed5b44a834..e4fb71228a 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x006FE5B4 */ diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 0128aef1ae..51ecd3219f 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" #include "BolligerMabillardTrack.h" diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index f5e88a2c2f..aafc25b5c7 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008AE6E0 */ diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index cc36093792..60f1180640 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A7AF8 */ diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index ae855d2f1e..eec2b03f54 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x007C6FF4 */ diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 10fe6288ea..1f099d83b6 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008AD674 */ diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 7752364678..e8f2c380b9 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x0087694C */ diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index f97f5e223e..37ddf0ff1f 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x00890CB4 */ diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 6352541e6c..139989794f 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008B0460 */ diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index dd8b658b31..004ced00f6 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A92E8 */ diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 3113f2b1a4..1e8b515676 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -25,7 +25,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" #include "JuniorRollerCoaster.h" diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 5c26452519..4272854c54 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x0082491C */ diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 1e5076471d..bced87f8cc 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */ diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index ebc3a02561..fd3546f0ed 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A6370 */ diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index b9b4122281..8c9aaf9be7 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008B08D0 */ diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 2ec853dd37..d80481fbc7 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x0071BFA4 */ diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 78fdde2e9f..71a6622771 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A4ABC */ diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 1983d297da..5cfc2812d2 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008AFE9C */ diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 76cdb98cac..a2f59578c9 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x00792D88 */ diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 6437691c92..049996c4da 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" enum diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 5acba65518..7b31b94c3a 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index a7132b6d76..109373ea6d 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x0077839C */ diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 6d2324e665..59aa1d300a 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A7114 */ diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index f1e7641e4b..70465b0d11 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A59A8 */ diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 9d9008f006..94e9a34f66 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008A8958 */ diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 035c72e316..3a16437f50 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" #include "BolligerMabillardTrack.h" diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index 61e41d3dc5..393ed5fbc4 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../paint/supports.h" -#include "../track_data.h" +#include "../TrackData.h" #include "BolligerMabillardTrack.h" /** rct2: 0x008AA00C */ diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index 39703d22bc..a05a3e4656 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" enum diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 6ba0835ca3..ff625fdfd2 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" typedef struct sprite_bb_2 diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index ab8ff18d28..fe28d7612d 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" enum diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index b11ab7bcc0..ad4bf2f515 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -21,7 +21,7 @@ #include "../../paint/supports.h" #include "../../world/map.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" #include "../vehicle_paint.h" diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 0f5a182408..81a26c65e6 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -51,7 +51,7 @@ #include "RideGroupManager.h" #include "Station.h" #include "Track.h" -#include "track_data.h" +#include "TrackData.h" #pragma region Ride classification table diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index ff563577c9..3f58cb2744 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x014280BC */ diff --git a/src/openrct2/ride/track_data_old.c b/src/openrct2/ride/track_data_old.c index 1434605e0f..1746356317 100644 --- a/src/openrct2/ride/track_data_old.c +++ b/src/openrct2/ride/track_data_old.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "track_data.h" +#include "TrackData.h" /** rct2: 0x008A42F4 */ static const uint32 _OldSpiralRollerCoasterTrackPaintFunctions[256] = { diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index caf84c125c..5bc6e2ae65 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -26,7 +26,7 @@ #include "../world/scenery.h" #include "ride_data.h" #include "Track.h" -#include "track_data.h" +#include "TrackData.h" #include "TrackDesign.h" #include "TrackDesignRepository.h" #include "../Context.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index d4724c99d6..dfaf310f89 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -25,7 +25,7 @@ #include "../world/map.h" #include "../world/sprite.h" #include "ride_data.h" -#include "track_data.h" +#include "TrackData.h" #include "track_paint.h" #include "../paint/map_element/map_element.h" diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 09846b57af..049888e2ac 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -23,7 +23,7 @@ #include "../../world/map.h" #include "../../world/sprite.h" #include "../ride_data.h" -#include "../track_data.h" +#include "../TrackData.h" #include "../track_paint.h" /** rct2: 0x008636F4 */ diff --git a/src/openrct2/windows/Ride.cpp b/src/openrct2/windows/Ride.cpp index fcb39e37f8..9b40dafbc6 100644 --- a/src/openrct2/windows/Ride.cpp +++ b/src/openrct2/windows/Ride.cpp @@ -38,7 +38,7 @@ #include "../rct1.h" #include "../ride/ride_data.h" #include "../ride/Track.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../sprites.h" #include "dropdown.h" diff --git a/src/openrct2/windows/RideConstruction.cpp b/src/openrct2/windows/RideConstruction.cpp index 6861ddbd81..27bb714918 100644 --- a/src/openrct2/windows/RideConstruction.cpp +++ b/src/openrct2/windows/RideConstruction.cpp @@ -30,7 +30,7 @@ #include "../localisation/localisation.h" #include "../ride/ride_data.h" #include "../ride/Track.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../world/footpath.h" #include "dropdown.h" #include "../sprites.h" diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 84861b242a..cbaffe728e 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -22,7 +22,7 @@ #include "../game.h" #include "../localisation/string_ids.h" #include "../ride/Track.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "map.h" #include "park.h" #include "scenery.h" diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 4db2fd3efa..15e16118f2 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -22,7 +22,7 @@ #include "../OpenRCT2.h" #include "../ride/Station.h" #include "../ride/Track.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../util/util.h" void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z); diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index c641ae045d..bbad81a19d 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -29,7 +29,7 @@ #include "../OpenRCT2.h" #include "../ride/ride_data.h" #include "../ride/Track.h" -#include "../ride/track_data.h" +#include "../ride/TrackData.h" #include "../scenario/scenario.h" #include "../util/util.h" #include "../windows/Intent.h" diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index 5aa49a0281..1353012367 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -7,7 +7,7 @@ endif () set(OPENRCT2_SRCPATH "${ROOT_DIR}/src/openrct2") file(GLOB_RECURSE ORCT2_RIDE_SOURCES "${OPENRCT2_SRCPATH}/ride/*/*.cpp") file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c" - "${OPENRCT2_SRCPATH}/ride/track_data.c" + "${OPENRCT2_SRCPATH}/ride/TrackData.cpp" "${OPENRCT2_SRCPATH}/ride/track_data_old.c" "${OPENRCT2_SRCPATH}/ride/track_paint.c" "${OPENRCT2_SRCPATH}/rct2/addresses.c" diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp index 9fdb03a6df..dbf4586bc1 100644 --- a/test/testpaint/TestPaint.cpp +++ b/test/testpaint/TestPaint.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index 1e70dd8e55..45baaa51cf 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include interface ITestTrackFilter { public: diff --git a/test/testpaint/Utils.cpp b/test/testpaint/Utils.cpp index ad3c1eb51c..7fc3d016c9 100644 --- a/test/testpaint/Utils.cpp +++ b/test/testpaint/Utils.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace Utils { int getTrackSequenceCount(uint8 rideType, uint8 trackType) { diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index be31c3ef6f..7b459d3365 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include class PaintCodeGenerator { @@ -113,7 +113,7 @@ private: "../../world/map.h", "../../world/sprite.h", "../ride_data.h", - "../track_data.h", + "../TrackData.h", "../track_paint.h", }; for (auto include : includes) diff --git a/test/testpaint/main.cpp b/test/testpaint/main.cpp index 6a2e4e116a..d1d6e56908 100644 --- a/test/testpaint/main.cpp +++ b/test/testpaint/main.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include typedef struct { uint8 rideType;