From e65a1f6fc52961e897620091cb1d941fbb1be854 Mon Sep 17 00:00:00 2001
From: ZehMatt <m.moninger.h@gmail.com>
Date: Mon, 2 Aug 2021 09:02:23 +0300
Subject: [PATCH] Forward NetworkRideId_t to ride_id_t and adjust serialiser

---
 src/openrct2/core/DataSerialiserTraits.h | 8 ++++----
 src/openrct2/network/NetworkTypes.h      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h
index 7cea7fe8f5..ec862bab38 100644
--- a/src/openrct2/core/DataSerialiserTraits.h
+++ b/src/openrct2/core/DataSerialiserTraits.h
@@ -218,7 +218,7 @@ template<> struct DataSerializerTraits_t<NetworkRideId_t>
 {
     static void encode(OpenRCT2::IStream* stream, const NetworkRideId_t& val)
     {
-        uint32_t temp = static_cast<uint32_t>(val.id);
+        uint32_t temp = static_cast<uint32_t>(val);
         temp = ByteSwapBE(temp);
         stream->Write(&temp);
     }
@@ -226,16 +226,16 @@ template<> struct DataSerializerTraits_t<NetworkRideId_t>
     {
         uint32_t temp;
         stream->Read(&temp);
-        val.id = static_cast<decltype(val.id)>(ByteSwapBE(temp));
+        val = static_cast<NetworkRideId_t>(ByteSwapBE(temp));
     }
     static void log(OpenRCT2::IStream* stream, const NetworkRideId_t& val)
     {
         char rideId[28] = {};
-        snprintf(rideId, sizeof(rideId), "%u", val.id);
+        snprintf(rideId, sizeof(rideId), "%u", val);
 
         stream->Write(rideId, strlen(rideId));
 
-        auto ride = get_ride(val.id);
+        auto ride = get_ride(val);
         if (ride != nullptr)
         {
             auto rideName = ride->GetName();
diff --git a/src/openrct2/network/NetworkTypes.h b/src/openrct2/network/NetworkTypes.h
index 6e4df2285b..c173fbfb16 100644
--- a/src/openrct2/network/NetworkTypes.h
+++ b/src/openrct2/network/NetworkTypes.h
@@ -126,10 +126,11 @@ template<typename T, size_t _TypeID> struct NetworkObjectId_t
 };
 #pragma pack(pop)
 
+using NetworkRideId_t = ride_id_t;
+
 // NOTE: When adding new types make sure to have no duplicate _TypeID's otherwise
 // there is no way to specialize templates if they have the exact symbol.
 using NetworkPlayerId_t = NetworkObjectId_t<int32_t, 0>;
-using NetworkRideId_t = NetworkObjectId_t<ride_id_t, 1>;
 using NetworkCheatType_t = NetworkObjectId_t<int32_t, 2>;
 
 enum class NetworkStatisticsGroup : uint32_t