mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix DataSerialiser not accepting temporary values.

This commit is contained in:
Matt 2018-12-06 06:56:57 +01:00
parent a6efef1e81
commit 000a9694f9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/core/DataSerialiser.h
View File

@ -56,13 +56,13 @@ public:
if (!_isLogging)
{
if (_isSaving)
DataSerializerTraits<T>::encode(_activeStream, const_cast<T&>(data));
DataSerializerTraits<T>::encode(_activeStream, data);
else
DataSerializerTraits<T>::decode(_activeStream, const_cast<T&>(data));
}
else
{
DataSerializerTraits<T>::log(_activeStream, const_cast<T&>(data));
DataSerializerTraits<T>::log(_activeStream, data);
}
return *this;

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

@ -40,7 +40,7 @@ template<typename T> struct DataSerializerTraitsIntegral
stream->Read(&temp);
val = ByteSwapBE(temp);
}
static void log(IStream* stream, T& val)
static void log(IStream* stream, const T& val)
{
char temp[32] = {};
if constexpr (sizeof(T) == 1)
@ -68,7 +68,7 @@ template<> struct DataSerializerTraits<bool>
{
stream->Read(&val);
}
static void log(IStream* stream, bool& val)
static void log(IStream* stream, const bool& val)
{
if (val)
stream->Write("true", 4);
@ -142,7 +142,7 @@ template<> struct DataSerializerTraits<NetworkPlayerId_t>
stream->Read(&temp);
val.id = ByteSwapBE(temp);
}
static void log(IStream* stream, NetworkPlayerId_t& val)
static void log(IStream* stream, const NetworkPlayerId_t& val)
{
char playerId[28] = {};
snprintf(playerId, sizeof(playerId), "%u", val.id);
@ -176,7 +176,7 @@ template<> struct DataSerializerTraits<NetworkRideId_t>
stream->Read(&temp);
val.id = ByteSwapBE(temp);
}
static void log(IStream* stream, NetworkRideId_t& val)
static void log(IStream* stream, const NetworkRideId_t& val)
{
char rideId[28] = {};
snprintf(rideId, sizeof(rideId), "%u", val.id);
@ -208,7 +208,7 @@ template<typename T> struct DataSerializerTraits<DataSerialiserTag<T>>
DataSerializerTraits<T> s;
s.decode(stream, tag.Data());
}
static void log(IStream* stream, DataSerialiserTag<T>& tag)
static void log(IStream* stream, const DataSerialiserTag<T>& tag)
{
const char* name = tag.Name();
stream->Write(name, strlen(name));
@ -242,7 +242,7 @@ template<> struct DataSerializerTraits<MemoryStream>
val.Write(buf.get(), length);
}
static void log(IStream* stream, MemoryStream& tag)
static void log(IStream* stream, const MemoryStream& tag)
{
}
};