From 2c72940cfd10826cc6102e2c91ba414e8aea54b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:39:43 +0200
Subject: [PATCH] Use TIdentifier for RideId

---
 src/openrct2/Identifiers.h    | 2 ++
 src/openrct2/ride/RideTypes.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/Identifiers.h b/src/openrct2/Identifiers.h
index aa008e87d9..53e5eb4c3b 100644
--- a/src/openrct2/Identifiers.h
+++ b/src/openrct2/Identifiers.h
@@ -17,3 +17,5 @@
 using ParkEntranceIndex = TIdentifier<uint8_t, std::numeric_limits<uint8_t>::max(), struct ParkEntranceIndexTag>;
 
 using BannerIndex = TIdentifier<uint16_t, std::numeric_limits<uint16_t>::max(), struct BannerIndexTag>;
+
+using RideId = TIdentifier<uint16_t, std::numeric_limits<uint16_t>::max(), struct RideIdTag>;
diff --git a/src/openrct2/ride/RideTypes.h b/src/openrct2/ride/RideTypes.h
index 433b380cfc..582c661dfd 100644
--- a/src/openrct2/ride/RideTypes.h
+++ b/src/openrct2/ride/RideTypes.h
@@ -9,16 +9,16 @@
 
 #pragma once
 
+#include "../Identifiers.h"
 #include "../object/Object.h"
 
 #include <cstdint>
 #include <limits>
 #include <type_traits>
 
-enum class RideId : uint16_t;
 struct Ride;
 
-constexpr const RideId RIDE_ID_NULL = static_cast<RideId>(std::numeric_limits<std::underlying_type_t<RideId>>::max());
+constexpr auto RIDE_ID_NULL = RideId::GetNull();
 
 using ride_type_t = uint16_t;