Rename Object and TileElement type constant (#23030)

* Rename Object::objectType to Object::kObjectType * Rename TileElement::ElementType to TileElement::kElementType
2026-01-16 11:33:03 +01:00 · 2024-10-20 08:10:55 +02:00
parent f0c353254f
commit 8fe2d7de1f
29 changed files with 31 additions and 31 deletions
--- a/src/openrct2/object/AudioObject.h
+++ b/src/openrct2/object/AudioObject.h
@@ -23,7 +23,7 @@ private:
    AudioSampleTable _loadedSampleTable;

 public:
-    static constexpr ObjectType objectType = ObjectType::Audio;
+    static constexpr ObjectType kObjectType = ObjectType::Audio;

    void ReadJson(IReadObjectContext* context, json_t& root) override;
    void Load() override;
--- a/src/openrct2/object/BannerObject.h
+++ b/src/openrct2/object/BannerObject.h
@@ -19,7 +19,7 @@ private:
    BannerSceneryEntry _legacyType = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::Banners;
+    static constexpr ObjectType kObjectType = ObjectType::Banners;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/EntranceObject.h
+++ b/src/openrct2/object/EntranceObject.h
@@ -20,7 +20,7 @@ private:
    EntranceEntry _legacyType = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::ParkEntrance;
+    static constexpr ObjectType kObjectType = ObjectType::ParkEntrance;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/FootpathObject.h
+++ b/src/openrct2/object/FootpathObject.h
@@ -22,7 +22,7 @@ private:
    PathRailingsDescriptor _pathRailingsDescriptor = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::Paths;
+    static constexpr ObjectType kObjectType = ObjectType::Paths;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/FootpathRailingsObject.h
+++ b/src/openrct2/object/FootpathRailingsObject.h
@@ -26,7 +26,7 @@ public:
    PathRailingsDescriptor _descriptor = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::FootpathRailings;
+    static constexpr ObjectType kObjectType = ObjectType::FootpathRailings;

    void ReadJson(IReadObjectContext* context, json_t& root) override;
    void Load() override;
--- a/src/openrct2/object/FootpathSurfaceObject.h
+++ b/src/openrct2/object/FootpathSurfaceObject.h
@@ -22,7 +22,7 @@ public:
    PathSurfaceDescriptor _descriptor = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::FootpathSurface;
+    static constexpr ObjectType kObjectType = ObjectType::FootpathSurface;

    void ReadJson(IReadObjectContext* context, json_t& root) override;
    void Load() override;
--- a/src/openrct2/object/LargeSceneryObject.h
+++ b/src/openrct2/object/LargeSceneryObject.h
@@ -24,7 +24,7 @@ private:
    std::unique_ptr<LargeSceneryText> _3dFont;

 public:
-    static constexpr ObjectType objectType = ObjectType::LargeScenery;
+    static constexpr ObjectType kObjectType = ObjectType::LargeScenery;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/MusicObject.h
+++ b/src/openrct2/object/MusicObject.h
@@ -53,7 +53,7 @@ private:
    uint32_t _previewImageId{};

 public:
-    static constexpr ObjectType objectType = ObjectType::Music;
+    static constexpr ObjectType kObjectType = ObjectType::Music;

    StringId NameStringId{};

--- a/src/openrct2/object/ObjectManager.h
+++ b/src/openrct2/object/ObjectManager.h
@@ -28,7 +28,7 @@ struct IObjectManager
    virtual Object* GetLoadedObject(ObjectType objectType, size_t index) = 0;
    template<typename TClass> TClass* GetLoadedObject(size_t index)
    {
-        return static_cast<TClass*>(GetLoadedObject(TClass::objectType, index));
+        return static_cast<TClass*>(GetLoadedObject(TClass::kObjectType, index));
    }
    virtual Object* GetLoadedObject(const ObjectEntryDescriptor& entry) = 0;
    virtual ObjectEntryIndex GetLoadedObjectEntryIndex(std::string_view identifier) = 0;
--- a/src/openrct2/object/PathAdditionObject.h
+++ b/src/openrct2/object/PathAdditionObject.h
@@ -18,7 +18,7 @@ private:
    PathAdditionEntry _legacyType = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::PathAdditions;
+    static constexpr ObjectType kObjectType = ObjectType::PathAdditions;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/PeepNamesObject.h
+++ b/src/openrct2/object/PeepNamesObject.h
@@ -22,7 +22,7 @@ private:
    std::vector<std::string> _surnames;

 public:
-    static constexpr ObjectType objectType = ObjectType::PeepNames;
+    static constexpr ObjectType kObjectType = ObjectType::PeepNames;

    void ReadJson(IReadObjectContext* context, json_t& root) override;
    void Load() override;
--- a/src/openrct2/object/RideObject.h
+++ b/src/openrct2/object/RideObject.h
@@ -26,7 +26,7 @@ private:
    std::vector<std::array<CoordsXY, 3>> _peepLoadingWaypoints[OpenRCT2::RCT2::ObjectLimits::MaxCarTypesPerRideEntry];

 public:
-    static constexpr ObjectType objectType = ObjectType::Ride;
+    static constexpr ObjectType kObjectType = ObjectType::Ride;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/SceneryGroupObject.h
+++ b/src/openrct2/object/SceneryGroupObject.h
@@ -25,7 +25,7 @@ private:
    std::vector<ObjectEntryDescriptor> _items;

 public:
-    static constexpr ObjectType objectType = ObjectType::SceneryGroup;
+    static constexpr ObjectType kObjectType = ObjectType::SceneryGroup;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/SmallSceneryObject.h
+++ b/src/openrct2/object/SmallSceneryObject.h
@@ -22,7 +22,7 @@ private:
    std::vector<uint8_t> _frameOffsets;

 public:
-    static constexpr ObjectType objectType = ObjectType::SmallScenery;
+    static constexpr ObjectType kObjectType = ObjectType::SmallScenery;

    void* GetLegacyData() override
    {
--- 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 objectType = ObjectType::Station;
+    static constexpr ObjectType kObjectType = ObjectType::Station;

    StringId NameStringId{};
    ImageIndex BaseImageId = ImageIndexUndefined;
--- 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 objectType = ObjectType::TerrainEdge;
+    static constexpr ObjectType kObjectType = ObjectType::TerrainEdge;

    StringId NameStringId{};
    uint32_t IconImageId{};
--- a/src/openrct2/object/TerrainSurfaceObject.h
+++ b/src/openrct2/object/TerrainSurfaceObject.h
@@ -35,7 +35,7 @@ private:
    static constexpr auto kNumImagesInEntry = 19;

 public:
-    static constexpr ObjectType objectType = ObjectType::TerrainSurface;
+    static constexpr ObjectType kObjectType = ObjectType::TerrainSurface;

    static constexpr uint8_t kNoValue = 0xFF;
    StringId NameStringId{};
--- a/src/openrct2/object/WallObject.h
+++ b/src/openrct2/object/WallObject.h
@@ -18,7 +18,7 @@ private:
    WallSceneryEntry _legacyType = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::Walls;
+    static constexpr ObjectType kObjectType = ObjectType::Walls;

    void* GetLegacyData() override
    {
--- a/src/openrct2/object/WaterObject.h
+++ b/src/openrct2/object/WaterObject.h
@@ -20,7 +20,7 @@ private:
    WaterObjectEntry _legacyType = {};

 public:
-    static constexpr ObjectType objectType = ObjectType::Water;
+    static constexpr ObjectType kObjectType = ObjectType::Water;

    void* GetLegacyData() override
    {
--- a/src/openrct2/world/Map.h
+++ b/src/openrct2/world/Map.h
@@ -183,13 +183,13 @@ TileElement* TileElementInsert(const CoordsXYZ& loc, int32_t occupiedQuadrants,

 template<typename T = TileElement> T* MapGetFirstTileElementWithBaseHeightBetween(const TileCoordsXYRangedZ& loc)
 {
-    auto* element = MapGetFirstTileElementWithBaseHeightBetween(loc, T::ElementType);
+    auto* element = MapGetFirstTileElementWithBaseHeightBetween(loc, T::kElementType);
    return element != nullptr ? element->template as<T>() : nullptr;
 }

 template<typename T> T* TileElementInsert(const CoordsXYZ& loc, int32_t occupiedQuadrants)
 {
-    auto* element = TileElementInsert(loc, occupiedQuadrants, T::ElementType);
+    auto* element = TileElementInsert(loc, occupiedQuadrants, T::kElementType);
    return (element != nullptr) ? element->template as<T>() : nullptr;
 }

--- a/src/openrct2/world/tile_element/BannerElement.h
+++ b/src/openrct2/world/tile_element/BannerElement.h
@@ -17,7 +17,7 @@ struct BannerSceneryEntry;
 #pragma pack(push, 1)
 struct BannerElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Banner;
+    static constexpr TileElementType kElementType = TileElementType::Banner;

 private:
    BannerIndex index;    // 5
--- a/src/openrct2/world/tile_element/EntranceElement.h
+++ b/src/openrct2/world/tile_element/EntranceElement.h
@@ -42,7 +42,7 @@ struct EntranceElement;

 struct EntranceElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Entrance;
+    static constexpr TileElementType kElementType = TileElementType::Entrance;

 private:
    uint8_t entranceType;        // 5
--- a/src/openrct2/world/tile_element/LargeSceneryElement.h
+++ b/src/openrct2/world/tile_element/LargeSceneryElement.h
@@ -24,7 +24,7 @@ enum
 #pragma pack(push, 1)
 struct LargeSceneryElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::LargeScenery;
+    static constexpr TileElementType kElementType = TileElementType::LargeScenery;

 private:
    ObjectEntryIndex EntryIndex;
--- a/src/openrct2/world/tile_element/PathElement.h
+++ b/src/openrct2/world/tile_element/PathElement.h
@@ -59,7 +59,7 @@ enum
 #pragma pack(push, 1)
 struct PathElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Path;
+    static constexpr TileElementType kElementType = TileElementType::Path;

 private:
    ObjectEntryIndex SurfaceIndex;  // 5
--- a/src/openrct2/world/tile_element/SmallSceneryElement.h
+++ b/src/openrct2/world/tile_element/SmallSceneryElement.h
@@ -22,7 +22,7 @@ enum
 #pragma pack(push, 1)
 struct SmallSceneryElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::SmallScenery;
+    static constexpr TileElementType kElementType = TileElementType::SmallScenery;

 private:
    ObjectEntryIndex entryIndex; // 5
--- a/src/openrct2/world/tile_element/SurfaceElement.h
+++ b/src/openrct2/world/tile_element/SurfaceElement.h
@@ -44,7 +44,7 @@ constexpr uint8_t kTileElementSurfaceParkFenceMask = 0x0F;
 #pragma pack(push, 1)
 struct SurfaceElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Surface;
+    static constexpr TileElementType kElementType = TileElementType::Surface;

 private:
    uint8_t Slope;
--- a/src/openrct2/world/tile_element/TileElementBase.h
+++ b/src/openrct2/world/tile_element/TileElementBase.h
@@ -89,7 +89,7 @@ struct TileElementBase
        if constexpr (std::is_same_v<TType, TileElement>)
            return reinterpret_cast<const TileElement*>(this);
        else
-            return GetType() == TType::ElementType ? reinterpret_cast<const TType*>(this) : nullptr;
+            return GetType() == TType::kElementType ? reinterpret_cast<const TType*>(this) : nullptr;
    }

    template<typename TType> TType* as()
@@ -97,7 +97,7 @@ struct TileElementBase
        if constexpr (std::is_same_v<TType, TileElement>)
            return reinterpret_cast<TileElement*>(this);
        else
-            return GetType() == TType::ElementType ? reinterpret_cast<TType*>(this) : nullptr;
+            return GetType() == TType::kElementType ? reinterpret_cast<TType*>(this) : nullptr;
    }

    const SurfaceElement* AsSurface() const;
--- a/src/openrct2/world/tile_element/TrackElement.h
+++ b/src/openrct2/world/tile_element/TrackElement.h
@@ -52,7 +52,7 @@ enum

 struct TrackElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Track;
+    static constexpr TileElementType kElementType = TileElementType::Track;

 private:
    OpenRCT2::TrackElemType TrackType;
--- a/src/openrct2/world/tile_element/WallElement.h
+++ b/src/openrct2/world/tile_element/WallElement.h
@@ -29,7 +29,7 @@ enum
 #pragma pack(push, 1)
 struct WallElement : TileElementBase
 {
-    static constexpr TileElementType ElementType = TileElementType::Wall;
+    static constexpr TileElementType kElementType = TileElementType::Wall;

 private:
    ObjectEntryIndex entryIndex; // 05