From bb94ee8bc054c697295d9b43cb9b168208b5060f Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Thu, 13 Feb 2025 23:07:55 +0100 Subject: [PATCH] Rename ObjectType enum to follow recent code style (#23810) --- .../windows/EditorInventionsList.cpp | 6 +- .../windows/EditorObjectSelection.cpp | 94 +++++++++---------- src/openrct2-ui/windows/Footpath.cpp | 16 ++-- src/openrct2-ui/windows/Land.cpp | 6 +- src/openrct2-ui/windows/MapGen.cpp | 4 +- src/openrct2-ui/windows/ObjectLoadError.cpp | 20 ++-- src/openrct2/Editor.cpp | 30 +++--- src/openrct2/EditorObjectSelectionSession.cpp | 76 +++++++-------- src/openrct2/EditorObjectSelectionSession.h | 2 +- src/openrct2/actions/RideSetSettingAction.cpp | 2 +- .../actions/SurfaceSetStyleAction.cpp | 6 +- src/openrct2/audio/Audio.cpp | 8 +- .../command_line/ParkInfoCommands.cpp | 34 +++---- src/openrct2/interface/InteractiveConsole.cpp | 6 +- src/openrct2/management/Research.cpp | 14 +-- src/openrct2/object/AudioObject.h | 2 +- src/openrct2/object/BannerObject.h | 2 +- src/openrct2/object/BannerSceneryEntry.h | 2 +- src/openrct2/object/EntranceObject.h | 2 +- src/openrct2/object/FootpathObject.h | 2 +- src/openrct2/object/FootpathRailingsObject.h | 2 +- src/openrct2/object/FootpathSurfaceObject.h | 2 +- src/openrct2/object/LargeSceneryEntry.h | 2 +- src/openrct2/object/LargeSceneryObject.h | 2 +- src/openrct2/object/MusicObject.h | 2 +- src/openrct2/object/Object.h | 2 +- src/openrct2/object/ObjectFactory.cpp | 84 ++++++++--------- src/openrct2/object/ObjectList.cpp | 8 +- src/openrct2/object/ObjectManager.cpp | 20 ++-- src/openrct2/object/ObjectRepository.cpp | 10 +- src/openrct2/object/ObjectTypes.cpp | 58 ++++++------ src/openrct2/object/ObjectTypes.h | 44 ++++----- src/openrct2/object/PathAdditionEntry.h | 2 +- src/openrct2/object/PathAdditionObject.h | 2 +- src/openrct2/object/PeepAnimationsObject.h | 2 +- src/openrct2/object/PeepNamesObject.h | 2 +- src/openrct2/object/RideObject.h | 2 +- src/openrct2/object/ScenarioTextObject.h | 2 +- src/openrct2/object/SceneryGroupEntry.h | 2 +- src/openrct2/object/SceneryGroupObject.cpp | 10 +- src/openrct2/object/SceneryGroupObject.h | 2 +- src/openrct2/object/SmallSceneryEntry.h | 2 +- src/openrct2/object/SmallSceneryObject.h | 2 +- src/openrct2/object/StationObject.h | 2 +- src/openrct2/object/TerrainEdgeObject.cpp | 2 +- src/openrct2/object/TerrainEdgeObject.h | 2 +- src/openrct2/object/TerrainSurfaceObject.cpp | 2 +- src/openrct2/object/TerrainSurfaceObject.h | 2 +- src/openrct2/object/WallObject.h | 2 +- src/openrct2/object/WallSceneryEntry.h | 2 +- src/openrct2/object/WaterEntry.h | 2 +- src/openrct2/object/WaterObject.h | 2 +- .../paint/tile_element/Paint.Entrance.cpp | 2 +- src/openrct2/park/Legacy.cpp | 12 +-- src/openrct2/park/ParkFile.cpp | 6 +- src/openrct2/rct1/S4Importer.cpp | 66 ++++++------- src/openrct2/rct12/RCT12.cpp | 4 +- src/openrct2/rct2/RCT2.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 30 +++--- src/openrct2/rct2/T6Exporter.cpp | 2 +- src/openrct2/rct2/T6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 6 +- src/openrct2/ride/RideAudio.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 46 ++++----- src/openrct2/ride/TrackDesignSave.cpp | 12 +-- src/openrct2/scenario/Scenario.cpp | 2 +- .../scripting/bindings/object/ScObject.hpp | 2 +- .../bindings/object/ScObjectManager.cpp | 18 ++-- .../scripting/bindings/ride/ScRide.cpp | 4 +- .../scripting/bindings/world/ScResearch.cpp | 2 +- src/openrct2/world/Footpath.cpp | 6 +- src/openrct2/world/Scenery.cpp | 40 ++++---- .../world/map_generator/SurfaceSelection.cpp | 2 +- .../world/map_generator/TreePlacement.cpp | 4 +- .../world/tile_element/SurfaceElement.cpp | 2 +- 75 files changed, 446 insertions(+), 446 deletions(-) diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 960056896f..2cd947c58e 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -96,7 +96,7 @@ namespace OpenRCT2::Ui::Windows for (const auto& ride : GetRideManager()) { Editor::SetSelectedObject( - ObjectType::Ride, ride.subtype, ObjectSelectionFlags::Selected | ObjectSelectionFlags::InUse); + ObjectType::ride, ride.subtype, ObjectSelectionFlags::Selected | ObjectSelectionFlags::InUse); } } @@ -390,9 +390,9 @@ namespace OpenRCT2::Ui::Windows return; // Preview image - ObjectType objectEntryType = ObjectType::SceneryGroup; + ObjectType objectEntryType = ObjectType::sceneryGroup; if (researchItem->type == Research::EntryType::Ride) - objectEntryType = ObjectType::Ride; + objectEntryType = ObjectType::ride; auto chunk = ObjectEntryGetChunk(objectEntryType, researchItem->entryIndex); if (chunk == nullptr) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 85c28df1e1..3846d3e415 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -108,7 +108,7 @@ namespace OpenRCT2::Ui::Windows static constexpr uint8_t _numSourceGameItems = 8; static uint32_t _filter_flags; - static uint16_t _filter_object_counts[EnumValue(ObjectType::Count)]; + static uint16_t _filter_object_counts[EnumValue(ObjectType::count)]; static char _filter_string[MAX_PATH]; @@ -143,54 +143,54 @@ namespace OpenRCT2::Ui::Windows // clang-format off static ObjectSubTab kRideObjectSubTabs[] = { - { STR_OBJECT_FILTER_ALL_RIDES_TIP, ObjectType::Ride, FILTER_RIDES_ALL, SPR_G2_INFINITY, 1, 1 }, - { STR_TRANSPORT_RIDES_TIP, ObjectType::Ride, FILTER_RIDE_TRANSPORT, SPR_TAB_RIDES_TRANSPORT_0, 20, 4 }, - { STR_GENTLE_RIDES_TIP, ObjectType::Ride, FILTER_RIDE_GENTLE, SPR_TAB_RIDES_GENTLE_0, 32, 8 }, - { STR_ROLLER_COASTERS_TIP, ObjectType::Ride, FILTER_RIDE_COASTER, SPR_TAB_RIDES_ROLLER_COASTERS_0, 10, 2 }, - { STR_THRILL_RIDES_TIP, ObjectType::Ride, FILTER_RIDE_THRILL, SPR_TAB_RIDES_THRILL_0, 72, 4 }, - { STR_WATER_RIDES_TIP, ObjectType::Ride, FILTER_RIDE_WATER, SPR_TAB_RIDES_WATER_0, 24, 4 }, - { STR_SHOPS_STALLS_TIP, ObjectType::Ride, FILTER_RIDE_STALL, SPR_TAB_RIDES_SHOP_0, 28, 4 }, + { STR_OBJECT_FILTER_ALL_RIDES_TIP, ObjectType::ride, FILTER_RIDES_ALL, SPR_G2_INFINITY, 1, 1 }, + { STR_TRANSPORT_RIDES_TIP, ObjectType::ride, FILTER_RIDE_TRANSPORT, SPR_TAB_RIDES_TRANSPORT_0, 20, 4 }, + { STR_GENTLE_RIDES_TIP, ObjectType::ride, FILTER_RIDE_GENTLE, SPR_TAB_RIDES_GENTLE_0, 32, 8 }, + { STR_ROLLER_COASTERS_TIP, ObjectType::ride, FILTER_RIDE_COASTER, SPR_TAB_RIDES_ROLLER_COASTERS_0, 10, 2 }, + { STR_THRILL_RIDES_TIP, ObjectType::ride, FILTER_RIDE_THRILL, SPR_TAB_RIDES_THRILL_0, 72, 4 }, + { STR_WATER_RIDES_TIP, ObjectType::ride, FILTER_RIDE_WATER, SPR_TAB_RIDES_WATER_0, 24, 4 }, + { STR_SHOPS_STALLS_TIP, ObjectType::ride, FILTER_RIDE_STALL, SPR_TAB_RIDES_SHOP_0, 28, 4 }, }; static ObjectSubTab kSceneryObjectSubTabs[] = { - { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::SceneryGroup, FILTER_NONE, SPR_TAB_SCENERY_STATUES, 1, 1 }, - { STR_OBJECT_SELECTION_SMALL_SCENERY, ObjectType::SmallScenery, FILTER_NONE, SPR_TAB_SCENERY_TREES, 1, 1 }, - { STR_OBJECT_SELECTION_LARGE_SCENERY, ObjectType::LargeScenery, FILTER_NONE, SPR_TAB_SCENERY_URBAN, 1, 1 }, - { STR_OBJECT_SELECTION_WALLS_FENCES, ObjectType::Walls, FILTER_NONE, SPR_TAB_SCENERY_WALLS, 1, 1 }, + { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::sceneryGroup, FILTER_NONE, SPR_TAB_SCENERY_STATUES, 1, 1 }, + { STR_OBJECT_SELECTION_SMALL_SCENERY, ObjectType::smallScenery, FILTER_NONE, SPR_TAB_SCENERY_TREES, 1, 1 }, + { STR_OBJECT_SELECTION_LARGE_SCENERY, ObjectType::largeScenery, FILTER_NONE, SPR_TAB_SCENERY_URBAN, 1, 1 }, + { STR_OBJECT_SELECTION_WALLS_FENCES, ObjectType::walls, FILTER_NONE, SPR_TAB_SCENERY_WALLS, 1, 1 }, }; static ObjectSubTab kPathObjectSubTabs[] = { - { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, ObjectType::FootpathSurface, FILTER_NONE, SPR_G2_PATH_SURFACE_TAB, 1, 1 }, - { STR_OBJECT_SELECTION_FOOTPATH_RAILINGS, ObjectType::FootpathRailings, FILTER_NONE, SPR_G2_PATH_RAILINGS_TAB, 1, 1 }, - { STR_OBJECT_SELECTION_FOOTPATHS, ObjectType::Paths, FILTER_NONE, SPR_G2_LEGACY_PATH_TAB, 1, 1 }, - { STR_OBJECT_SELECTION_PATH_EXTRAS, ObjectType::PathAdditions, FILTER_NONE, SPR_TAB_SCENERY_PATH_ITEMS, 1, 1 }, - { STR_OBJECT_SELECTION_PATH_SIGNS, ObjectType::Banners, FILTER_NONE, SPR_TAB_SCENERY_SIGNAGE, 1, 1 }, + { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, ObjectType::footpathSurface, FILTER_NONE, SPR_G2_PATH_SURFACE_TAB, 1, 1 }, + { STR_OBJECT_SELECTION_FOOTPATH_RAILINGS, ObjectType::footpathRailings, FILTER_NONE, SPR_G2_PATH_RAILINGS_TAB, 1, 1 }, + { STR_OBJECT_SELECTION_FOOTPATHS, ObjectType::paths, FILTER_NONE, SPR_G2_LEGACY_PATH_TAB, 1, 1 }, + { STR_OBJECT_SELECTION_PATH_EXTRAS, ObjectType::pathAdditions, FILTER_NONE, SPR_TAB_SCENERY_PATH_ITEMS, 1, 1 }, + { STR_OBJECT_SELECTION_PATH_SIGNS, ObjectType::banners, FILTER_NONE, SPR_TAB_SCENERY_SIGNAGE, 1, 1 }, }; static ObjectSubTab kEntrancesObjectSubTabs[] = { - { STR_OBJECT_SELECTION_PARK_ENTRANCE, ObjectType::ParkEntrance, FILTER_NONE, SPR_TAB_PARK, 1, 1 }, - { STR_OBJECT_SELECTION_STATIONS, ObjectType::Station, FILTER_NONE, SPR_G2_RIDE_STATION_TAB, 1, 1 }, + { STR_OBJECT_SELECTION_PARK_ENTRANCE, ObjectType::parkEntrance, FILTER_NONE, SPR_TAB_PARK, 1, 1 }, + { STR_OBJECT_SELECTION_STATIONS, ObjectType::station, FILTER_NONE, SPR_G2_RIDE_STATION_TAB, 1, 1 }, }; static ObjectSubTab kTerrainObjectSubTabs[] = { - { STR_OBJECT_SELECTION_TERRAIN_SURFACES, ObjectType::TerrainSurface, FILTER_NONE, SPR_G2_TAB_LAND, 1, 1 }, - { STR_OBJECT_SELECTION_TERRAIN_EDGES, ObjectType::TerrainEdge, FILTER_NONE, SPR_G2_TERRAIN_EDGE_TAB, 1, 1 }, - { STR_OBJECT_SELECTION_WATER, ObjectType::Water, FILTER_NONE, SPR_TAB_WATER, 1, 1 }, + { STR_OBJECT_SELECTION_TERRAIN_SURFACES, ObjectType::terrainSurface, FILTER_NONE, SPR_G2_TAB_LAND, 1, 1 }, + { STR_OBJECT_SELECTION_TERRAIN_EDGES, ObjectType::terrainEdge, FILTER_NONE, SPR_G2_TERRAIN_EDGE_TAB, 1, 1 }, + { STR_OBJECT_SELECTION_WATER, ObjectType::water, FILTER_NONE, SPR_TAB_WATER, 1, 1 }, }; static ObjectSubTab kPeepObjectSubTabs[] = { - { STR_OBJECT_SELECTION_PEEP_ANIMATIONS, ObjectType::PeepAnimations, FILTER_NONE, SPR_G2_PEEP_ANIMATIONS, 1, 1 }, - { STR_OBJECT_SELECTION_PEEP_NAMES, ObjectType::PeepNames, FILTER_NONE, SPR_TAB_GUESTS_0, 1, 1 }, + { STR_OBJECT_SELECTION_PEEP_ANIMATIONS, ObjectType::peepAnimations, FILTER_NONE, SPR_G2_PEEP_ANIMATIONS, 1, 1 }, + { STR_OBJECT_SELECTION_PEEP_NAMES, ObjectType::peepNames, FILTER_NONE, SPR_TAB_GUESTS_0, 1, 1 }, }; static constexpr ObjectPageDesc ObjectSelectionPages[] = { - { STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, ObjectType::Ride, SPR_TAB_RIDE_16, kRideObjectSubTabs }, - { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::SceneryGroup, SPR_TAB_SCENERY_STATUES, kSceneryObjectSubTabs }, - { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, ObjectType::FootpathSurface, SPR_G2_LEGACY_PATH_TAB, kPathObjectSubTabs }, - { STR_OBJECT_SELECTION_PARK_ENTRANCE, ObjectType::ParkEntrance, SPR_TAB_PARK, kEntrancesObjectSubTabs }, - { STR_OBJECT_SELECTION_TERRAIN_SURFACES, ObjectType::TerrainSurface, SPR_G2_TAB_LAND, kTerrainObjectSubTabs }, - { STR_OBJECT_SELECTION_MUSIC, ObjectType::Music, SPR_TAB_MUSIC_0, {} }, - { STR_OBJECT_SELECTION_PEEP_NAMES, ObjectType::PeepNames, SPR_TAB_GUESTS_0, kPeepObjectSubTabs }, + { STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, ObjectType::ride, SPR_TAB_RIDE_16, kRideObjectSubTabs }, + { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::sceneryGroup, SPR_TAB_SCENERY_STATUES, kSceneryObjectSubTabs }, + { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, ObjectType::footpathSurface, SPR_G2_LEGACY_PATH_TAB, kPathObjectSubTabs }, + { STR_OBJECT_SELECTION_PARK_ENTRANCE, ObjectType::parkEntrance, SPR_TAB_PARK, kEntrancesObjectSubTabs }, + { STR_OBJECT_SELECTION_TERRAIN_SURFACES, ObjectType::terrainSurface, SPR_G2_TAB_LAND, kTerrainObjectSubTabs }, + { STR_OBJECT_SELECTION_MUSIC, ObjectType::music, SPR_TAB_MUSIC_0, {} }, + { STR_OBJECT_SELECTION_PEEP_NAMES, ObjectType::peepNames, SPR_TAB_GUESTS_0, kPeepObjectSubTabs }, }; // clang-format on @@ -727,7 +727,7 @@ namespace OpenRCT2::Ui::Windows { // ScrollPaint ScreenCoordsXY screenCoords; - bool ridePage = (GetSelectedObjectType() == ObjectType::Ride); + bool ridePage = (GetSelectedObjectType() == ObjectType::ride); uint8_t paletteIndex = ColourMapA[colours[1].colour].mid_light; GfxClear(dpi, paletteIndex); @@ -976,7 +976,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_FILTER_RIDE_TAB_FRAME].type = WindowWidgetType::Empty; // The ride tab has two headers for the list - bool isRideTab = GetSelectedObjectType() == ObjectType::Ride; + bool isRideTab = GetSelectedObjectType() == ObjectType::ride; if (isRideTab) { int32_t width_limit = (widgets[WIDX_LIST].width() - 15) / 2; @@ -1162,7 +1162,7 @@ namespace OpenRCT2::Ui::Windows scrolls[0].contentOffsetY = 0; frame_no = 0; - if (_page == EnumValue(ObjectType::Ride)) + if (_page == EnumValue(ObjectType::ride)) { _listSortType = RIDE_SORT_TYPE; _listSortDescending = false; @@ -1283,7 +1283,7 @@ namespace OpenRCT2::Ui::Windows screenPos.y += DrawTextWrapped(dpi, screenPos, descriptionWidth, STR_WINDOW_COLOUR_2_STRINGID, ft); screenPos.y += kListRowHeight; } - if (GetSelectedObjectType() == ObjectType::Ride) + if (GetSelectedObjectType() == ObjectType::ride) { auto* rideObject = reinterpret_cast(_loadedObject.get()); const auto& rideEntry = rideObject->GetEntry(); @@ -1305,14 +1305,14 @@ namespace OpenRCT2::Ui::Windows screenPos.y += DrawTextWrapped(dpi, screenPos, descriptionWidth, STR_RIDE_OBJECT_SHOP_SELLS, ft) + 2; } } - else if (GetSelectedObjectType() == ObjectType::SceneryGroup) + else if (GetSelectedObjectType() == ObjectType::sceneryGroup) { const auto* sceneryGroupObject = reinterpret_cast(_loadedObject.get()); auto ft = Formatter(); ft.Add(sceneryGroupObject->GetNumIncludedObjects()); screenPos.y += DrawTextWrapped(dpi, screenPos, descriptionWidth, STR_INCLUDES_X_OBJECTS, ft) + 2; } - else if (GetSelectedObjectType() == ObjectType::Music) + else if (GetSelectedObjectType() == ObjectType::music) { screenPos.y += DrawTextWrapped(dpi, screenPos, descriptionWidth, STR_MUSIC_OBJECT_TRACK_HEADER) + 2; const auto* musicObject = reinterpret_cast(_loadedObject.get()); @@ -1363,14 +1363,14 @@ namespace OpenRCT2::Ui::Windows screenPos.y += kListRowHeight; // Draw ride type. - if (GetSelectedObjectType() == ObjectType::Ride) + if (GetSelectedObjectType() == ObjectType::ride) { auto stringId = GetRideTypeStringId(listItem->repositoryItem); DrawTextBasic(dpi, screenPos, stringId, {}, { COLOUR_WHITE, TextAlignment::RIGHT }); } // Draw peep animation object type - if (GetSelectedObjectType() == ObjectType::PeepAnimations) + if (GetSelectedObjectType() == ObjectType::peepAnimations) { auto* animObj = reinterpret_cast(_loadedObject.get()); auto stringId = GetAnimationPeepTypeStringId(animObj->GetPeepType()); @@ -1452,7 +1452,7 @@ namespace OpenRCT2::Ui::Windows static bool IsFilterInRideType(const ObjectRepositoryItem& item, std::string_view filter) { - if (item.Type == ObjectType::Ride) + if (item.Type == ObjectType::ride) { auto rideTypeName = LanguageGetString(GetRideTypeStringId(&item)); if (String::contains(rideTypeName, filter, true)) @@ -1526,7 +1526,7 @@ namespace OpenRCT2::Ui::Windows bool FilterChunks(const ObjectRepositoryItem* item) { - if (item->Type == ObjectType::Ride) + if (item->Type == ObjectType::ride) { ride_type_t rideType = 0; for (int32_t i = 0; i < RCT2::ObjectLimits::kMaxRideTypesPerRideEntry; i++) @@ -1567,7 +1567,7 @@ namespace OpenRCT2::Ui::Windows { switch (object->GetObjectType()) { - case ObjectType::Ride: + case ObjectType::ride: { const RideObject* rideObject = static_cast(object); return rideObject->GetDescription(); @@ -1625,7 +1625,7 @@ namespace OpenRCT2::Ui::Windows GetGameState().EditorStep = EditorStep::DesignsManager; int32_t entry_index = 0; - for (; ObjectEntryGetChunk(ObjectType::Ride, entry_index) == nullptr; entry_index++) + for (; ObjectEntryGetChunk(ObjectType::ride, entry_index) == nullptr; entry_index++) ; const auto* rideEntry = GetRideEntryByIndex(entry_index); @@ -1708,14 +1708,14 @@ namespace OpenRCT2::Ui::Windows // Defaults selected items to researched (if in-game) auto objectType = loadedObject->GetObjectType(); auto entryIndex = ObjectManagerGetLoadedObjectEntryIndex(loadedObject); - if (objectType == ObjectType::Ride) + if (objectType == ObjectType::ride) { const auto* rideEntry = GetRideEntryByIndex(entryIndex); auto rideType = rideEntry->GetFirstNonNullRideType(); ResearchCategory category = static_cast(GetRideTypeDescriptor(rideType).Category); ResearchInsertRideEntry(rideType, entryIndex, category, true); } - else if (objectType == ObjectType::SceneryGroup) + else if (objectType == ObjectType::sceneryGroup) { ResearchInsertSceneryGroupEntry(entryIndex, true); } @@ -1727,7 +1727,7 @@ namespace OpenRCT2::Ui::Windows } } } - if (_numSelectedObjectsForType[EnumValue(ObjectType::Water)] == 0) + if (_numSelectedObjectsForType[EnumValue(ObjectType::water)] == 0) { // Reloads the default cyan water palette if no palette was selected. LoadPalette(); @@ -1741,7 +1741,7 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = Ui::GetWindowManager(); auto [missingObjectType, errorString] = Editor::CheckObjectSelection(); - if (missingObjectType == ObjectType::None) + if (missingObjectType == ObjectType::none) { windowMgr->CloseByClass(WindowClass::EditorObjectSelection); return true; diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 9b3229756c..ec1b1e3933 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -366,7 +366,7 @@ namespace OpenRCT2::Ui::Windows if (widgetIndex == WIDX_FOOTPATH_TYPE) { gFootpathSelection.IsQueueSelected = false; - if (entryIndex.first == ObjectType::Paths) + if (entryIndex.first == ObjectType::paths) { gFootpathSelection.LegacyPath = entryIndex.second; } @@ -379,7 +379,7 @@ namespace OpenRCT2::Ui::Windows else if (widgetIndex == WIDX_QUEUELINE_TYPE) { gFootpathSelection.IsQueueSelected = true; - if (entryIndex.first == ObjectType::Paths) + if (entryIndex.first == ObjectType::paths) { gFootpathSelection.LegacyPath = entryIndex.second; } @@ -500,7 +500,7 @@ namespace OpenRCT2::Ui::Windows { auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); auto* pathObj = static_cast( - objManager.GetLoadedObject(ObjectType::Paths, gFootpathSelection.LegacyPath)); + objManager.GetLoadedObject(ObjectType::paths, gFootpathSelection.LegacyPath)); if (pathObj != nullptr) { auto pathEntry = reinterpret_cast(pathObj->GetLegacyData()); @@ -641,7 +641,7 @@ namespace OpenRCT2::Ui::Windows auto pathImage = kSpriteIdNull; auto queueImage = kSpriteIdNull; auto pathObj = static_cast( - objManager.GetLoadedObject(ObjectType::Paths, gFootpathSelection.LegacyPath)); + objManager.GetLoadedObject(ObjectType::paths, gFootpathSelection.LegacyPath)); if (pathObj != nullptr) { auto pathEntry = reinterpret_cast(pathObj->GetLegacyData()); @@ -677,7 +677,7 @@ namespace OpenRCT2::Ui::Windows for (ObjectEntryIndex i = 0; i < kMaxFootpathSurfaceObjects; i++) { const auto* pathType = static_cast( - objManager.GetLoadedObject(ObjectType::FootpathSurface, i)); + objManager.GetLoadedObject(ObjectType::footpathSurface, i)); if (pathType == nullptr) { continue; @@ -709,7 +709,7 @@ namespace OpenRCT2::Ui::Windows gDropdownItems[numPathTypes].Format = kStringIdNone; Dropdown::SetImage(numPathTypes, ImageId(pathType->PreviewImageId)); - _dropdownEntries.push_back({ ObjectType::FootpathSurface, i }); + _dropdownEntries.push_back({ ObjectType::footpathSurface, i }); numPathTypes++; } @@ -735,7 +735,7 @@ namespace OpenRCT2::Ui::Windows gDropdownItems[numPathTypes].Format = kStringIdNone; Dropdown::SetImage( numPathTypes, ImageId(showQueues ? pathEntry->GetQueuePreviewImage() : pathEntry->GetPreviewImage())); - _dropdownEntries.push_back({ ObjectType::Paths, i }); + _dropdownEntries.push_back({ ObjectType::paths, i }); numPathTypes++; } @@ -768,7 +768,7 @@ namespace OpenRCT2::Ui::Windows gDropdownItems[numRailingsTypes].Format = kStringIdNone; Dropdown::SetImage(numRailingsTypes, ImageId(railingsEntry->PreviewImageId)); - _dropdownEntries.push_back({ ObjectType::FootpathRailings, i }); + _dropdownEntries.push_back({ ObjectType::footpathRailings, i }); numRailingsTypes++; } diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 0ed342fd02..aa7b9ba538 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -307,7 +307,7 @@ namespace OpenRCT2::Ui::Windows { auto& objManager = GetContext()->GetObjectManager(); const auto surfaceObj = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainSurface, gLandToolTerrainSurface)); + objManager.GetLoadedObject(ObjectType::terrainSurface, gLandToolTerrainSurface)); if (surfaceObj != nullptr) { price += numTiles * static_cast(surfaceObj->Price); @@ -844,7 +844,7 @@ namespace OpenRCT2::Ui::Windows { auto& objManager = GetContext()->GetObjectManager(); const auto surfaceObj = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainSurface, _selectedFloorTexture)); + objManager.GetLoadedObject(ObjectType::terrainSurface, _selectedFloorTexture)); ImageId surfaceImage; if (surfaceObj != nullptr) { @@ -854,7 +854,7 @@ namespace OpenRCT2::Ui::Windows } const auto edgeObj = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainEdge, _selectedWallTexture)); + objManager.GetLoadedObject(ObjectType::terrainEdge, _selectedWallTexture)); ImageId edgeImage; if (edgeObj != nullptr) { diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index e5b8e14222..dde484d2ec 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -1181,7 +1181,7 @@ namespace OpenRCT2::Ui::Windows { auto& objManager = GetContext()->GetObjectManager(); const auto surfaceObj = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainSurface, _settings.landTexture)); + objManager.GetLoadedObject(ObjectType::terrainSurface, _settings.landTexture)); ImageId surfaceImage; if (surfaceObj != nullptr) { @@ -1194,7 +1194,7 @@ namespace OpenRCT2::Ui::Windows ImageId edgeImage; const auto edgeObj = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainEdge, _settings.edgeTexture)); + objManager.GetLoadedObject(ObjectType::terrainEdge, _settings.edgeTexture)); if (edgeObj != nullptr) { edgeImage = ImageId(edgeObj->IconImageId); diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 722751eff1..3354c0d03e 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -303,25 +303,25 @@ namespace OpenRCT2::Ui::Windows { switch (type) { - case ObjectType::Ride: + case ObjectType::ride: return STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS; - case ObjectType::SmallScenery: + case ObjectType::smallScenery: return STR_OBJECT_SELECTION_SMALL_SCENERY; - case ObjectType::LargeScenery: + case ObjectType::largeScenery: return STR_OBJECT_SELECTION_LARGE_SCENERY; - case ObjectType::Walls: + case ObjectType::walls: return STR_OBJECT_SELECTION_WALLS_FENCES; - case ObjectType::Banners: + case ObjectType::banners: return STR_OBJECT_SELECTION_PATH_SIGNS; - case ObjectType::Paths: + case ObjectType::paths: return STR_OBJECT_SELECTION_FOOTPATHS; - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: return STR_OBJECT_SELECTION_PATH_EXTRAS; - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: return STR_OBJECT_SELECTION_SCENERY_GROUPS; - case ObjectType::ParkEntrance: + case ObjectType::parkEntrance: return STR_OBJECT_SELECTION_PARK_ENTRANCE; - case ObjectType::Water: + case ObjectType::water: return STR_OBJECT_SELECTION_WATER; default: return STR_UNKNOWN_OBJECT_TYPE; diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 47b2918d01..35804326da 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -55,7 +55,7 @@ using namespace OpenRCT2; namespace OpenRCT2::Editor { - static std::array, EnumValue(ObjectType::Count)> _editorSelectedObjectFlags; + static std::array, EnumValue(ObjectType::count)> _editorSelectedObjectFlags; static void ConvertSaveToScenarioCallback(int32_t result, const utf8* path); static void SetAllLandOwned(); @@ -403,10 +403,10 @@ namespace OpenRCT2::Editor std::pair CheckObjectSelection() { constexpr std::pair kBasicCheckPairs[] = { - { ObjectType::Ride, STR_AT_LEAST_ONE_RIDE_OBJECT_MUST_BE_SELECTED }, - { ObjectType::Station, STR_AT_LEAST_ONE_STATION_OBJECT_MUST_BE_SELECTED }, - { ObjectType::TerrainSurface, STR_AT_LEAST_ONE_TERRAIN_SURFACE_OBJECT_MUST_BE_SELECTED }, - { ObjectType::TerrainEdge, STR_AT_LEAST_ONE_TERRAIN_EDGE_OBJECT_MUST_BE_SELECTED }, + { ObjectType::ride, STR_AT_LEAST_ONE_RIDE_OBJECT_MUST_BE_SELECTED }, + { ObjectType::station, STR_AT_LEAST_ONE_STATION_OBJECT_MUST_BE_SELECTED }, + { ObjectType::terrainSurface, STR_AT_LEAST_ONE_TERRAIN_SURFACE_OBJECT_MUST_BE_SELECTED }, + { ObjectType::terrainEdge, STR_AT_LEAST_ONE_TERRAIN_EDGE_OBJECT_MUST_BE_SELECTED }, }; for (auto& pair : kBasicCheckPairs) @@ -421,23 +421,23 @@ namespace OpenRCT2::Editor const bool isTrackDesignerManager = gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER); if (isTrackDesignerManager) { - return { ObjectType::None, kStringIdNone }; + return { ObjectType::none, kStringIdNone }; } if (!EditorCheckObjectGroupAtLeastOneSurfaceSelected(false)) { - return { ObjectType::FootpathSurface, STR_AT_LEAST_ONE_FOOTPATH_NON_QUEUE_SURFACE_OBJECT_MUST_BE_SELECTED }; + return { ObjectType::footpathSurface, STR_AT_LEAST_ONE_FOOTPATH_NON_QUEUE_SURFACE_OBJECT_MUST_BE_SELECTED }; } if (!EditorCheckObjectGroupAtLeastOneSurfaceSelected(true)) { - return { ObjectType::FootpathSurface, STR_AT_LEAST_ONE_FOOTPATH_QUEUE_SURFACE_OBJECT_MUST_BE_SELECTED }; + return { ObjectType::footpathSurface, STR_AT_LEAST_ONE_FOOTPATH_QUEUE_SURFACE_OBJECT_MUST_BE_SELECTED }; } constexpr std::pair kParkCheckPairs[] = { - { ObjectType::FootpathRailings, STR_AT_LEAST_ONE_FOOTPATH_RAILING_OBJECT_MUST_BE_SELECTED }, - { ObjectType::ParkEntrance, STR_PARK_ENTRANCE_TYPE_MUST_BE_SELECTED }, - { ObjectType::Water, STR_WATER_TYPE_MUST_BE_SELECTED }, - { ObjectType::PeepNames, STR_AT_LEAST_ONE_PEEP_NAMES_OBJECT_MUST_BE_SELECTED }, + { ObjectType::footpathRailings, STR_AT_LEAST_ONE_FOOTPATH_RAILING_OBJECT_MUST_BE_SELECTED }, + { ObjectType::parkEntrance, STR_PARK_ENTRANCE_TYPE_MUST_BE_SELECTED }, + { ObjectType::water, STR_WATER_TYPE_MUST_BE_SELECTED }, + { ObjectType::peepNames, STR_AT_LEAST_ONE_PEEP_NAMES_OBJECT_MUST_BE_SELECTED }, }; for (auto& pair : kParkCheckPairs) @@ -461,11 +461,11 @@ namespace OpenRCT2::Editor { if (!EditorCheckObjectGroupAtLeastOneOfPeepTypeSelected(EnumValue(pair.first))) { - return { ObjectType::PeepAnimations, pair.second }; + return { ObjectType::peepAnimations, pair.second }; } } - return { ObjectType::None, kStringIdNone }; + return { ObjectType::none, kStringIdNone }; } /** @@ -537,7 +537,7 @@ namespace OpenRCT2::Editor { if (index != kObjectEntryIndexNull) { - assert(static_cast(objectType) < getObjectEntryGroupCount(ObjectType::Paths)); + assert(static_cast(objectType) < getObjectEntryGroupCount(ObjectType::paths)); auto& list = _editorSelectedObjectFlags[EnumValue(objectType)]; if (list.size() <= index) { diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 1cab6da468..be2090e2a6 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -47,8 +47,8 @@ using namespace OpenRCT2; std::optional _gSceneryGroupPartialSelectError; std::vector _objectSelectionFlags; -uint32_t _numSelectedObjectsForType[EnumValue(ObjectType::Count)]; -static int32_t _numAvailableObjectsForType[EnumValue(ObjectType::Count)]; +uint32_t _numSelectedObjectsForType[EnumValue(ObjectType::count)]; +static int32_t _numAvailableObjectsForType[EnumValue(ObjectType::count)]; static void SetupInUseSelectionFlags(); static void SetupTrackDesignerObjects(); @@ -80,7 +80,7 @@ static void SetupTrackManagerObjects() { uint8_t* selectionFlags = &_objectSelectionFlags[i]; const ObjectRepositoryItem* item = &items[i]; - if (item->Type == ObjectType::Ride) + if (item->Type == ObjectType::ride) { *selectionFlags |= ObjectSelectionFlags::Flag6; @@ -109,7 +109,7 @@ static void SetupTrackDesignerObjects() { uint8_t* selectionFlags = &_objectSelectionFlags[i]; const ObjectRepositoryItem* item = &items[i]; - if (item->Type == ObjectType::Ride) + if (item->Type == ObjectType::ride) { *selectionFlags |= ObjectSelectionFlags::Flag6; @@ -165,8 +165,8 @@ void SetupInUseSelectionFlags() auto surfaceIndex = surfaceEl->GetSurfaceObjectIndex(); auto edgeIndex = surfaceEl->GetEdgeObjectIndex(); - Editor::SetSelectedObject(ObjectType::TerrainSurface, surfaceIndex, ObjectSelectionFlags::InUse); - Editor::SetSelectedObject(ObjectType::TerrainEdge, edgeIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::terrainSurface, surfaceIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::terrainEdge, edgeIndex, ObjectSelectionFlags::InUse); break; } case TileElementType::Track: @@ -179,23 +179,23 @@ void SetupInUseSelectionFlags() { auto surfaceEntryIndex = footpathEl->GetSurfaceEntryIndex(); auto railingEntryIndex = footpathEl->GetRailingsEntryIndex(); - Editor::SetSelectedObject(ObjectType::FootpathSurface, surfaceEntryIndex, ObjectSelectionFlags::InUse); - Editor::SetSelectedObject(ObjectType::FootpathRailings, railingEntryIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::footpathSurface, surfaceEntryIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::footpathRailings, railingEntryIndex, ObjectSelectionFlags::InUse); } else { - Editor::SetSelectedObject(ObjectType::Paths, legacyPathEntryIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::paths, legacyPathEntryIndex, ObjectSelectionFlags::InUse); } if (footpathEl->HasAddition()) { auto pathAdditionEntryIndex = footpathEl->GetAdditionEntryIndex(); - Editor::SetSelectedObject(ObjectType::PathAdditions, pathAdditionEntryIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::pathAdditions, pathAdditionEntryIndex, ObjectSelectionFlags::InUse); } break; } case TileElementType::SmallScenery: type = iter.element->AsSmallScenery()->GetEntryIndex(); - Editor::SetSelectedObject(ObjectType::SmallScenery, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::smallScenery, type, ObjectSelectionFlags::InUse); break; case TileElementType::Entrance: { @@ -204,7 +204,7 @@ void SetupInUseSelectionFlags() break; type = iter.element->AsEntrance()->getEntryIndex(); - Editor::SetSelectedObject(ObjectType::ParkEntrance, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::parkEntrance, type, ObjectSelectionFlags::InUse); // Skip if not the middle part if (parkEntranceEl->GetSequenceIndex() != 0) @@ -214,21 +214,21 @@ void SetupInUseSelectionFlags() if (legacyPathEntryIndex == kObjectEntryIndexNull) { auto surfaceEntryIndex = parkEntranceEl->GetSurfaceEntryIndex(); - Editor::SetSelectedObject(ObjectType::FootpathSurface, surfaceEntryIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::footpathSurface, surfaceEntryIndex, ObjectSelectionFlags::InUse); } else { - Editor::SetSelectedObject(ObjectType::Paths, legacyPathEntryIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::paths, legacyPathEntryIndex, ObjectSelectionFlags::InUse); } break; } case TileElementType::Wall: type = iter.element->AsWall()->GetEntryIndex(); - Editor::SetSelectedObject(ObjectType::Walls, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::walls, type, ObjectSelectionFlags::InUse); break; case TileElementType::LargeScenery: type = iter.element->AsLargeScenery()->GetEntryIndex(); - Editor::SetSelectedObject(ObjectType::LargeScenery, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::largeScenery, type, ObjectSelectionFlags::InUse); break; case TileElementType::Banner: { @@ -236,7 +236,7 @@ void SetupInUseSelectionFlags() if (banner != nullptr) { type = banner->type; - Editor::SetSelectedObject(ObjectType::Banners, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::banners, type, ObjectSelectionFlags::InUse); } break; } @@ -245,9 +245,9 @@ void SetupInUseSelectionFlags() for (auto& ride : GetRideManager()) { - Editor::SetSelectedObject(ObjectType::Ride, ride.subtype, ObjectSelectionFlags::InUse); - Editor::SetSelectedObject(ObjectType::Station, ride.entrance_style, ObjectSelectionFlags::InUse); - Editor::SetSelectedObject(ObjectType::Music, ride.music, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::ride, ride.subtype, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::station, ride.entrance_style, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::music, ride.music, ObjectSelectionFlags::InUse); } ObjectEntryIndex lastIndex = kObjectEntryIndexNull; @@ -257,7 +257,7 @@ void SetupInUseSelectionFlags() continue; lastIndex = peep->AnimationObjectIndex; - Editor::SetSelectedObject(ObjectType::PeepAnimations, lastIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::peepAnimations, lastIndex, ObjectSelectionFlags::InUse); } for (auto* peep : EntityList()) { @@ -265,7 +265,7 @@ void SetupInUseSelectionFlags() continue; lastIndex = peep->AnimationObjectIndex; - Editor::SetSelectedObject(ObjectType::PeepAnimations, lastIndex, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::peepAnimations, lastIndex, ObjectSelectionFlags::InUse); } // Apply selected object status for hacked vehicles that may not have an associated ride @@ -274,7 +274,7 @@ void SetupInUseSelectionFlags() ObjectEntryIndex type = vehicle->ride_subtype; if (type != kObjectEntryIndexNull) // cable lifts use index null. Ignore them { - Editor::SetSelectedObject(ObjectType::Ride, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::ride, type, ObjectSelectionFlags::InUse); } } for (auto vehicle : EntityList()) @@ -282,7 +282,7 @@ void SetupInUseSelectionFlags() ObjectEntryIndex type = vehicle->ride_subtype; if (type != kObjectEntryIndexNull) // cable lifts use index null. Ignore them { - Editor::SetSelectedObject(ObjectType::Ride, type, ObjectSelectionFlags::InUse); + Editor::SetSelectedObject(ObjectType::ride, type, ObjectSelectionFlags::InUse); } } @@ -312,7 +312,7 @@ void Sub6AB211() int32_t numObjects = static_cast(ObjectRepositoryGetItemsCount()); _objectSelectionFlags = std::vector(numObjects); - for (uint8_t objectType = 0; objectType < EnumValue(ObjectType::Count); objectType++) + for (uint8_t objectType = 0; objectType < EnumValue(ObjectType::count); objectType++) { _numSelectedObjectsForType[objectType] = 0; _numAvailableObjectsForType[objectType] = 0; @@ -373,7 +373,7 @@ static void RemoveSelectedObjectsFromResearch(const ObjectEntryDescriptor& descr auto entryIndex = objManager.GetLoadedObjectEntryIndex(obj); switch (obj->GetObjectType()) { - case ObjectType::Ride: + case ObjectType::ride: { auto rideEntry = GetRideEntryByIndex(entryIndex); for (auto rideType : rideEntry->ride_type) @@ -386,7 +386,7 @@ static void RemoveSelectedObjectsFromResearch(const ObjectEntryDescriptor& descr } break; } - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: { ResearchItem tmp = {}; tmp.type = Research::EntryType::Scenery; @@ -466,7 +466,7 @@ static void SelectDesignerObjects() static void ReplaceSelectedWaterPalette(const ObjectRepositoryItem* item) { auto& objectManager = OpenRCT2::GetContext()->GetObjectManager(); - auto* oldPalette = objectManager.GetLoadedObject(ObjectType::Water, 0); + auto* oldPalette = objectManager.GetLoadedObject(ObjectType::water, 0); if (oldPalette != nullptr) { @@ -581,7 +581,7 @@ ResultWithMessage WindowEditorObjectSelectionSelectObject( } ObjectType objectType = item->Type; - if (objectType == ObjectType::SceneryGroup && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP)) + if (objectType == ObjectType::sceneryGroup && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP)) { for (const auto& sgEntry : item->SceneryGroupInfo.Entries) { @@ -620,7 +620,7 @@ ResultWithMessage WindowEditorObjectSelectionSelectObject( return ObjectSelectionError(isMasterObject, STR_OBJECT_SELECTION_ERR_TOO_MANY_OF_TYPE_SELECTED); } - if (objectType == ObjectType::SceneryGroup && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP)) + if (objectType == ObjectType::sceneryGroup && (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP)) { for (const auto& sgEntry : item->SceneryGroupInfo.Entries) { @@ -632,12 +632,12 @@ ResultWithMessage WindowEditorObjectSelectionSelectObject( } } } - else if (objectType == ObjectType::Water) + else if (objectType == ObjectType::water) { // Replace old palette with newly selected palette immediately. ReplaceSelectedWaterPalette(item); } - else if (objectType == ObjectType::PeepNames) + else if (objectType == ObjectType::peepNames) { PeepUpdateNames(); } @@ -693,7 +693,7 @@ bool EditorCheckObjectGroupAtLeastOneOfPeepTypeSelected(uint8_t peepType) for (size_t i = 0; i < numObjects; i++) { - const auto isAnimObjectType = items[i].Type == ObjectType::PeepAnimations; + const auto isAnimObjectType = items[i].Type == ObjectType::peepAnimations; const bool isSelected = _objectSelectionFlags[i] & ObjectSelectionFlags::Selected; if (isAnimObjectType && isSelected && items[i].PeepAnimationsInfo.PeepType == peepType) { @@ -711,7 +711,7 @@ bool EditorCheckObjectGroupAtLeastOneSurfaceSelected(bool queue) { const auto& ori = items[i]; auto isQueue = (ori.FootpathSurfaceInfo.Flags & FOOTPATH_ENTRY_FLAG_IS_QUEUE) != 0; - if (ori.Type == ObjectType::FootpathSurface && (_objectSelectionFlags[i] & ObjectSelectionFlags::Selected) + if (ori.Type == ObjectType::footpathSurface && (_objectSelectionFlags[i] & ObjectSelectionFlags::Selected) && queue == isQueue) { return true; @@ -742,19 +742,19 @@ int32_t EditorRemoveUnusedObjects() continue; // The water type controls the entire palette. Removing that object can badly break the game state. - if (objectType == ObjectType::Water) + if (objectType == ObjectType::water) continue; // Avoid the used peep names object being deleted as no in-use checks are performed. - if (objectType == ObjectType::PeepNames) + if (objectType == ObjectType::peepNames) continue; // Avoid deleting peep animation objects, as it ensures we don't delete the last ones for a kind of peep. - if (objectType == ObjectType::PeepAnimations) + if (objectType == ObjectType::peepAnimations) continue; // It’s hard to determine exactly if a scenery group is used, so do not remove these automatically. - if (objectType == ObjectType::SceneryGroup) + if (objectType == ObjectType::sceneryGroup) continue; _numSelectedObjectsForType[EnumValue(objectType)]--; diff --git a/src/openrct2/EditorObjectSelectionSession.h b/src/openrct2/EditorObjectSelectionSession.h index 73300148fd..b6af31af1e 100644 --- a/src/openrct2/EditorObjectSelectionSession.h +++ b/src/openrct2/EditorObjectSelectionSession.h @@ -26,7 +26,7 @@ enum EDITOR_INPUT_FLAGS extern std::optional _gSceneryGroupPartialSelectError; extern std::vector _objectSelectionFlags; -extern uint32_t _numSelectedObjectsForType[EnumValue(ObjectType::Count)]; +extern uint32_t _numSelectedObjectsForType[EnumValue(ObjectType::count)]; bool EditorCheckObjectGroupAtLeastOneSelected(ObjectType checkObjectType); bool EditorCheckObjectGroupAtLeastOneOfPeepTypeSelected(uint8_t peepType); diff --git a/src/openrct2/actions/RideSetSettingAction.cpp b/src/openrct2/actions/RideSetSettingAction.cpp index 3e03fa1f40..732a6212ec 100644 --- a/src/openrct2/actions/RideSetSettingAction.cpp +++ b/src/openrct2/actions/RideSetSettingAction.cpp @@ -116,7 +116,7 @@ GameActions::Result RideSetSettingAction::Query() const case RideSetSetting::MusicType: { auto& objManager = GetContext()->GetObjectManager(); - auto musicObj = objManager.GetLoadedObject(ObjectType::Music, _value); + auto musicObj = objManager.GetLoadedObject(ObjectType::music, _value); if (musicObj == nullptr) { LOG_ERROR("Invalid music style: %u", _value); diff --git a/src/openrct2/actions/SurfaceSetStyleAction.cpp b/src/openrct2/actions/SurfaceSetStyleAction.cpp index 6c0887f47a..26c8ca98cb 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.cpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.cpp @@ -55,7 +55,7 @@ GameActions::Result SurfaceSetStyleAction::Query() const if (_surfaceStyle != kObjectEntryIndexNull) { const auto surfaceObj = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainSurface, _surfaceStyle)); + objManager.GetLoadedObject(ObjectType::terrainSurface, _surfaceStyle)); if (surfaceObj == nullptr) { @@ -124,7 +124,7 @@ GameActions::Result SurfaceSetStyleAction::Query() const if (_surfaceStyle != curSurfaceStyle) { const auto surfaceObject = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainSurface, _surfaceStyle)); + objManager.GetLoadedObject(ObjectType::terrainSurface, _surfaceStyle)); if (surfaceObject != nullptr) { surfaceCost += surfaceObject->Price; @@ -193,7 +193,7 @@ GameActions::Result SurfaceSetStyleAction::Execute() const { auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); const auto surfaceObject = static_cast( - objManager.GetLoadedObject(ObjectType::TerrainSurface, _surfaceStyle)); + objManager.GetLoadedObject(ObjectType::terrainSurface, _surfaceStyle)); if (surfaceObject != nullptr) { surfaceCost += surfaceObject->Price; diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 5c07aeef9a..599688ec14 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -190,13 +190,13 @@ namespace OpenRCT2::Audio if (id >= SoundId::LiftRMC) { audioObject = static_cast( - objManager.GetLoadedObject(ObjectType::Audio, _soundsAdditionalAudioObjectEntryIndex)); + objManager.GetLoadedObject(ObjectType::audio, _soundsAdditionalAudioObjectEntryIndex)); sampleIndex -= EnumValue(SoundId::LiftRMC); } else { audioObject = static_cast( - objManager.GetLoadedObject(ObjectType::Audio, _soundsAudioObjectEntryIndex)); + objManager.GetLoadedObject(ObjectType::audio, _soundsAudioObjectEntryIndex)); } return std::make_tuple(audioObject, sampleIndex); } @@ -285,7 +285,7 @@ namespace OpenRCT2::Audio if (it != musicMap.end()) { - return ObjectEntryDescriptor(ObjectType::Audio, it->second); + return ObjectEntryDescriptor(ObjectType::audio, it->second); } // No music descriptor for the current setting, intentional for TitleMusicKind::None @@ -363,7 +363,7 @@ namespace OpenRCT2::Audio if (_titleAudioObjectEntryIndex != kObjectEntryIndexNull) { auto& objManager = GetContext()->GetObjectManager(); - auto* obj = objManager.GetLoadedObject(ObjectType::Audio, _titleAudioObjectEntryIndex); + auto* obj = objManager.GetLoadedObject(ObjectType::audio, _titleAudioObjectEntryIndex); if (obj != nullptr) { objManager.UnloadObjects({ obj->GetDescriptor() }); diff --git a/src/openrct2/command_line/ParkInfoCommands.cpp b/src/openrct2/command_line/ParkInfoCommands.cpp index 415155ddc1..bd7678415f 100644 --- a/src/openrct2/command_line/ParkInfoCommands.cpp +++ b/src/openrct2/command_line/ParkInfoCommands.cpp @@ -100,23 +100,23 @@ static exitcode_t HandleObjectsInfo(CommandLineArgEnumerator* argEnumerator) }; for (auto& objType : { - ObjectType::Ride, - ObjectType::SmallScenery, - ObjectType::LargeScenery, - ObjectType::Walls, - ObjectType::Banners, - ObjectType::Paths, - ObjectType::PathAdditions, - ObjectType::SceneryGroup, - ObjectType::ParkEntrance, - ObjectType::Water, - ObjectType::ScenarioText, - ObjectType::TerrainSurface, - ObjectType::TerrainEdge, - ObjectType::Station, - ObjectType::Music, - ObjectType::FootpathSurface, - ObjectType::FootpathRailings, + ObjectType::ride, + ObjectType::smallScenery, + ObjectType::largeScenery, + ObjectType::walls, + ObjectType::banners, + ObjectType::paths, + ObjectType::pathAdditions, + ObjectType::sceneryGroup, + ObjectType::parkEntrance, + ObjectType::water, + ObjectType::scenarioText, + ObjectType::terrainSurface, + ObjectType::terrainEdge, + ObjectType::station, + ObjectType::music, + ObjectType::footpathSurface, + ObjectType::footpathRailings, }) { auto& list = loadResult.RequiredObjects.GetList(objType); diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 53369fb1d4..2a66e9f5da 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1110,7 +1110,7 @@ static void ConsoleCommandLoadObject(InteractiveConsole& console, const argument auto groupIndex = ObjectManagerGetLoadedObjectEntryIndex(loadedObject); ObjectType objectType = entry->GetType(); - if (objectType == ObjectType::Ride) + if (objectType == ObjectType::ride) { // Automatically research the ride so it's supported by the game. const auto* rideEntry = GetRideEntryByIndex(groupIndex); @@ -1129,7 +1129,7 @@ static void ConsoleCommandLoadObject(InteractiveConsole& console, const argument ResearchResetCurrentItem(); gSilentResearch = false; } - else if (objectType == ObjectType::SceneryGroup) + else if (objectType == ObjectType::sceneryGroup) { ResearchInsertSceneryGroupEntry(groupIndex, true); @@ -1172,7 +1172,7 @@ constexpr auto _objectTypeNames = std::to_array({ STR_OBJECT_SELECTION_PEEP_NAMES, STR_OBJECT_SELECTION_PEEP_ANIMATIONS, }); -static_assert(_objectTypeNames.size() == EnumValue(ObjectType::Count)); +static_assert(_objectTypeNames.size() == EnumValue(ObjectType::count)); static void ConsoleCommandCountObjects(InteractiveConsole& console, [[maybe_unused]] const arguments_t& argv) { diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index f4665c0be9..7ae376b20e 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -542,19 +542,19 @@ bool ResearchIsInvented(ObjectType objectType, ObjectEntryIndex index) { switch (objectType) { - case ObjectType::Ride: + case ObjectType::ride: return RideEntryIsInvented(index); - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: return SceneryGroupIsInvented(index); - case ObjectType::SmallScenery: + case ObjectType::smallScenery: return SceneryIsInvented({ SCENERY_TYPE_SMALL, index }); - case ObjectType::LargeScenery: + case ObjectType::largeScenery: return SceneryIsInvented({ SCENERY_TYPE_LARGE, index }); - case ObjectType::Walls: + case ObjectType::walls: return SceneryIsInvented({ SCENERY_TYPE_WALL, index }); - case ObjectType::Banners: + case ObjectType::banners: return SceneryIsInvented({ SCENERY_TYPE_BANNER, index }); - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: return SceneryIsInvented({ SCENERY_TYPE_PATH_ITEM, index }); default: return true; diff --git a/src/openrct2/object/AudioObject.h b/src/openrct2/object/AudioObject.h index 8df6d840f5..e7b5c2bffb 100644 --- a/src/openrct2/object/AudioObject.h +++ b/src/openrct2/object/AudioObject.h @@ -23,7 +23,7 @@ private: AudioSampleTable _loadedSampleTable; public: - static constexpr ObjectType kObjectType = ObjectType::Audio; + static constexpr ObjectType kObjectType = ObjectType::audio; void ReadJson(IReadObjectContext* context, json_t& root) override; void Load() override; diff --git a/src/openrct2/object/BannerObject.h b/src/openrct2/object/BannerObject.h index 794defcfbc..b3111000c6 100644 --- a/src/openrct2/object/BannerObject.h +++ b/src/openrct2/object/BannerObject.h @@ -19,7 +19,7 @@ private: BannerSceneryEntry _legacyType = {}; public: - static constexpr ObjectType kObjectType = ObjectType::Banners; + static constexpr ObjectType kObjectType = ObjectType::banners; void* GetLegacyData() override { diff --git a/src/openrct2/object/BannerSceneryEntry.h b/src/openrct2/object/BannerSceneryEntry.h index 5889e27028..33b2d23907 100644 --- a/src/openrct2/object/BannerSceneryEntry.h +++ b/src/openrct2/object/BannerSceneryEntry.h @@ -20,7 +20,7 @@ enum struct BannerSceneryEntry { - static constexpr auto kObjectType = ObjectType::Banners; + static constexpr auto kObjectType = ObjectType::banners; StringId name; uint32_t image; diff --git a/src/openrct2/object/EntranceObject.h b/src/openrct2/object/EntranceObject.h index afdd0cb7de..d8d5b57d5d 100644 --- a/src/openrct2/object/EntranceObject.h +++ b/src/openrct2/object/EntranceObject.h @@ -20,7 +20,7 @@ private: EntranceEntry _legacyType = {}; public: - static constexpr ObjectType kObjectType = ObjectType::ParkEntrance; + static constexpr ObjectType kObjectType = ObjectType::parkEntrance; void* GetLegacyData() override { diff --git a/src/openrct2/object/FootpathObject.h b/src/openrct2/object/FootpathObject.h index d8a41aaa24..3d347068b4 100644 --- a/src/openrct2/object/FootpathObject.h +++ b/src/openrct2/object/FootpathObject.h @@ -22,7 +22,7 @@ private: PathRailingsDescriptor _pathRailingsDescriptor = {}; public: - static constexpr ObjectType kObjectType = ObjectType::Paths; + static constexpr ObjectType kObjectType = ObjectType::paths; void* GetLegacyData() override { diff --git a/src/openrct2/object/FootpathRailingsObject.h b/src/openrct2/object/FootpathRailingsObject.h index 0b609471b9..f22158ac7b 100644 --- a/src/openrct2/object/FootpathRailingsObject.h +++ b/src/openrct2/object/FootpathRailingsObject.h @@ -26,7 +26,7 @@ public: PathRailingsDescriptor _descriptor = {}; public: - static constexpr ObjectType kObjectType = ObjectType::FootpathRailings; + static constexpr ObjectType kObjectType = ObjectType::footpathRailings; void ReadJson(IReadObjectContext* context, json_t& root) override; void Load() override; diff --git a/src/openrct2/object/FootpathSurfaceObject.h b/src/openrct2/object/FootpathSurfaceObject.h index db528027bf..d58b1e8ed5 100644 --- a/src/openrct2/object/FootpathSurfaceObject.h +++ b/src/openrct2/object/FootpathSurfaceObject.h @@ -22,7 +22,7 @@ public: PathSurfaceDescriptor _descriptor = {}; public: - static constexpr ObjectType kObjectType = ObjectType::FootpathSurface; + static constexpr ObjectType kObjectType = ObjectType::footpathSurface; void ReadJson(IReadObjectContext* context, json_t& root) override; void Load() override; diff --git a/src/openrct2/object/LargeSceneryEntry.h b/src/openrct2/object/LargeSceneryEntry.h index 71263ceff9..232fc7f1f8 100644 --- a/src/openrct2/object/LargeSceneryEntry.h +++ b/src/openrct2/object/LargeSceneryEntry.h @@ -62,7 +62,7 @@ enum LARGE_SCENERY_TEXT_FLAGS struct LargeSceneryEntry { - static constexpr auto kObjectType = ObjectType::LargeScenery; + static constexpr auto kObjectType = ObjectType::largeScenery; StringId name; uint32_t image; diff --git a/src/openrct2/object/LargeSceneryObject.h b/src/openrct2/object/LargeSceneryObject.h index c1b0443c7b..3929abdf10 100644 --- a/src/openrct2/object/LargeSceneryObject.h +++ b/src/openrct2/object/LargeSceneryObject.h @@ -24,7 +24,7 @@ private: std::unique_ptr _3dFont; public: - static constexpr ObjectType kObjectType = ObjectType::LargeScenery; + static constexpr ObjectType kObjectType = ObjectType::largeScenery; void* GetLegacyData() override { diff --git a/src/openrct2/object/MusicObject.h b/src/openrct2/object/MusicObject.h index cf78996fa5..e1d8c9cced 100644 --- a/src/openrct2/object/MusicObject.h +++ b/src/openrct2/object/MusicObject.h @@ -53,7 +53,7 @@ private: uint32_t _previewImageId{}; public: - static constexpr ObjectType kObjectType = ObjectType::Music; + static constexpr ObjectType kObjectType = ObjectType::music; StringId NameStringId{}; diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 5c13fccefc..2ddb44a1ab 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -349,7 +349,7 @@ const Object* ObjectEntryGetObject(ObjectType objectType, ObjectEntryIndex index constexpr bool IsIntransientObjectType(ObjectType type) { - return type == ObjectType::Audio; + return type == ObjectType::audio; } u8string VersionString(const ObjectVersion& version); diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index b258272af5..f13aacef4f 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -270,7 +270,7 @@ namespace OpenRCT2::ObjectFactory RCTObjectEntry entry = fs.ReadValue(); - if (entry.GetType() != ObjectType::ScenarioText) + if (entry.GetType() != ObjectType::scenarioText) { result = CreateObject(entry.GetType()); result->SetDescriptor(ObjectEntryDescriptor(entry)); @@ -334,64 +334,64 @@ namespace OpenRCT2::ObjectFactory std::unique_ptr result; switch (type) { - case ObjectType::Ride: + case ObjectType::ride: result = std::make_unique(); break; - case ObjectType::SmallScenery: + case ObjectType::smallScenery: result = std::make_unique(); break; - case ObjectType::LargeScenery: + case ObjectType::largeScenery: result = std::make_unique(); break; - case ObjectType::Walls: + case ObjectType::walls: result = std::make_unique(); break; - case ObjectType::Banners: + case ObjectType::banners: result = std::make_unique(); break; - case ObjectType::Paths: + case ObjectType::paths: result = std::make_unique(); break; - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: result = std::make_unique(); break; - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: result = std::make_unique(); break; - case ObjectType::ParkEntrance: + case ObjectType::parkEntrance: result = std::make_unique(); break; - case ObjectType::Water: + case ObjectType::water: result = std::make_unique(); break; - case ObjectType::ScenarioText: + case ObjectType::scenarioText: result = std::make_unique(); break; - case ObjectType::TerrainSurface: + case ObjectType::terrainSurface: result = std::make_unique(); break; - case ObjectType::TerrainEdge: + case ObjectType::terrainEdge: result = std::make_unique(); break; - case ObjectType::Station: + case ObjectType::station: result = std::make_unique(); break; - case ObjectType::Music: + case ObjectType::music: result = std::make_unique(); break; - case ObjectType::FootpathSurface: + case ObjectType::footpathSurface: result = std::make_unique(); break; - case ObjectType::FootpathRailings: + case ObjectType::footpathRailings: result = std::make_unique(); break; - case ObjectType::Audio: + case ObjectType::audio: result = std::make_unique(); break; - case ObjectType::PeepNames: + case ObjectType::peepNames: result = std::make_unique(); break; - case ObjectType::PeepAnimations: + case ObjectType::peepAnimations: result = std::make_unique(); break; default: @@ -403,44 +403,44 @@ namespace OpenRCT2::ObjectFactory static ObjectType ParseObjectType(const std::string& s) { if (s == "ride") - return ObjectType::Ride; + return ObjectType::ride; if (s == "footpath_banner") - return ObjectType::Banners; + return ObjectType::banners; if (s == "footpath_item") - return ObjectType::PathAdditions; + return ObjectType::pathAdditions; if (s == "scenery_small") - return ObjectType::SmallScenery; + return ObjectType::smallScenery; if (s == "scenery_large") - return ObjectType::LargeScenery; + return ObjectType::largeScenery; if (s == "scenery_wall") - return ObjectType::Walls; + return ObjectType::walls; if (s == "scenery_group") - return ObjectType::SceneryGroup; + return ObjectType::sceneryGroup; if (s == "park_entrance") - return ObjectType::ParkEntrance; + return ObjectType::parkEntrance; if (s == "water") - return ObjectType::Water; + return ObjectType::water; if (s == "scenario_text") - return ObjectType::ScenarioText; + return ObjectType::scenarioText; if (s == "terrain_surface") - return ObjectType::TerrainSurface; + return ObjectType::terrainSurface; if (s == "terrain_edge") - return ObjectType::TerrainEdge; + return ObjectType::terrainEdge; if (s == "station") - return ObjectType::Station; + return ObjectType::station; if (s == "music") - return ObjectType::Music; + return ObjectType::music; if (s == "footpath_surface") - return ObjectType::FootpathSurface; + return ObjectType::footpathSurface; if (s == "footpath_railings") - return ObjectType::FootpathRailings; + return ObjectType::footpathRailings; if (s == "audio") - return ObjectType::Audio; + return ObjectType::audio; if (s == "peep_names") - return ObjectType::PeepNames; + return ObjectType::peepNames; if (s == "peep_animations") - return ObjectType::PeepAnimations; - return ObjectType::None; + return ObjectType::peepAnimations; + return ObjectType::none; } std::unique_ptr CreateObjectFromZipFile(IObjectRepository& objectRepository, std::string_view path, bool loadImages) @@ -539,7 +539,7 @@ namespace OpenRCT2::ObjectFactory std::unique_ptr result; auto objectType = ParseObjectType(Json::GetString(jRoot["objectType"])); - if (objectType != ObjectType::None) + if (objectType != ObjectType::none) { auto id = Json::GetString(jRoot["id"]); diff --git a/src/openrct2/object/ObjectList.cpp b/src/openrct2/object/ObjectList.cpp index 0f7a1da942..db3379afa9 100644 --- a/src/openrct2/object/ObjectList.cpp +++ b/src/openrct2/object/ObjectList.cpp @@ -22,7 +22,7 @@ #include // 0x0098DA00 -static constexpr std::array kObjectEntryGroupCounts = { +static constexpr std::array kObjectEntryGroupCounts = { kMaxRideObjects, // rides kMaxSmallSceneryObjects, // small scenery kMaxLargeSceneryObjects, // large scenery @@ -38,7 +38,7 @@ static constexpr std::array kObjectEntryG kMaxMusicObjects, kMaxFootpathSurfaceObjects, kMaxFootpathRailingsObjects, kMaxAudioObjects, kMaxPeepNamesObjects, kMaxPeepAnimationsObjects, }; -static_assert(std::size(kObjectEntryGroupCounts) == EnumValue(ObjectType::Count)); +static_assert(std::size(kObjectEntryGroupCounts) == EnumValue(ObjectType::count)); size_t getObjectEntryGroupCount(ObjectType objectType) { @@ -48,7 +48,7 @@ size_t getObjectEntryGroupCount(ObjectType objectType) size_t getObjectTypeLimit(ObjectType type) { auto index = EnumValue(type); - if (index >= EnumValue(ObjectType::Count)) + if (index >= EnumValue(ObjectType::count)) return 0; return static_cast(kObjectEntryGroupCounts[index]); } @@ -209,7 +209,7 @@ void ObjectCreateIdentifierName(char* string_buffer, size_t size, const RCTObjec void ObjectGetTypeEntryIndex(size_t index, ObjectType* outObjectType, ObjectEntryIndex* outEntryIndex) { - uint8_t objectType = EnumValue(ObjectType::Ride); + uint8_t objectType = EnumValue(ObjectType::ride); for (size_t groupCount : kObjectEntryGroupCounts) { if (index >= groupCount) diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 7b3608b152..52a8ae2c67 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -58,7 +58,7 @@ class ObjectManager final : public IObjectManager private: IObjectRepository& _objectRepository; - std::array, EnumValue(ObjectType::Count)> _loadedObjects; + std::array, EnumValue(ObjectType::count)> _loadedObjects; std::array, RIDE_TYPE_COUNT> _rideTypeToObjectMap; // Used to return a safe empty vector back from GetAllRideEntries, can be removed when std::span is available @@ -488,13 +488,13 @@ private: void UpdateSceneryGroupIndexes() { - UpdateSceneryGroupIndexes(ObjectType::SmallScenery); - UpdateSceneryGroupIndexes(ObjectType::LargeScenery); - UpdateSceneryGroupIndexes(ObjectType::Walls); - UpdateSceneryGroupIndexes(ObjectType::Banners); - UpdateSceneryGroupIndexes(ObjectType::PathAdditions); + UpdateSceneryGroupIndexes(ObjectType::smallScenery); + UpdateSceneryGroupIndexes(ObjectType::largeScenery); + UpdateSceneryGroupIndexes(ObjectType::walls); + UpdateSceneryGroupIndexes(ObjectType::banners); + UpdateSceneryGroupIndexes(ObjectType::pathAdditions); - auto& list = GetObjectList(ObjectType::SceneryGroup); + auto& list = GetObjectList(ObjectType::sceneryGroup); for (auto* loadedObject : list) { auto sgObject = static_cast(loadedObject); @@ -535,7 +535,7 @@ private: if (entry.HasValue()) { const auto* ori = _objectRepository.FindObject(entry); - if (ori == nullptr && entry.GetType() == ObjectType::ScenarioText) + if (ori == nullptr && entry.GetType() == ObjectType::scenarioText) { continue; } @@ -735,10 +735,10 @@ private: } // Build object lists - const auto maxRideObjects = static_cast(getObjectEntryGroupCount(ObjectType::Ride)); + const auto maxRideObjects = static_cast(getObjectEntryGroupCount(ObjectType::ride)); for (size_t i = 0; i < maxRideObjects; i++) { - auto* rideObject = static_cast(GetLoadedObject(ObjectType::Ride, i)); + auto* rideObject = static_cast(GetLoadedObject(ObjectType::ride, i)); if (rideObject == nullptr) continue; diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 8668f7e54c..9df16b144d 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -147,24 +147,24 @@ protected: switch (item.Type) { - case ObjectType::Ride: + case ObjectType::ride: ds << item.RideInfo.RideFlags; ds << item.RideInfo.RideCategory; ds << item.RideInfo.RideType; break; - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: { ds << item.SceneryGroupInfo.Entries; break; } - case ObjectType::FootpathSurface: + case ObjectType::footpathSurface: ds << item.FootpathSurfaceInfo.Flags; break; - case ObjectType::PeepAnimations: + case ObjectType::peepAnimations: ds << item.PeepAnimationsInfo.PeepType; break; default: - // Switch processes only ObjectType::Ride and ObjectType::SceneryGroup + // Switch processes only ObjectType::ride and ObjectType::sceneryGroup break; } } diff --git a/src/openrct2/object/ObjectTypes.cpp b/src/openrct2/object/ObjectTypes.cpp index eb1612447f..38e4a5e934 100644 --- a/src/openrct2/object/ObjectTypes.cpp +++ b/src/openrct2/object/ObjectTypes.cpp @@ -15,46 +15,46 @@ #include constexpr std::array kAllObjectTypes = { - ObjectType::Ride, - ObjectType::SmallScenery, - ObjectType::LargeScenery, - ObjectType::Walls, - ObjectType::Banners, - ObjectType::Paths, - ObjectType::PathAdditions, - ObjectType::SceneryGroup, - ObjectType::ParkEntrance, - ObjectType::Water, - ObjectType::ScenarioText, - ObjectType::TerrainSurface, - ObjectType::TerrainEdge, - ObjectType::Station, - ObjectType::Music, - ObjectType::FootpathSurface, - ObjectType::FootpathRailings, - ObjectType::Audio, - ObjectType::PeepNames, - ObjectType::PeepAnimations, + ObjectType::ride, + ObjectType::smallScenery, + ObjectType::largeScenery, + ObjectType::walls, + ObjectType::banners, + ObjectType::paths, + ObjectType::pathAdditions, + ObjectType::sceneryGroup, + ObjectType::parkEntrance, + ObjectType::water, + ObjectType::scenarioText, + ObjectType::terrainSurface, + ObjectType::terrainEdge, + ObjectType::station, + ObjectType::music, + ObjectType::footpathSurface, + ObjectType::footpathRailings, + ObjectType::audio, + ObjectType::peepNames, + ObjectType::peepAnimations, }; -static_assert(kAllObjectTypes.size() == EnumValue(ObjectType::Count)); +static_assert(kAllObjectTypes.size() == EnumValue(ObjectType::count)); // Object types that can be saved in a park file. static constexpr std::array kTransientObjectTypes = { - ObjectType::Ride, ObjectType::SmallScenery, ObjectType::LargeScenery, ObjectType::Walls, - ObjectType::Banners, ObjectType::Paths, ObjectType::PathAdditions, ObjectType::SceneryGroup, - ObjectType::ParkEntrance, ObjectType::Water, ObjectType::TerrainSurface, ObjectType::TerrainEdge, - ObjectType::Station, ObjectType::Music, ObjectType::FootpathSurface, ObjectType::FootpathRailings, - ObjectType::PeepNames, ObjectType::PeepAnimations, + ObjectType::ride, ObjectType::smallScenery, ObjectType::largeScenery, ObjectType::walls, + ObjectType::banners, ObjectType::paths, ObjectType::pathAdditions, ObjectType::sceneryGroup, + ObjectType::parkEntrance, ObjectType::water, ObjectType::terrainSurface, ObjectType::terrainEdge, + ObjectType::station, ObjectType::music, ObjectType::footpathSurface, ObjectType::footpathRailings, + ObjectType::peepNames, ObjectType::peepAnimations, }; // Object types that cannot be saved in a park file. static constexpr std::array kIntransientObjectTypes = { - ObjectType::ScenarioText, - ObjectType::Audio, + ObjectType::scenarioText, + ObjectType::audio, }; -static_assert(kNumTransientObjectTypes + kNumIntransientObjectTypes == static_cast(ObjectType::Count)); +static_assert(kNumTransientObjectTypes + kNumIntransientObjectTypes == static_cast(ObjectType::count)); bool ObjectTypeIsTransient(ObjectType type) { diff --git a/src/openrct2/object/ObjectTypes.h b/src/openrct2/object/ObjectTypes.h index 38e2efa81e..d7428e1bd2 100644 --- a/src/openrct2/object/ObjectTypes.h +++ b/src/openrct2/object/ObjectTypes.h @@ -21,29 +21,29 @@ constexpr ObjectEntryIndex kObjectEntryIndexNull = std::numeric_limitsflags enum class ObjectType : uint8_t { - Ride, - SmallScenery, - LargeScenery, - Walls, - Banners, - Paths, - PathAdditions, - SceneryGroup, - ParkEntrance, - Water, - ScenarioText, - TerrainSurface, - TerrainEdge, - Station, - Music, - FootpathSurface, - FootpathRailings, - Audio, - PeepNames, - PeepAnimations, + ride, + smallScenery, + largeScenery, + walls, + banners, + paths, + pathAdditions, + sceneryGroup, + parkEntrance, + water, + scenarioText, + terrainSurface, + terrainEdge, + station, + music, + footpathSurface, + footpathRailings, + audio, + peepNames, + peepAnimations, - Count, - None = 255 + count, + none = 255 }; static constexpr size_t kNumTransientObjectTypes = 18; diff --git a/src/openrct2/object/PathAdditionEntry.h b/src/openrct2/object/PathAdditionEntry.h index 4a42df77ab..9eb5ebfbcc 100644 --- a/src/openrct2/object/PathAdditionEntry.h +++ b/src/openrct2/object/PathAdditionEntry.h @@ -38,7 +38,7 @@ enum struct PathAdditionEntry { - static constexpr auto kObjectType = ObjectType::PathAdditions; + static constexpr auto kObjectType = ObjectType::pathAdditions; StringId name; uint32_t image; diff --git a/src/openrct2/object/PathAdditionObject.h b/src/openrct2/object/PathAdditionObject.h index da8d3815c6..3e3c420b36 100644 --- a/src/openrct2/object/PathAdditionObject.h +++ b/src/openrct2/object/PathAdditionObject.h @@ -18,7 +18,7 @@ private: PathAdditionEntry _legacyType = {}; public: - static constexpr ObjectType kObjectType = ObjectType::PathAdditions; + static constexpr ObjectType kObjectType = ObjectType::pathAdditions; void* GetLegacyData() override { diff --git a/src/openrct2/object/PeepAnimationsObject.h b/src/openrct2/object/PeepAnimationsObject.h index a0ed6c6dee..be5503702f 100644 --- a/src/openrct2/object/PeepAnimationsObject.h +++ b/src/openrct2/object/PeepAnimationsObject.h @@ -27,7 +27,7 @@ private: bool _noRandomPlacement; public: - static constexpr ObjectType kObjectType = ObjectType::PeepAnimations; + static constexpr ObjectType kObjectType = ObjectType::peepAnimations; void ReadJson(IReadObjectContext* context, json_t& root) override; OpenRCT2::PeepAnimations ReadAnimations(const EnumMap& requiredAnimationMap, json_t& animations); diff --git a/src/openrct2/object/PeepNamesObject.h b/src/openrct2/object/PeepNamesObject.h index e3f594ab76..3709cc1430 100644 --- a/src/openrct2/object/PeepNamesObject.h +++ b/src/openrct2/object/PeepNamesObject.h @@ -22,7 +22,7 @@ private: std::vector _surnames; public: - static constexpr ObjectType kObjectType = ObjectType::PeepNames; + static constexpr ObjectType kObjectType = ObjectType::peepNames; void ReadJson(IReadObjectContext* context, json_t& root) override; void Load() override; diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h index d2b6581271..e76744d622 100644 --- a/src/openrct2/object/RideObject.h +++ b/src/openrct2/object/RideObject.h @@ -26,7 +26,7 @@ private: std::vector> _peepLoadingWaypoints[OpenRCT2::RCT2::ObjectLimits::kMaxCarTypesPerRideEntry]; public: - static constexpr ObjectType kObjectType = ObjectType::Ride; + static constexpr ObjectType kObjectType = ObjectType::ride; void* GetLegacyData() override { diff --git a/src/openrct2/object/ScenarioTextObject.h b/src/openrct2/object/ScenarioTextObject.h index 84958d4e37..ee04c7f468 100644 --- a/src/openrct2/object/ScenarioTextObject.h +++ b/src/openrct2/object/ScenarioTextObject.h @@ -17,7 +17,7 @@ class ScenarioTextObject final : public Object { public: - static constexpr ObjectType kObjectType = ObjectType::ScenarioText; + static constexpr ObjectType kObjectType = ObjectType::scenarioText; void ReadJson(IReadObjectContext* context, json_t& root) override; void Load() override; diff --git a/src/openrct2/object/SceneryGroupEntry.h b/src/openrct2/object/SceneryGroupEntry.h index 1f521c1b88..4d74555963 100644 --- a/src/openrct2/object/SceneryGroupEntry.h +++ b/src/openrct2/object/SceneryGroupEntry.h @@ -17,7 +17,7 @@ struct SceneryGroupEntry { - static constexpr auto kObjectType = ObjectType::SceneryGroup; + static constexpr auto kObjectType = ObjectType::sceneryGroup; StringId name; uint32_t image; diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index 315d8e74dc..3bb747d21f 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -82,15 +82,15 @@ static std::optional GetSceneryType(const ObjectType type) { switch (type) { - case ObjectType::SmallScenery: + case ObjectType::smallScenery: return SCENERY_TYPE_SMALL; - case ObjectType::LargeScenery: + case ObjectType::largeScenery: return SCENERY_TYPE_LARGE; - case ObjectType::Walls: + case ObjectType::walls: return SCENERY_TYPE_WALL; - case ObjectType::Banners: + case ObjectType::banners: return SCENERY_TYPE_BANNER; - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: return SCENERY_TYPE_PATH_ITEM; default: return std::nullopt; diff --git a/src/openrct2/object/SceneryGroupObject.h b/src/openrct2/object/SceneryGroupObject.h index c1d6d75e9a..c96e165638 100644 --- a/src/openrct2/object/SceneryGroupObject.h +++ b/src/openrct2/object/SceneryGroupObject.h @@ -23,7 +23,7 @@ private: std::vector _items; public: - static constexpr ObjectType kObjectType = ObjectType::SceneryGroup; + static constexpr ObjectType kObjectType = ObjectType::sceneryGroup; void* GetLegacyData() override { diff --git a/src/openrct2/object/SmallSceneryEntry.h b/src/openrct2/object/SmallSceneryEntry.h index 8185251e02..aa35fd6af9 100644 --- a/src/openrct2/object/SmallSceneryEntry.h +++ b/src/openrct2/object/SmallSceneryEntry.h @@ -54,7 +54,7 @@ enum SMALL_SCENERY_FLAGS : uint32_t struct SmallSceneryEntry { - static constexpr auto kObjectType = ObjectType::SmallScenery; + static constexpr auto kObjectType = ObjectType::smallScenery; StringId name; uint32_t image; diff --git a/src/openrct2/object/SmallSceneryObject.h b/src/openrct2/object/SmallSceneryObject.h index 87adcf6a95..da84d3ce67 100644 --- a/src/openrct2/object/SmallSceneryObject.h +++ b/src/openrct2/object/SmallSceneryObject.h @@ -22,7 +22,7 @@ private: std::vector _frameOffsets; public: - static constexpr ObjectType kObjectType = ObjectType::SmallScenery; + static constexpr ObjectType kObjectType = ObjectType::smallScenery; void* GetLegacyData() override { diff --git a/src/openrct2/object/StationObject.h b/src/openrct2/object/StationObject.h index f15d559598..b0cfb615cc 100644 --- a/src/openrct2/object/StationObject.h +++ b/src/openrct2/object/StationObject.h @@ -24,7 +24,7 @@ namespace OpenRCT2::STATION_OBJECT_FLAGS class StationObject final : public Object { public: - static constexpr ObjectType kObjectType = ObjectType::Station; + static constexpr ObjectType kObjectType = ObjectType::station; StringId NameStringId{}; ImageIndex BaseImageId = kImageIndexUndefined; diff --git a/src/openrct2/object/TerrainEdgeObject.cpp b/src/openrct2/object/TerrainEdgeObject.cpp index 393eacf1ab..38670accea 100644 --- a/src/openrct2/object/TerrainEdgeObject.cpp +++ b/src/openrct2/object/TerrainEdgeObject.cpp @@ -65,6 +65,6 @@ void TerrainEdgeObject::ReadJson(IReadObjectContext* context, json_t& root) TerrainEdgeObject* TerrainEdgeObject::GetById(ObjectEntryIndex entryIndex) { auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto* obj = objMgr.GetLoadedObject(ObjectType::TerrainEdge, entryIndex); + auto* obj = objMgr.GetLoadedObject(ObjectType::terrainEdge, entryIndex); return static_cast(obj); } diff --git a/src/openrct2/object/TerrainEdgeObject.h b/src/openrct2/object/TerrainEdgeObject.h index c859e3616b..e594a8483d 100644 --- a/src/openrct2/object/TerrainEdgeObject.h +++ b/src/openrct2/object/TerrainEdgeObject.h @@ -15,7 +15,7 @@ class TerrainEdgeObject final : public Object { private: public: - static constexpr ObjectType kObjectType = ObjectType::TerrainEdge; + static constexpr ObjectType kObjectType = ObjectType::terrainEdge; StringId NameStringId{}; uint32_t IconImageId{}; diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp index ead66b696f..5e1c33cb01 100644 --- a/src/openrct2/object/TerrainSurfaceObject.cpp +++ b/src/openrct2/object/TerrainSurfaceObject.cpp @@ -182,6 +182,6 @@ ImageId TerrainSurfaceObject::GetImageId( TerrainSurfaceObject* TerrainSurfaceObject::GetById(ObjectEntryIndex entryIndex) { auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto* obj = objMgr.GetLoadedObject(ObjectType::TerrainSurface, entryIndex); + auto* obj = objMgr.GetLoadedObject(ObjectType::terrainSurface, entryIndex); return static_cast(obj); } diff --git a/src/openrct2/object/TerrainSurfaceObject.h b/src/openrct2/object/TerrainSurfaceObject.h index 5ca3bc8f34..a47c1a9138 100644 --- a/src/openrct2/object/TerrainSurfaceObject.h +++ b/src/openrct2/object/TerrainSurfaceObject.h @@ -36,7 +36,7 @@ private: static constexpr auto kNumImagesInEntry = 19; public: - static constexpr ObjectType kObjectType = ObjectType::TerrainSurface; + static constexpr ObjectType kObjectType = ObjectType::terrainSurface; static constexpr uint8_t kNoValue = 0xFF; StringId NameStringId{}; diff --git a/src/openrct2/object/WallObject.h b/src/openrct2/object/WallObject.h index 5c2cff9cf7..4cc222e799 100644 --- a/src/openrct2/object/WallObject.h +++ b/src/openrct2/object/WallObject.h @@ -18,7 +18,7 @@ private: WallSceneryEntry _legacyType = {}; public: - static constexpr ObjectType kObjectType = ObjectType::Walls; + static constexpr ObjectType kObjectType = ObjectType::walls; void* GetLegacyData() override { diff --git a/src/openrct2/object/WallSceneryEntry.h b/src/openrct2/object/WallSceneryEntry.h index c1d8740926..2fff156f62 100644 --- a/src/openrct2/object/WallSceneryEntry.h +++ b/src/openrct2/object/WallSceneryEntry.h @@ -45,7 +45,7 @@ enum class DoorSoundType : uint8_t struct WallSceneryEntry { - static constexpr auto kObjectType = ObjectType::Walls; + static constexpr auto kObjectType = ObjectType::walls; StringId name; uint32_t image; diff --git a/src/openrct2/object/WaterEntry.h b/src/openrct2/object/WaterEntry.h index ef7cf002e4..83b5a57e84 100644 --- a/src/openrct2/object/WaterEntry.h +++ b/src/openrct2/object/WaterEntry.h @@ -19,7 +19,7 @@ enum struct WaterObjectEntry { - static constexpr auto kObjectType = ObjectType::Water; + static constexpr auto kObjectType = ObjectType::water; StringId string_idx; // 0x00 uint32_t image_id; // 0x02 diff --git a/src/openrct2/object/WaterObject.h b/src/openrct2/object/WaterObject.h index d6cb9ce97f..33dfc3d126 100644 --- a/src/openrct2/object/WaterObject.h +++ b/src/openrct2/object/WaterObject.h @@ -20,7 +20,7 @@ private: WaterObjectEntry _legacyType = {}; public: - static constexpr ObjectType kObjectType = ObjectType::Water; + static constexpr ObjectType kObjectType = ObjectType::water; void* GetLegacyData() override { diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 2f1a028599..473b2f26ac 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -291,7 +291,7 @@ static void PaintParkEntrance(PaintSession& session, uint8_t direction, int32_t auto& objManager = GetContext()->GetObjectManager(); auto entrance = reinterpret_cast( - objManager.GetLoadedObject(ObjectType::ParkEntrance, entranceEl.getEntryIndex())); + objManager.GetLoadedObject(ObjectType::parkEntrance, entranceEl.getEntryIndex())); auto sequence = entranceEl.GetSequenceIndex(); switch (sequence) { diff --git a/src/openrct2/park/Legacy.cpp b/src/openrct2/park/Legacy.cpp index b07b2fc235..9b08d76b2b 100644 --- a/src/openrct2/park/Legacy.cpp +++ b/src/openrct2/park/Legacy.cpp @@ -2249,26 +2249,26 @@ void UpdateFootpathsFromMapping( ObjectList& requiredObjects, ObjectEntryIndex& surfaceCount, ObjectEntryIndex& railingCount, ObjectEntryIndex entryIndex, const RCT2::FootpathMapping* footpathMapping) { - auto surfaceIndex = requiredObjects.Find(ObjectType::FootpathSurface, footpathMapping->NormalSurface); + auto surfaceIndex = requiredObjects.Find(ObjectType::footpathSurface, footpathMapping->NormalSurface); if (surfaceIndex == kObjectEntryIndexNull) { - requiredObjects.SetObject(ObjectType::FootpathSurface, surfaceCount, footpathMapping->NormalSurface); + requiredObjects.SetObject(ObjectType::footpathSurface, surfaceCount, footpathMapping->NormalSurface); surfaceIndex = surfaceCount++; } pathToSurfaceMap[entryIndex] = surfaceIndex; - surfaceIndex = requiredObjects.Find(ObjectType::FootpathSurface, footpathMapping->QueueSurface); + surfaceIndex = requiredObjects.Find(ObjectType::footpathSurface, footpathMapping->QueueSurface); if (surfaceIndex == kObjectEntryIndexNull) { - requiredObjects.SetObject(ObjectType::FootpathSurface, surfaceCount, footpathMapping->QueueSurface); + requiredObjects.SetObject(ObjectType::footpathSurface, surfaceCount, footpathMapping->QueueSurface); surfaceIndex = surfaceCount++; } pathToQueueSurfaceMap[entryIndex] = surfaceIndex; - auto railingIndex = requiredObjects.Find(ObjectType::FootpathRailings, footpathMapping->Railing); + auto railingIndex = requiredObjects.Find(ObjectType::footpathRailings, footpathMapping->Railing); if (railingIndex == kObjectEntryIndexNull) { - requiredObjects.SetObject(ObjectType::FootpathRailings, railingCount, footpathMapping->Railing); + requiredObjects.SetObject(ObjectType::footpathRailings, railingCount, footpathMapping->Railing); railingIndex = railingCount++; } pathToRailingsMap[entryIndex] = railingIndex; diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 540b131417..5ee0502be2 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -303,7 +303,7 @@ namespace OpenRCT2 RCTObjectEntry datEntry; cs.Read(&datEntry, sizeof(datEntry)); ObjectEntryDescriptor desc(datEntry); - if (version <= 2 && datEntry.GetType() == ObjectType::Paths) + if (version <= 2 && datEntry.GetType() == ObjectType::paths) { auto footpathMapping = GetFootpathMapping(desc); if (footpathMapping != nullptr) @@ -380,13 +380,13 @@ namespace OpenRCT2 if (version < kPeepNamesObjectsVersion) { AppendRequiredObjects( - requiredObjects, ObjectType::PeepNames, std::vector({ "rct2.peep_names.original" })); + requiredObjects, ObjectType::peepNames, std::vector({ "rct2.peep_names.original" })); } if (version < kPeepAnimationObjectsVersion) { auto animObjects = GetLegacyPeepAnimationObjects(requiredObjects); - AppendRequiredObjects(requiredObjects, ObjectType::PeepAnimations, animObjects); + AppendRequiredObjects(requiredObjects, ObjectType::peepAnimations, animObjects); } RequiredObjects = std::move(requiredObjects); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ef6014db26..fcceed6923 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -272,7 +272,7 @@ namespace OpenRCT2::RCT1 std::lock_guard lock(mtx); // Unload loaded scenario text object, if any. - if (auto* obj = objManager.GetLoadedObject(ObjectType::ScenarioText, 0); obj != nullptr) + if (auto* obj = objManager.GetLoadedObject(ObjectType::scenarioText, 0); obj != nullptr) objManager.UnloadObjects({ obj->GetDescriptor() }); // Load the one specified @@ -586,11 +586,11 @@ namespace OpenRCT2::RCT1 auto objectType = foundObject->Type; switch (objectType) { - case ObjectType::SmallScenery: - case ObjectType::LargeScenery: - case ObjectType::Walls: - case ObjectType::Banners: - case ObjectType::PathAdditions: + case ObjectType::smallScenery: + case ObjectType::largeScenery: + case ObjectType::walls: + case ObjectType::banners: + case ObjectType::pathAdditions: { RCT12::EntryList* entries = GetEntryList(objectType); @@ -1532,22 +1532,22 @@ namespace OpenRCT2::RCT1 ObjectList GetRequiredObjects() { ObjectList result; - AppendRequiredObjects(result, ObjectType::Ride, _rideEntries); - AppendRequiredObjects(result, ObjectType::SmallScenery, _smallSceneryEntries); - AppendRequiredObjects(result, ObjectType::LargeScenery, _largeSceneryEntries); - AppendRequiredObjects(result, ObjectType::Walls, _wallEntries); - AppendRequiredObjects(result, ObjectType::Paths, _pathEntries); - AppendRequiredObjects(result, ObjectType::PathAdditions, _pathAdditionEntries); - AppendRequiredObjects(result, ObjectType::SceneryGroup, _sceneryGroupEntries); - AppendRequiredObjects(result, ObjectType::Banners, _bannerEntries); + AppendRequiredObjects(result, ObjectType::ride, _rideEntries); + AppendRequiredObjects(result, ObjectType::smallScenery, _smallSceneryEntries); + AppendRequiredObjects(result, ObjectType::largeScenery, _largeSceneryEntries); + AppendRequiredObjects(result, ObjectType::walls, _wallEntries); + AppendRequiredObjects(result, ObjectType::paths, _pathEntries); + AppendRequiredObjects(result, ObjectType::pathAdditions, _pathAdditionEntries); + AppendRequiredObjects(result, ObjectType::sceneryGroup, _sceneryGroupEntries); + AppendRequiredObjects(result, ObjectType::banners, _bannerEntries); AppendRequiredObjects( - result, ObjectType::ParkEntrance, std::vector({ "rct2.park_entrance.pkent1" })); - AppendRequiredObjects(result, ObjectType::Water, _waterEntry); - AppendRequiredObjects(result, ObjectType::TerrainSurface, _terrainSurfaceEntries); - AppendRequiredObjects(result, ObjectType::TerrainEdge, _terrainEdgeEntries); - AppendRequiredObjects(result, ObjectType::FootpathSurface, _footpathSurfaceEntries); - AppendRequiredObjects(result, ObjectType::FootpathRailings, _footpathRailingsEntries); - AppendRequiredObjects(result, ObjectType::PeepNames, std::vector({ "rct2.peep_names.original" })); + result, ObjectType::parkEntrance, std::vector({ "rct2.park_entrance.pkent1" })); + AppendRequiredObjects(result, ObjectType::water, _waterEntry); + AppendRequiredObjects(result, ObjectType::terrainSurface, _terrainSurfaceEntries); + AppendRequiredObjects(result, ObjectType::terrainEdge, _terrainEdgeEntries); + AppendRequiredObjects(result, ObjectType::footpathSurface, _footpathSurfaceEntries); + AppendRequiredObjects(result, ObjectType::footpathRailings, _footpathRailingsEntries); + AppendRequiredObjects(result, ObjectType::peepNames, std::vector({ "rct2.peep_names.original" })); RCT12AddDefaultObjects(result); // Normalise the name to make the scenario as recognisable as possible @@ -1556,11 +1556,11 @@ namespace OpenRCT2::RCT1 // Infer what scenario text object to use, if any SourceDescriptor desc; if (ScenarioSources::TryGetByName(normalisedName.c_str(), &desc) && !desc.textObjectId.empty()) - AppendRequiredObjects(result, ObjectType::ScenarioText, std::vector({ desc.textObjectId })); + AppendRequiredObjects(result, ObjectType::scenarioText, std::vector({ desc.textObjectId })); // Add all legacy peep animation objects auto animObjects = GetLegacyPeepAnimationObjects(result); - AppendRequiredObjects(result, ObjectType::PeepAnimations, animObjects); + AppendRequiredObjects(result, ObjectType::peepAnimations, animObjects); return result; } @@ -2387,7 +2387,7 @@ namespace OpenRCT2::RCT1 std::lock_guard lock(mtx); // Unload loaded scenario text object, if any. - if (auto* obj = objManager.GetLoadedObject(ObjectType::ScenarioText, 0); obj != nullptr) + if (auto* obj = objManager.GetLoadedObject(ObjectType::scenarioText, 0); obj != nullptr) objManager.UnloadObjects({ obj->GetDescriptor() }); // Load the one specified @@ -2522,23 +2522,23 @@ namespace OpenRCT2::RCT1 { switch (objectType) { - case ObjectType::Ride: + case ObjectType::ride: return &_rideEntries; - case ObjectType::SmallScenery: + case ObjectType::smallScenery: return &_smallSceneryEntries; - case ObjectType::LargeScenery: + case ObjectType::largeScenery: return &_largeSceneryEntries; - case ObjectType::Walls: + case ObjectType::walls: return &_wallEntries; - case ObjectType::Banners: + case ObjectType::banners: return &_bannerEntries; - case ObjectType::Paths: + case ObjectType::paths: return &_pathEntries; - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: return &_pathAdditionEntries; - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: return &_sceneryGroupEntries; - case ObjectType::Water: + case ObjectType::water: return &_waterEntry; default: // This switch processes only ObjectType for for Entries diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index fcead43b38..6d6195cd4b 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -805,7 +805,7 @@ void RCT12AddDefaultObjects(ObjectList& objectList) // Stations for (size_t i = 0; i < std::size(_stationStyles); i++) { - objectList.SetObject(ObjectType::Station, static_cast(i), _stationStyles[i]); + objectList.SetObject(ObjectType::station, static_cast(i), _stationStyles[i]); } // Music @@ -813,7 +813,7 @@ void RCT12AddDefaultObjects(ObjectList& objectList) { if (!_musicStyles[i].empty()) { - objectList.SetObject(ObjectType::Music, static_cast(i), _musicStyles[i]); + objectList.SetObject(ObjectType::music, static_cast(i), _musicStyles[i]); } } } diff --git a/src/openrct2/rct2/RCT2.cpp b/src/openrct2/rct2/RCT2.cpp index 06984f955e..57abcc4de1 100644 --- a/src/openrct2/rct2/RCT2.cpp +++ b/src/openrct2/rct2/RCT2.cpp @@ -236,7 +236,7 @@ namespace OpenRCT2::RCT2 RCTObjectEntry result; std::memset(&result, 0, sizeof(result)); - result.SetType(ObjectType::Paths); + result.SetType(ObjectType::paths); auto foundMapping = false; for (const auto& mapping : _footpathMappings) diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 35473deb6e..332e5cad32 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -301,7 +301,7 @@ namespace OpenRCT2::RCT2 std::lock_guard lock(mtx); // Unload loaded scenario text object, if any. - if (auto* obj = objManager.GetLoadedObject(ObjectType::ScenarioText, 0); obj != nullptr) + if (auto* obj = objManager.GetLoadedObject(ObjectType::scenarioText, 0); obj != nullptr) objManager.UnloadObjects({ obj->GetDescriptor() }); // Load the one specified @@ -969,7 +969,7 @@ namespace OpenRCT2::RCT2 // This stall was not colourable in RCT2. if (dst->type == RIDE_TYPE_FOOD_STALL) { - auto object = ObjectEntryGetObject(ObjectType::Ride, dst->subtype); + auto object = ObjectEntryGetObject(ObjectType::ride, dst->subtype); if (object != nullptr && object->GetIdentifier() == "rct2.ride.icecr1") { dst->track_colour[0].main = COLOUR_LIGHT_BLUE; @@ -1810,14 +1810,14 @@ namespace OpenRCT2::RCT2 int objectIt = 0; ObjectEntryIndex surfaceCount = 0; ObjectEntryIndex railingCount = 0; - for (int16_t objectType = EnumValue(ObjectType::Ride); objectType <= EnumValue(ObjectType::Water); objectType++) + for (int16_t objectType = EnumValue(ObjectType::ride); objectType <= EnumValue(ObjectType::water); objectType++) { for (int16_t i = 0; i < kRCT2ObjectEntryGroupCounts[objectType]; i++, objectIt++) { auto entry = ObjectEntryDescriptor(_s6.Objects[objectIt]); if (entry.HasValue()) { - if (objectType == EnumValue(ObjectType::Paths)) + if (objectType == EnumValue(ObjectType::paths)) { auto footpathMapping = GetFootpathSurfaceId(entry); if (footpathMapping == nullptr) @@ -1829,28 +1829,28 @@ namespace OpenRCT2::RCT2 { // We have surface objects for this footpath auto surfaceIndex = objectList.Find( - ObjectType::FootpathSurface, footpathMapping->NormalSurface); + ObjectType::footpathSurface, footpathMapping->NormalSurface); if (surfaceIndex == kObjectEntryIndexNull) { objectList.SetObject( - ObjectType::FootpathSurface, surfaceCount, footpathMapping->NormalSurface); + ObjectType::footpathSurface, surfaceCount, footpathMapping->NormalSurface); surfaceIndex = surfaceCount++; } _pathToSurfaceMap[i] = surfaceIndex; - surfaceIndex = objectList.Find(ObjectType::FootpathSurface, footpathMapping->QueueSurface); + surfaceIndex = objectList.Find(ObjectType::footpathSurface, footpathMapping->QueueSurface); if (surfaceIndex == kObjectEntryIndexNull) { objectList.SetObject( - ObjectType::FootpathSurface, surfaceCount, footpathMapping->QueueSurface); + ObjectType::footpathSurface, surfaceCount, footpathMapping->QueueSurface); surfaceIndex = surfaceCount++; } _pathToQueueSurfaceMap[i] = surfaceIndex; - auto railingIndex = objectList.Find(ObjectType::FootpathRailings, footpathMapping->Railing); + auto railingIndex = objectList.Find(ObjectType::footpathRailings, footpathMapping->Railing); if (railingIndex == kObjectEntryIndexNull) { - objectList.SetObject(ObjectType::FootpathRailings, railingCount, footpathMapping->Railing); + objectList.SetObject(ObjectType::footpathRailings, railingCount, footpathMapping->Railing); railingIndex = railingCount++; } _pathToRailingMap[i] = railingIndex; @@ -1893,10 +1893,10 @@ namespace OpenRCT2::RCT2 _terrainEdgeEntries.AddRange(OpenRCT2HybridTerrainEdges); } - AppendRequiredObjects(objectList, ObjectType::TerrainSurface, _terrainSurfaceEntries); - AppendRequiredObjects(objectList, ObjectType::TerrainEdge, _terrainEdgeEntries); + AppendRequiredObjects(objectList, ObjectType::terrainSurface, _terrainSurfaceEntries); + AppendRequiredObjects(objectList, ObjectType::terrainEdge, _terrainEdgeEntries); AppendRequiredObjects( - objectList, ObjectType::PeepNames, std::vector({ "rct2.peep_names.original" })); + objectList, ObjectType::peepNames, std::vector({ "rct2.peep_names.original" })); RCT12AddDefaultObjects(objectList); // Normalise the name to make the scenario as recognisable as possible @@ -1906,10 +1906,10 @@ namespace OpenRCT2::RCT2 SourceDescriptor desc; if (ScenarioSources::TryGetByName(normalisedName.c_str(), &desc) && !desc.textObjectId.empty()) AppendRequiredObjects( - objectList, ObjectType::ScenarioText, std::vector({ desc.textObjectId })); + objectList, ObjectType::scenarioText, std::vector({ desc.textObjectId })); auto animObjects = GetLegacyPeepAnimationObjects(objectList); - AppendRequiredObjects(objectList, ObjectType::PeepAnimations, animObjects); + AppendRequiredObjects(objectList, ObjectType::peepAnimations, animObjects); return objectList; } diff --git a/src/openrct2/rct2/T6Exporter.cpp b/src/openrct2/rct2/T6Exporter.cpp index 4e4d2eecf2..ef79af3c94 100644 --- a/src/openrct2/rct2/T6Exporter.cpp +++ b/src/openrct2/rct2/T6Exporter.cpp @@ -168,7 +168,7 @@ namespace OpenRCT2::RCT2 for (const auto& sceneryElement : _trackDesign.sceneryElements) { auto flags = sceneryElement.flags; - if (sceneryElement.sceneryObject.Entry.GetType() == ObjectType::Walls) + if (sceneryElement.sceneryObject.Entry.GetType() == ObjectType::walls) { flags &= ~0xFC; flags |= (sceneryElement.tertiaryColour << 2); diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/rct2/T6Importer.cpp index 7d31d12a6c..71cdf547c5 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/rct2/T6Importer.cpp @@ -197,7 +197,7 @@ namespace OpenRCT2::RCT2 sceneryElement.flags = t6SceneryElement.Flags; sceneryElement.primaryColour = t6SceneryElement.PrimaryColour; sceneryElement.secondaryColour = t6SceneryElement.SecondaryColour; - if (t6SceneryElement.SceneryObject.GetType() == ObjectType::Walls) + if (t6SceneryElement.SceneryObject.GetType() == ObjectType::walls) sceneryElement.tertiaryColour = t6SceneryElement.getTertiaryWallColour(); td->sceneryElements.push_back(std::move(sceneryElement)); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index de131f3377..eb6d6576af 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -224,7 +224,7 @@ const RideObjectEntry* GetRideEntryByIndex(ObjectEntryIndex index) { auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objMgr.GetLoadedObject(ObjectType::Ride, index); + auto obj = objMgr.GetLoadedObject(ObjectType::ride, index); if (obj == nullptr) { return nullptr; @@ -235,13 +235,13 @@ const RideObjectEntry* GetRideEntryByIndex(ObjectEntryIndex index) std::string_view GetRideEntryName(ObjectEntryIndex index) { - if (index >= getObjectEntryGroupCount(ObjectType::Ride)) + if (index >= getObjectEntryGroupCount(ObjectType::ride)) { LOG_ERROR("invalid index %d for ride type", index); return {}; } - auto objectEntry = ObjectEntryGetObject(ObjectType::Ride, index); + auto objectEntry = ObjectEntryGetObject(ObjectType::ride, index); if (objectEntry != nullptr) { return objectEntry->GetLegacyIdentifier(); diff --git a/src/openrct2/ride/RideAudio.cpp b/src/openrct2/ride/RideAudio.cpp index d55f85f231..ccb0159d1c 100644 --- a/src/openrct2/ride/RideAudio.cpp +++ b/src/openrct2/ride/RideAudio.cpp @@ -188,7 +188,7 @@ namespace OpenRCT2::RideAudio void CircusStartRideMusicChannel(const ViewportRideMusicInstance& instance) { auto& objManager = GetContext()->GetObjectManager(); - ObjectEntryDescriptor desc(ObjectType::Audio, AudioObjectIdentifiers::kRCT2Circus); + ObjectEntryDescriptor desc(ObjectType::audio, AudioObjectIdentifiers::kRCT2Circus); auto audioObj = static_cast(objManager.GetLoadedObject(desc)); if (audioObj != nullptr) { diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 5ff4551854..36ac4f65a4 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -116,7 +116,7 @@ ResultWithMessage TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ri { trackAndVehicle.rtdIndex = ride.type; - auto object = ObjectEntryGetObject(ObjectType::Ride, ride.subtype); + auto object = ObjectEntryGetObject(ObjectType::ride, ride.subtype); if (object != nullptr) { auto entry = object->GetObjectEntry(); @@ -498,7 +498,7 @@ ResultWithMessage TrackDesign::CreateTrackDesignScenery(TrackDesignState& tds) { switch (scenery.sceneryObject.GetType()) { - case ObjectType::Paths: + case ObjectType::paths: { uint8_t slope = (scenery.getSlopeDirection() - _saveDirection) % kNumOrthogonalDirections; scenery.setSlopeDirection(slope); @@ -507,7 +507,7 @@ ResultWithMessage TrackDesign::CreateTrackDesignScenery(TrackDesignState& tds) scenery.setEdges(edges); break; } - case ObjectType::Walls: + case ObjectType::walls: { auto direction = (scenery.getRotation() - _saveDirection) % kNumOrthogonalDirections; scenery.setRotation(direction); @@ -637,7 +637,7 @@ static void TrackDesignLoadSceneryObjects(const TrackDesign& td) struct TrackSceneryEntry { - ObjectType Type = ObjectType::None; + ObjectType Type = ObjectType::none; ObjectEntryIndex Index = kObjectEntryIndexNull; ObjectEntryIndex SecondaryIndex = kObjectEntryIndexNull; // For footpath railing }; @@ -683,7 +683,7 @@ static std::optional TrackDesignPlaceSceneryElementGetEntry(c TrackSceneryEntry result; auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager(); - if (scenery.sceneryObject.GetType() == ObjectType::Paths) + if (scenery.sceneryObject.GetType() == ObjectType::paths) { auto footpathMapping = RCT2::GetFootpathSurfaceId(scenery.sceneryObject, true, scenery.isQueue()); if (footpathMapping == nullptr) @@ -697,12 +697,12 @@ static std::optional TrackDesignPlaceSceneryElementGetEntry(c } else { - result.Type = ObjectType::FootpathSurface; + result.Type = ObjectType::footpathSurface; } } else { - result.Type = ObjectType::FootpathSurface; + result.Type = ObjectType::footpathSurface; result.Index = objectMgr.GetLoadedObjectEntryIndex( ObjectEntryDescriptor(scenery.isQueue() ? footpathMapping->QueueSurface : footpathMapping->NormalSurface)); result.SecondaryIndex = objectMgr.GetLoadedObjectEntryIndex(ObjectEntryDescriptor(footpathMapping->Railing)); @@ -757,7 +757,7 @@ static void TrackDesignMirrorScenery(TrackDesign& td) auto obj = objectMgr.GetLoadedObject(entryInfo->Type, entryInfo->Index); switch (obj->GetObjectType()) { - case ObjectType::LargeScenery: + case ObjectType::largeScenery: { auto* sceneryEntry = reinterpret_cast(obj->GetLegacyData()); int16_t x1 = 0, x2 = 0, y1 = 0, y2 = 0; @@ -801,7 +801,7 @@ static void TrackDesignMirrorScenery(TrackDesign& td) scenery.setRotation(DirectionFlipXAxis(scenery.getRotation())); break; } - case ObjectType::SmallScenery: + case ObjectType::smallScenery: { auto* sceneryEntry = reinterpret_cast(obj->GetLegacyData()); scenery.loc.y = -scenery.loc.y; @@ -820,14 +820,14 @@ static void TrackDesignMirrorScenery(TrackDesign& td) scenery.setQuadrant(scenery.getQuadrant() ^ (1 << 0)); break; } - case ObjectType::Walls: + case ObjectType::walls: { scenery.loc.y = -scenery.loc.y; scenery.setRotation(DirectionFlipXAxis(scenery.getRotation())); break; } - case ObjectType::Paths: - case ObjectType::FootpathSurface: + case ObjectType::paths: + case ObjectType::footpathSurface: { scenery.loc.y = -scenery.loc.y; @@ -956,7 +956,7 @@ static GameActions::Result TrackDesignPlaceSceneryElementRemoveGhost( std::unique_ptr ga; switch (entryInfo->Type) { - case ObjectType::SmallScenery: + case ObjectType::smallScenery: { uint8_t quadrant = scenery.getQuadrant() + _currentTrackPieceDirection; quadrant &= 3; @@ -972,14 +972,14 @@ static GameActions::Result TrackDesignPlaceSceneryElementRemoveGhost( ga = std::make_unique(CoordsXYZ{ mapCoord.x, mapCoord.y, z }, quadrant, entryInfo->Index); break; } - case ObjectType::LargeScenery: + case ObjectType::largeScenery: ga = std::make_unique(CoordsXYZD{ mapCoord.x, mapCoord.y, z, sceneryRotation }, 0); break; - case ObjectType::Walls: + case ObjectType::walls: ga = std::make_unique(CoordsXYZD{ mapCoord.x, mapCoord.y, z, sceneryRotation }); break; - case ObjectType::Paths: - case ObjectType::FootpathSurface: + case ObjectType::paths: + case ObjectType::footpathSurface: ga = std::make_unique(CoordsXYZ{ mapCoord.x, mapCoord.y, z }); break; default: @@ -1043,7 +1043,7 @@ static GameActions::Result TrackDesignPlaceSceneryElement( switch (entryInfo->Type) { - case ObjectType::SmallScenery: + case ObjectType::smallScenery: { if (mode != 0) { @@ -1086,7 +1086,7 @@ static GameActions::Result TrackDesignPlaceSceneryElement( cost = res.Error == GameActions::Status::Ok ? res.Cost : 0; break; } - case ObjectType::LargeScenery: + case ObjectType::largeScenery: { if (mode != 0) { @@ -1127,7 +1127,7 @@ static GameActions::Result TrackDesignPlaceSceneryElement( cost = res.Cost; break; } - case ObjectType::Walls: + case ObjectType::walls: { if (mode != 0) { @@ -1167,8 +1167,8 @@ static GameActions::Result TrackDesignPlaceSceneryElement( cost = res.Cost; break; } - case ObjectType::Paths: - case ObjectType::FootpathSurface: + case ObjectType::paths: + case ObjectType::footpathSurface: z = scenery.loc.z + originZ; if (mode == 0) { @@ -1197,7 +1197,7 @@ static GameActions::Result TrackDesignPlaceSceneryElement( PathConstructFlags constructFlags = 0; if (scenery.isQueue()) constructFlags |= PathConstructFlag::IsQueue; - if (entryInfo->Type == ObjectType::Paths) + if (entryInfo->Type == ObjectType::paths) constructFlags |= PathConstructFlag::IsLegacyPathObject; auto footpathPlaceAction = FootpathLayoutPlaceAction( { mapCoord.x, mapCoord.y, z }, slope, entryInfo->Index, entryInfo->SecondaryIndex, edges, constructFlags); diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index b1373fd717..6a535566df 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -244,7 +244,7 @@ static TrackDesignSceneryElement TrackDesignSaveCreateSmallSceneryDesc( static TrackDesignAddStatus TrackDesignSaveAddSmallScenery(const CoordsXY& loc, SmallSceneryElement* sceneryElement) { auto entryIndex = sceneryElement->GetEntryIndex(); - auto obj = ObjectEntryGetObject(ObjectType::SmallScenery, entryIndex); + auto obj = ObjectEntryGetObject(ObjectType::smallScenery, entryIndex); if (obj != nullptr && TrackDesignSaveIsSupportedObject(obj)) { auto item = TrackDesignSaveCreateSmallSceneryDesc(*obj, loc, *sceneryElement); @@ -272,7 +272,7 @@ static TrackDesignAddStatus TrackDesignSaveAddLargeScenery(const CoordsXY& loc, { auto entryIndex = tileElement->GetEntryIndex(); auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objectMgr.GetLoadedObject(ObjectType::LargeScenery, entryIndex); + auto obj = objectMgr.GetLoadedObject(ObjectType::largeScenery, entryIndex); if (obj != nullptr && TrackDesignSaveIsSupportedObject(obj)) { auto sceneryEntry = reinterpret_cast(obj->GetLegacyData()); @@ -329,7 +329,7 @@ static TrackDesignSceneryElement TrackDesignSaveCreateWallDesc( static TrackDesignAddStatus TrackDesignSaveAddWall(const CoordsXY& loc, WallElement* wallElement) { auto entryIndex = wallElement->GetEntryIndex(); - auto obj = ObjectEntryGetObject(ObjectType::Walls, entryIndex); + auto obj = ObjectEntryGetObject(ObjectType::walls, entryIndex); if (obj != nullptr && TrackDesignSaveIsSupportedObject(obj)) { auto item = TrackDesignSaveCreateWallDesc(*obj, loc, *wallElement); @@ -469,7 +469,7 @@ static void TrackDesignSavePopTileElementDesc(const TrackDesignSceneryElement& d static void TrackDesignSaveRemoveSmallScenery(const CoordsXY& loc, SmallSceneryElement* sceneryElement) { auto entryIndex = sceneryElement->GetEntryIndex(); - auto obj = ObjectEntryGetObject(ObjectType::SmallScenery, entryIndex); + auto obj = ObjectEntryGetObject(ObjectType::smallScenery, entryIndex); if (obj != nullptr) { auto item = TrackDesignSaveCreateSmallSceneryDesc(*obj, loc, *sceneryElement); @@ -488,7 +488,7 @@ static void TrackDesignSaveRemoveLargeScenery(const CoordsXY& loc, LargeSceneryE auto entryIndex = tileElement->GetEntryIndex(); auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objectMgr.GetLoadedObject(ObjectType::LargeScenery, entryIndex); + auto obj = objectMgr.GetLoadedObject(ObjectType::largeScenery, entryIndex); if (obj != nullptr) { auto sceneryEntry = reinterpret_cast(obj->GetLegacyData()); @@ -530,7 +530,7 @@ static void TrackDesignSaveRemoveLargeScenery(const CoordsXY& loc, LargeSceneryE static void TrackDesignSaveRemoveWall(const CoordsXY& loc, WallElement* wallElement) { auto entryIndex = wallElement->GetEntryIndex(); - auto obj = ObjectEntryGetObject(ObjectType::Walls, entryIndex); + auto obj = ObjectEntryGetObject(ObjectType::walls, entryIndex); if (obj != nullptr) { auto item = TrackDesignSaveCreateWallDesc(*obj, loc, *wallElement); diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index de61f92105..b0aa085f59 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -114,7 +114,7 @@ void ScenarioReset(GameState_t& gameState) gameState.Cash = gameState.InitialCash; auto& objManager = GetContext()->GetObjectManager(); - if (auto* object = objManager.GetLoadedObject(ObjectType::ScenarioText, 0); object != nullptr) + if (auto* object = objManager.GetLoadedObject(ObjectType::scenarioText, 0); object != nullptr) { auto* textObject = reinterpret_cast(object); diff --git a/src/openrct2/scripting/bindings/object/ScObject.hpp b/src/openrct2/scripting/bindings/object/ScObject.hpp index 08122f567b..440cc8f6c3 100644 --- a/src/openrct2/scripting/bindings/object/ScObject.hpp +++ b/src/openrct2/scripting/bindings/object/ScObject.hpp @@ -53,7 +53,7 @@ namespace OpenRCT2::Scripting static std::optional StringToObjectType(std::string_view type) { - for (uint8_t i = 0; i < EnumValue(ObjectType::Count); i++) + for (uint8_t i = 0; i < EnumValue(ObjectType::count); i++) { auto s = ObjectTypeToString(i); if (s == type) diff --git a/src/openrct2/scripting/bindings/object/ScObjectManager.cpp b/src/openrct2/scripting/bindings/object/ScObjectManager.cpp index eba95e2f42..1fad4ad1f3 100644 --- a/src/openrct2/scripting/bindings/object/ScObjectManager.cpp +++ b/src/openrct2/scripting/bindings/object/ScObjectManager.cpp @@ -245,14 +245,14 @@ void ScObjectManager::MarkAsResearched(const Object* object) // Defaults selected items to researched (if in-game) auto objectType = object->GetObjectType(); auto entryIndex = ObjectManagerGetLoadedObjectEntryIndex(object); - if (objectType == ObjectType::Ride) + if (objectType == ObjectType::ride) { const auto* rideEntry = GetRideEntryByIndex(entryIndex); auto rideType = rideEntry->GetFirstNonNullRideType(); auto category = static_cast(GetRideTypeDescriptor(rideType).Category); ResearchInsertRideEntry(rideType, entryIndex, category, true); } - else if (objectType == ObjectType::SceneryGroup) + else if (objectType == ObjectType::sceneryGroup) { ResearchInsertSceneryGroupEntry(entryIndex, true); } @@ -270,19 +270,19 @@ DukValue ScObjectManager::CreateScObject(duk_context* ctx, ObjectType type, int3 { switch (type) { - case ObjectType::Ride: + case ObjectType::ride: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); - case ObjectType::SmallScenery: + case ObjectType::smallScenery: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); - case ObjectType::LargeScenery: + case ObjectType::largeScenery: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); - case ObjectType::Walls: + case ObjectType::walls: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); - case ObjectType::Banners: + case ObjectType::banners: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); - case ObjectType::SceneryGroup: + case ObjectType::sceneryGroup: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); default: return GetObjectAsDukValue(ctx, std::make_shared(type, index)); diff --git a/src/openrct2/scripting/bindings/ride/ScRide.cpp b/src/openrct2/scripting/bindings/ride/ScRide.cpp index 5698a6f805..c26b64b227 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.cpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.cpp @@ -36,10 +36,10 @@ namespace OpenRCT2::Scripting auto ride = GetRide(); if (ride != nullptr) { - auto rideObject = GetContext()->GetObjectManager().GetLoadedObject(ObjectType::Ride, ride->subtype); + auto rideObject = GetContext()->GetObjectManager().GetLoadedObject(ObjectType::ride, ride->subtype); if (rideObject != nullptr) { - return std::make_shared(ObjectType::Ride, ride->subtype); + return std::make_shared(ObjectType::ride, ride->subtype); } } return nullptr; diff --git a/src/openrct2/scripting/bindings/world/ScResearch.cpp b/src/openrct2/scripting/bindings/world/ScResearch.cpp index 49950eefb8..6936d31831 100644 --- a/src/openrct2/scripting/bindings/world/ScResearch.cpp +++ b/src/openrct2/scripting/bindings/world/ScResearch.cpp @@ -279,7 +279,7 @@ namespace OpenRCT2::Scripting } else { - auto sceneryGroup = objManager.GetLoadedObject(ObjectType::SceneryGroup, researchItem.entryIndex); + auto sceneryGroup = objManager.GetLoadedObject(ObjectType::sceneryGroup, researchItem.entryIndex); if (sceneryGroup != nullptr) { researchItem.baseRideType = 0; diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 39fcaef603..b6faece633 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -1944,7 +1944,7 @@ bool FootpathSelectDefault() const FootpathObject* GetLegacyFootpathEntry(ObjectEntryIndex entryIndex) { auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objMgr.GetLoadedObject(ObjectType::Paths, entryIndex); + auto obj = objMgr.GetLoadedObject(ObjectType::paths, entryIndex); if (obj == nullptr) return nullptr; @@ -1955,7 +1955,7 @@ const FootpathObject* GetLegacyFootpathEntry(ObjectEntryIndex entryIndex) const FootpathSurfaceObject* GetPathSurfaceEntry(ObjectEntryIndex entryIndex) { auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objMgr.GetLoadedObject(ObjectType::FootpathSurface, entryIndex); + auto obj = objMgr.GetLoadedObject(ObjectType::footpathSurface, entryIndex); if (obj == nullptr) return nullptr; @@ -1965,7 +1965,7 @@ const FootpathSurfaceObject* GetPathSurfaceEntry(ObjectEntryIndex entryIndex) const FootpathRailingsObject* GetPathRailingsEntry(ObjectEntryIndex entryIndex) { auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objMgr.GetLoadedObject(ObjectType::FootpathRailings, entryIndex); + auto obj = objMgr.GetLoadedObject(ObjectType::footpathRailings, entryIndex); if (obj == nullptr) return nullptr; diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 09b16ff86a..9e9c3a7397 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -409,11 +409,11 @@ bool ObjectTypeCanBeRestricted(ObjectType objectType) { switch (objectType) { - case ObjectType::SmallScenery: - case ObjectType::LargeScenery: - case ObjectType::Walls: - case ObjectType::Banners: - case ObjectType::PathAdditions: + case ObjectType::smallScenery: + case ObjectType::largeScenery: + case ObjectType::walls: + case ObjectType::banners: + case ObjectType::pathAdditions: return true; default: return false; @@ -452,35 +452,35 @@ static MiscScenery GetAllMiscScenery() const auto objectType = GetObjectTypeFromSceneryType(sceneryType); switch (objectType) { - case ObjectType::SmallScenery: + case ObjectType::smallScenery: { const auto* objectEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (objectEntry != nullptr) linkedSceneryGroup = objectEntry->scenery_tab_id; break; } - case ObjectType::LargeScenery: + case ObjectType::largeScenery: { const auto* objectEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (objectEntry != nullptr) linkedSceneryGroup = objectEntry->scenery_tab_id; break; } - case ObjectType::Walls: + case ObjectType::walls: { const auto* objectEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (objectEntry != nullptr) linkedSceneryGroup = objectEntry->scenery_tab_id; break; } - case ObjectType::Banners: + case ObjectType::banners: { const auto* objectEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (objectEntry != nullptr) linkedSceneryGroup = objectEntry->scenery_tab_id; break; } - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: { const auto* objectEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); if (objectEntry != nullptr) @@ -556,15 +556,15 @@ ObjectType GetObjectTypeFromSceneryType(uint8_t type) switch (type) { case SCENERY_TYPE_SMALL: - return ObjectType::SmallScenery; + return ObjectType::smallScenery; case SCENERY_TYPE_PATH_ITEM: - return ObjectType::PathAdditions; + return ObjectType::pathAdditions; case SCENERY_TYPE_WALL: - return ObjectType::Walls; + return ObjectType::walls; case SCENERY_TYPE_LARGE: - return ObjectType::LargeScenery; + return ObjectType::largeScenery; case SCENERY_TYPE_BANNER: - return ObjectType::Banners; + return ObjectType::banners; default: throw std::runtime_error("Invalid scenery type"); } @@ -574,15 +574,15 @@ uint8_t GetSceneryTypeFromObjectType(ObjectType type) { switch (type) { - case ObjectType::SmallScenery: + case ObjectType::smallScenery: return SCENERY_TYPE_SMALL; - case ObjectType::PathAdditions: + case ObjectType::pathAdditions: return SCENERY_TYPE_PATH_ITEM; - case ObjectType::Walls: + case ObjectType::walls: return SCENERY_TYPE_WALL; - case ObjectType::LargeScenery: + case ObjectType::largeScenery: return SCENERY_TYPE_LARGE; - case ObjectType::Banners: + case ObjectType::banners: return SCENERY_TYPE_BANNER; default: throw std::runtime_error("Invalid object type"); diff --git a/src/openrct2/world/map_generator/SurfaceSelection.cpp b/src/openrct2/world/map_generator/SurfaceSelection.cpp index c7141d8c65..723b62f696 100644 --- a/src/openrct2/world/map_generator/SurfaceSelection.cpp +++ b/src/openrct2/world/map_generator/SurfaceSelection.cpp @@ -63,7 +63,7 @@ namespace OpenRCT2::World::MapGenerator if (edgeTexture.empty()) { - auto surfaceObject = objectManager.GetLoadedObject(ObjectType::TerrainSurface, surfaceTextureId); + auto surfaceObject = objectManager.GetLoadedObject(ObjectType::terrainSurface, surfaceTextureId); auto surfaceTexture = surfaceObject->GetIdentifier(); // Base edge type on surface type diff --git a/src/openrct2/world/map_generator/TreePlacement.cpp b/src/openrct2/world/map_generator/TreePlacement.cpp index 48a1fce1ff..47f5ec1632 100644 --- a/src/openrct2/world/map_generator/TreePlacement.cpp +++ b/src/openrct2/world/map_generator/TreePlacement.cpp @@ -122,10 +122,10 @@ namespace OpenRCT2::World::MapGenerator std::vector desertTreeIds; std::vector snowTreeIds; - for (auto i = 0u; i < getObjectEntryGroupCount(ObjectType::SmallScenery); i++) + for (auto i = 0u; i < getObjectEntryGroupCount(ObjectType::smallScenery); i++) { auto* sceneryEntry = OpenRCT2::ObjectManager::GetObjectEntry(i); - auto entry = ObjectEntryGetObject(ObjectType::SmallScenery, i); + auto entry = ObjectEntryGetObject(ObjectType::smallScenery, i); if (sceneryEntry == nullptr) continue; diff --git a/src/openrct2/world/tile_element/SurfaceElement.cpp b/src/openrct2/world/tile_element/SurfaceElement.cpp index c3d58f6d6a..b15ab422e8 100644 --- a/src/openrct2/world/tile_element/SurfaceElement.cpp +++ b/src/openrct2/world/tile_element/SurfaceElement.cpp @@ -64,7 +64,7 @@ bool SurfaceElement::CanGrassGrow() const { auto surfaceStyle = GetSurfaceObjectIndex(); auto& objMgr = OpenRCT2::GetContext()->GetObjectManager(); - auto obj = objMgr.GetLoadedObject(ObjectType::TerrainSurface, surfaceStyle); + auto obj = objMgr.GetLoadedObject(ObjectType::terrainSurface, surfaceStyle); if (obj != nullptr) { const auto* surfaceObject = static_cast(obj);