mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity

Forward NetworkRideId_t to ride_id_t and adjust serialiser

Browse Source
This commit is contained in:
ZehMatt
2021-08-02 09:02:23 +03:00
committed by ζeh Matt
parent 2768910fbf
commit e65a1f6fc5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/core/DataSerialiserTraits.h
View File

@@ -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();

3
src/openrct2/network/NetworkTypes.h
View File

@@ -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