From 8993e4d062cd26ae7c8d2c46a57781aa161454e9 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Sun, 15 Aug 2021 22:54:43 +0200
Subject: [PATCH] Use ObjectEntryIndex for entrance style

---
 src/openrct2/actions/RideSetAppearanceAction.cpp | 3 ++-
 src/openrct2/actions/RideSetAppearanceAction.h   | 4 ++--
 src/openrct2/ride/Ride.h                         | 4 ++--
 src/openrct2/ride/RideConstruction.cpp           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp
index d17ad76035..551d1edd5e 100644
--- a/src/openrct2/actions/RideSetAppearanceAction.cpp
+++ b/src/openrct2/actions/RideSetAppearanceAction.cpp
@@ -21,7 +21,8 @@
 #include "../ui/WindowManager.h"
 #include "../world/Park.h"
 
-RideSetAppearanceAction::RideSetAppearanceAction(ride_id_t rideIndex, RideSetAppearanceType type, uint8_t value, uint32_t index)
+RideSetAppearanceAction::RideSetAppearanceAction(
+    ride_id_t rideIndex, RideSetAppearanceType type, uint16_t value, uint32_t index)
     : _rideIndex(rideIndex)
     , _type(type)
     , _value(value)
diff --git a/src/openrct2/actions/RideSetAppearanceAction.h b/src/openrct2/actions/RideSetAppearanceAction.h
index ce9a93d0d6..cc4d56bf4d 100644
--- a/src/openrct2/actions/RideSetAppearanceAction.h
+++ b/src/openrct2/actions/RideSetAppearanceAction.h
@@ -29,12 +29,12 @@ DEFINE_GAME_ACTION(RideSetAppearanceAction, GameCommand::SetRideAppearance, Game
 private:
     NetworkRideId_t _rideIndex{ RIDE_ID_NULL };
     RideSetAppearanceType _type{};
-    uint8_t _value{};
+    uint16_t _value{};
     uint32_t _index{};
 
 public:
     RideSetAppearanceAction() = default;
-    RideSetAppearanceAction(ride_id_t rideIndex, RideSetAppearanceType type, uint8_t value, uint32_t index);
+    RideSetAppearanceAction(ride_id_t rideIndex, RideSetAppearanceType type, uint16_t value, uint32_t index);
 
     void AcceptParameters(GameActionParameterVisitor & visitor) override;
 
diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h
index 2df6091a66..1c0340b0b9 100644
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -363,7 +363,7 @@ public:
     money64 profit;
     TrackColour track_colour[NUM_COLOUR_SCHEMES];
     uint8_t music;
-    uint8_t entrance_style;
+    ObjectEntryIndex entrance_style;
     uint16_t vehicle_change_timeout;
     uint8_t num_block_brakes;
     uint8_t lift_hill_speed;
@@ -1119,7 +1119,7 @@ extern uint8_t gRideEntranceExitPlaceDirection;
 
 extern bool gGotoStartPlacementMode;
 
-extern uint8_t gLastEntranceStyle;
+extern ObjectEntryIndex gLastEntranceStyle;
 
 int32_t ride_get_count();
 void ride_init_all();
diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp
index cd8ec533c7..8abc33ef60 100644
--- a/src/openrct2/ride/RideConstruction.cpp
+++ b/src/openrct2/ride/RideConstruction.cpp
@@ -78,7 +78,7 @@ uint8_t _currentSeatRotationAngle;
 
 CoordsXYZD _unkF440C5;
 
-uint8_t gLastEntranceStyle;
+ObjectEntryIndex gLastEntranceStyle;
 
 uint8_t gRideEntranceExitPlaceType;
 ride_id_t gRideEntranceExitPlaceRideIndex;