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 { static void encode(OpenRCT2::IStream* stream, const NetworkRideId_t& val) { - uint32_t temp = static_cast(val.id); + uint32_t temp = static_cast(val); temp = ByteSwapBE(temp); stream->Write(&temp); } @@ -226,16 +226,16 @@ template<> struct DataSerializerTraits_t { uint32_t temp; stream->Read(&temp); - val.id = static_cast(ByteSwapBE(temp)); + val = static_cast(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 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; -using NetworkRideId_t = NetworkObjectId_t; using NetworkCheatType_t = NetworkObjectId_t; enum class NetworkStatisticsGroup : uint32_t