From 7582006e1081f30c54a342774f3ea520ca0360e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 26 Aug 2023 20:40:01 +0300
Subject: [PATCH] Use ObjectEntryIndex for surface object

---
 src/openrct2/paint/tile_element/Paint.Surface.cpp | 4 ++--
 src/openrct2/world/Surface.cpp                    | 6 +++---
 src/openrct2/world/TileElement.h                  | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
index d6fa6d5992..e059180154 100644
--- a/src/openrct2/paint/tile_element/Paint.Surface.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp
@@ -217,7 +217,7 @@ struct TileDescriptor
 {
     TileCoordsXY tile_coords;
     const TileElement* tile_element;
-    uint8_t terrain;
+    ObjectEntryIndex terrain;
     uint8_t slope;
     CornerHeight corner_heights;
 };
@@ -1038,7 +1038,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con
     TileDescriptor selfDescriptor = {
         TileCoordsXY(base),
         elementPtr,
-        static_cast<uint8_t>(terrain_type),
+        terrain_type,
         surfaceShape,
         {
             static_cast<uint8_t>(height / 16 + cornerHeights.top),
diff --git a/src/openrct2/world/Surface.cpp b/src/openrct2/world/Surface.cpp
index 127adba5e0..73209d4fdc 100644
--- a/src/openrct2/world/Surface.cpp
+++ b/src/openrct2/world/Surface.cpp
@@ -17,7 +17,7 @@
 #include "Location.hpp"
 #include "Map.h"
 
-uint32_t SurfaceElement::GetSurfaceStyle() const
+ObjectEntryIndex SurfaceElement::GetSurfaceStyle() const
 {
     return SurfaceStyle;
 }
@@ -39,9 +39,9 @@ TerrainEdgeObject* SurfaceElement::GetEdgeStyleObject() const
     return static_cast<TerrainEdgeObject*>(objManager.GetLoadedObject(ObjectType::TerrainEdge, GetEdgeStyle()));
 }
 
-void SurfaceElement::SetSurfaceStyle(uint32_t newStyle)
+void SurfaceElement::SetSurfaceStyle(ObjectEntryIndex newStyle)
 {
-    SurfaceStyle = newStyle;
+    SurfaceStyle = static_cast<ObjectEntryIndex>(newStyle);
 }
 
 void SurfaceElement::SetEdgeStyle(uint32_t newStyle)
diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h
index f11cd55b5b..a4d46079be 100644
--- a/src/openrct2/world/TileElement.h
+++ b/src/openrct2/world/TileElement.h
@@ -205,9 +205,10 @@ public:
     uint8_t GetSlope() const;
     void SetSlope(uint8_t newSlope);
 
-    uint32_t GetSurfaceStyle() const;
+    ObjectEntryIndex GetSurfaceStyle() const;
     TerrainSurfaceObject* GetSurfaceStyleObject() const;
-    void SetSurfaceStyle(uint32_t newStyle);
+    void SetSurfaceStyle(ObjectEntryIndex newStyle);
+
     uint32_t GetEdgeStyle() const;
     TerrainEdgeObject* GetEdgeStyleObject() const;
     void SetEdgeStyle(uint32_t newStyle);