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

Fix enum serialization not using byte swap

This commit is contained in:
ζeh Matt 2021-09-05 16:59:42 +03:00
parent 5868071fbc
commit 23f4f72047
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,19 +38,23 @@ template<typename T> struct DataSerializerTraits_t
template<typename T> struct DataSerializerTraits_enum template<typename T> struct DataSerializerTraits_enum
{ {
using TUnderlying = std::underlying_type_t<T>;
static void encode(OpenRCT2::IStream* stream, const T& val) static void encode(OpenRCT2::IStream* stream, const T& val)
{ {
stream->Write(&val); TUnderlying temp = ByteSwapBE(static_cast<TUnderlying>(val));
stream->Write(&temp);
} }
static void decode(OpenRCT2::IStream* stream, T& val) static void decode(OpenRCT2::IStream* stream, T& val)
{ {
stream->Read(&val); TUnderlying temp;
stream->Read(&temp);
val = static_cast<T>(ByteSwapBE(temp));
} }
static void log(OpenRCT2::IStream* stream, const T& val) static void log(OpenRCT2::IStream* stream, const T& val)
{ {
using underlying = std::underlying_type_t<T>;
std::stringstream ss; std::stringstream ss;
ss << std::hex << std::setw(sizeof(underlying) * 2) << std::setfill('0') << static_cast<underlying>(val); ss << std::hex << std::setw(sizeof(TUnderlying) * 2) << std::setfill('0') << static_cast<TUnderlying>(val);
std::string str = ss.str(); std::string str = ss.str();
stream->Write(str.c_str(), str.size()); stream->Write(str.c_str(), str.size());