From cb6e9e5df360d48d4229f6dac6b6f74f287ac70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sun, 27 Aug 2023 00:25:25 +0300
Subject: [PATCH] Rename GetSurfaceStyleObject to GetSurfaceObject

---
 src/openrct2-ui/windows/Map.cpp                   | 2 +-
 src/openrct2-ui/windows/TileInspector.cpp         | 2 +-
 src/openrct2/paint/tile_element/Paint.Surface.cpp | 4 ++--
 src/openrct2/world/Surface.cpp                    | 2 +-
 src/openrct2/world/TileElement.h                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index 15caa4aa41..63be554ad9 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -1059,7 +1059,7 @@ private:
             return 0;
 
         uint16_t colour = MapColour(PALETTE_INDEX_0);
-        const auto* surfaceObject = surfaceElement->GetSurfaceStyleObject();
+        const auto* surfaceObject = surfaceElement->GetSurfaceObject();
         if (surfaceObject != nullptr)
             colour = MapColour2(surfaceObject->MapColours[0], surfaceObject->MapColours[1]);
 
diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
index e821c68513..735d857a0a 100644
--- a/src/openrct2-ui/windows/TileInspector.cpp
+++ b/src/openrct2-ui/windows/TileInspector.cpp
@@ -1055,7 +1055,7 @@ public:
                     // Details
                     // Terrain texture name
                     StringId terrainNameId = STR_EMPTY;
-                    auto surfaceStyle = tileElement->AsSurface()->GetSurfaceStyleObject();
+                    auto surfaceStyle = tileElement->AsSurface()->GetSurfaceObject();
                     if (surfaceStyle != nullptr)
                         terrainNameId = surfaceStyle->NameStringId;
                     auto ft = Formatter();
diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
index 45259ceb8b..5fb3803850 100644
--- a/src/openrct2/paint/tile_element/Paint.Surface.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp
@@ -998,7 +998,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
     const CornerHeight& cornerHeights = corner_heights[surfaceShape];
     const TileElement* elementPtr = &reinterpret_cast<const TileElement&>(tileElement);
 
-    const auto* surfaceObject = tileElement.GetSurfaceStyleObject();
+    const auto* surfaceObject = tileElement.GetSurfaceObject();
     const auto* edgeObject = tileElement.GetEdgeObject();
 
     TileDescriptor selfDescriptor = {
@@ -1042,7 +1042,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
 
         descriptor.tile_coords = TileCoordsXY{ position };
         descriptor.tile_element = reinterpret_cast<TileElement*>(surfaceElement);
-        descriptor.surfaceObject = surfaceElement->GetSurfaceStyleObject();
+        descriptor.surfaceObject = surfaceElement->GetSurfaceObject();
         descriptor.slope = surfaceSlope;
         descriptor.corner_heights.top = baseHeight + ch.top;
         descriptor.corner_heights.right = baseHeight + ch.right;
diff --git a/src/openrct2/world/Surface.cpp b/src/openrct2/world/Surface.cpp
index 8ad69c7236..11c09b46a6 100644
--- a/src/openrct2/world/Surface.cpp
+++ b/src/openrct2/world/Surface.cpp
@@ -22,7 +22,7 @@ ObjectEntryIndex SurfaceElement::GetSurfaceObjectIndex() const
     return SurfaceStyle;
 }
 
-TerrainSurfaceObject* SurfaceElement::GetSurfaceStyleObject() const
+TerrainSurfaceObject* SurfaceElement::GetSurfaceObject() const
 {
     auto& objManager = OpenRCT2::GetContext()->GetObjectManager();
     return static_cast<TerrainSurfaceObject*>(objManager.GetLoadedObject(ObjectType::TerrainSurface, GetSurfaceObjectIndex()));
diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h
index d71716ab04..40df792e67 100644
--- a/src/openrct2/world/TileElement.h
+++ b/src/openrct2/world/TileElement.h
@@ -206,7 +206,7 @@ public:
     void SetSlope(uint8_t newSlope);
 
     ObjectEntryIndex GetSurfaceObjectIndex() const;
-    TerrainSurfaceObject* GetSurfaceStyleObject() const;
+    TerrainSurfaceObject* GetSurfaceObject() const;
     void SetSurfaceObjectIndex(ObjectEntryIndex newStyle);
 
     ObjectEntryIndex GetEdgeObjectIndex() const;