From e3f39bf5540d33ef3695c9d49e807b7f183d8a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Thu, 9 Sep 2021 02:20:02 +0300 Subject: [PATCH] Use PascalCase for object members --- src/openrct2/rct2/RCT2.h | 24 ++++++++++++------------ src/openrct2/rct2/S6Exporter.cpp | 24 ++++++++++++------------ src/openrct2/rct2/S6Importer.cpp | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 73cffc8e7f..22575fe640 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -838,20 +838,20 @@ struct rct_s6_data // SC6[3] union { - rct_object_entry objects[RCT2_OBJECT_ENTRY_COUNT]; + rct_object_entry Objects[RCT2_OBJECT_ENTRY_COUNT]; struct { - rct_object_entry rideObjects[RCT12_MAX_RIDE_OBJECTS]; - rct_object_entry sceneryObjects[RCT2_MAX_SMALL_SCENERY_OBJECTS]; - rct_object_entry largeSceneryObjects[RCT2_MAX_LARGE_SCENERY_OBJECTS]; - rct_object_entry wallSceneryObjects[RCT2_MAX_WALL_SCENERY_OBJECTS]; - rct_object_entry bannerObjects[RCT2_MAX_BANNER_OBJECTS]; - rct_object_entry pathObjects[RCT2_MAX_PATH_OBJECTS]; - rct_object_entry pathAdditionObjects[RCT2_MAX_PATH_ADDITION_OBJECTS]; - rct_object_entry sceneryGroupObjects[RCT2_MAX_SCENERY_GROUP_OBJECTS]; - rct_object_entry parkEntranceObjects[RCT2_MAX_PARK_ENTRANCE_OBJECTS]; - rct_object_entry waterObjects[RCT2_MAX_WATER_OBJECTS]; - rct_object_entry scenarioTextObjects[RCT2_MAX_SCENARIO_TEXT_OBJECTS]; + rct_object_entry RideObjects[RCT12_MAX_RIDE_OBJECTS]; + rct_object_entry SceneryObjects[RCT2_MAX_SMALL_SCENERY_OBJECTS]; + rct_object_entry LargeSceneryObjects[RCT2_MAX_LARGE_SCENERY_OBJECTS]; + rct_object_entry WallSceneryObjects[RCT2_MAX_WALL_SCENERY_OBJECTS]; + rct_object_entry BannerObjects[RCT2_MAX_BANNER_OBJECTS]; + rct_object_entry PathObjects[RCT2_MAX_PATH_OBJECTS]; + rct_object_entry PathAdditionObjects[RCT2_MAX_PATH_ADDITION_OBJECTS]; + rct_object_entry SceneryGroupObjects[RCT2_MAX_SCENERY_GROUP_OBJECTS]; + rct_object_entry ParkEntranceObjects[RCT2_MAX_PARK_ENTRANCE_OBJECTS]; + rct_object_entry WaterObjects[RCT2_MAX_WATER_OBJECTS]; + rct_object_entry ScenarioTextObjects[RCT2_MAX_SCENARIO_TEXT_OBJECTS]; }; }; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index e0d28d1986..a101fe8d18 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -120,7 +120,7 @@ void S6Exporter::Save(OpenRCT2::IStream* stream, bool isScenario) } // 3: Write available objects chunk - chunkWriter.WriteChunk(_s6.objects, sizeof(_s6.objects), SAWYER_ENCODING::ROTATE); + chunkWriter.WriteChunk(_s6.Objects, sizeof(_s6.Objects), SAWYER_ENCODING::ROTATE); // 4: Misc fields (data, rand...) chunk chunkWriter.WriteChunk(&_s6.elapsed_months, 16, SAWYER_ENCODING::RLECOMPRESSED); @@ -297,17 +297,17 @@ void S6Exporter::Export() uint32_t researchedTrackPiecesB[128] = {}; auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager(); - ExportObjectList(objectMgr, _s6.rideObjects, ObjectType::Ride, RCT12_MAX_RIDE_OBJECTS); - ExportObjectList(objectMgr, _s6.sceneryObjects, ObjectType::SmallScenery, RCT2_MAX_SMALL_SCENERY_OBJECTS); - ExportObjectList(objectMgr, _s6.largeSceneryObjects, ObjectType::LargeScenery, RCT2_MAX_LARGE_SCENERY_OBJECTS); - ExportObjectList(objectMgr, _s6.wallSceneryObjects, ObjectType::Walls, RCT2_MAX_WALL_SCENERY_OBJECTS); - ExportObjectList(objectMgr, _s6.bannerObjects, ObjectType::Banners, RCT2_MAX_BANNER_OBJECTS); - ExportObjectList(objectMgr, _s6.pathObjects, ObjectType::Paths, RCT2_MAX_PATH_OBJECTS); - ExportObjectList(objectMgr, _s6.pathAdditionObjects, ObjectType::PathBits, RCT2_MAX_PATH_ADDITION_OBJECTS); - ExportObjectList(objectMgr, _s6.sceneryGroupObjects, ObjectType::SceneryGroup, RCT2_MAX_SCENERY_GROUP_OBJECTS); - ExportObjectList(objectMgr, _s6.parkEntranceObjects, ObjectType::ParkEntrance, RCT2_MAX_PARK_ENTRANCE_OBJECTS); - ExportObjectList(objectMgr, _s6.waterObjects, ObjectType::Water, RCT2_MAX_WATER_OBJECTS); - ExportObjectList(objectMgr, _s6.scenarioTextObjects, ObjectType::ScenarioText, RCT2_MAX_SCENARIO_TEXT_OBJECTS); + ExportObjectList(objectMgr, _s6.RideObjects, ObjectType::Ride, RCT12_MAX_RIDE_OBJECTS); + ExportObjectList(objectMgr, _s6.SceneryObjects, ObjectType::SmallScenery, RCT2_MAX_SMALL_SCENERY_OBJECTS); + ExportObjectList(objectMgr, _s6.LargeSceneryObjects, ObjectType::LargeScenery, RCT2_MAX_LARGE_SCENERY_OBJECTS); + ExportObjectList(objectMgr, _s6.WallSceneryObjects, ObjectType::Walls, RCT2_MAX_WALL_SCENERY_OBJECTS); + ExportObjectList(objectMgr, _s6.BannerObjects, ObjectType::Banners, RCT2_MAX_BANNER_OBJECTS); + ExportObjectList(objectMgr, _s6.PathObjects, ObjectType::Paths, RCT2_MAX_PATH_OBJECTS); + ExportObjectList(objectMgr, _s6.PathAdditionObjects, ObjectType::PathBits, RCT2_MAX_PATH_ADDITION_OBJECTS); + ExportObjectList(objectMgr, _s6.SceneryGroupObjects, ObjectType::SceneryGroup, RCT2_MAX_SCENERY_GROUP_OBJECTS); + ExportObjectList(objectMgr, _s6.ParkEntranceObjects, ObjectType::ParkEntrance, RCT2_MAX_PARK_ENTRANCE_OBJECTS); + ExportObjectList(objectMgr, _s6.WaterObjects, ObjectType::Water, RCT2_MAX_WATER_OBJECTS); + ExportObjectList(objectMgr, _s6.ScenarioTextObjects, ObjectType::ScenarioText, RCT2_MAX_SCENARIO_TEXT_OBJECTS); _s6.elapsed_months = static_cast(gDateMonthsElapsed); _s6.current_day = gDateMonthTicks; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index a718b7f882..32fe1918b3 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -169,7 +169,7 @@ public: _isSV7 = _stricmp(extension, ".sv7") == 0; } - chunkReader.ReadChunk(&_s6.objects, sizeof(_s6.objects)); + chunkReader.ReadChunk(&_s6.Objects, sizeof(_s6.Objects)); if (isScenario) { @@ -1586,17 +1586,17 @@ public: { std::vector result; - AddRequiredObjects(result, _s6.rideObjects, MAX_RIDE_OBJECTS); - AddRequiredObjects(result, _s6.sceneryObjects, MAX_SMALL_SCENERY_OBJECTS); - AddRequiredObjects(result, _s6.largeSceneryObjects, MAX_LARGE_SCENERY_OBJECTS); - AddRequiredObjects(result, _s6.wallSceneryObjects, MAX_WALL_SCENERY_OBJECTS); - AddRequiredObjects(result, _s6.bannerObjects, MAX_BANNER_OBJECTS); - AddRequiredObjects(result, _s6.pathObjects, MAX_PATH_OBJECTS); - AddRequiredObjects(result, _s6.pathAdditionObjects, MAX_PATH_ADDITION_OBJECTS); - AddRequiredObjects(result, _s6.sceneryGroupObjects, MAX_SCENERY_GROUP_OBJECTS); - AddRequiredObjects(result, _s6.parkEntranceObjects, MAX_PARK_ENTRANCE_OBJECTS); - AddRequiredObjects(result, _s6.waterObjects, MAX_WATER_OBJECTS); - AddRequiredObjects(result, _s6.scenarioTextObjects, MAX_SCENARIO_TEXT_OBJECTS); + AddRequiredObjects(result, _s6.RideObjects, MAX_RIDE_OBJECTS); + AddRequiredObjects(result, _s6.SceneryObjects, MAX_SMALL_SCENERY_OBJECTS); + AddRequiredObjects(result, _s6.LargeSceneryObjects, MAX_LARGE_SCENERY_OBJECTS); + AddRequiredObjects(result, _s6.WallSceneryObjects, MAX_WALL_SCENERY_OBJECTS); + AddRequiredObjects(result, _s6.BannerObjects, MAX_BANNER_OBJECTS); + AddRequiredObjects(result, _s6.PathObjects, MAX_PATH_OBJECTS); + AddRequiredObjects(result, _s6.PathAdditionObjects, MAX_PATH_ADDITION_OBJECTS); + AddRequiredObjects(result, _s6.SceneryGroupObjects, MAX_SCENERY_GROUP_OBJECTS); + AddRequiredObjects(result, _s6.ParkEntranceObjects, MAX_PARK_ENTRANCE_OBJECTS); + AddRequiredObjects(result, _s6.WaterObjects, MAX_WATER_OBJECTS); + AddRequiredObjects(result, _s6.ScenarioTextObjects, MAX_SCENARIO_TEXT_OBJECTS); return result; }