mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity

Make track designs NSF map size safe (#16116)

Browse Source 
* Make track designs NSF map size safe

* Increment network version
This commit is contained in:
Duncan
2021-12-06 16:58:50 +00:00
committed by GitHub
parent bd9f7d56c5
commit fdfd9b4760
7 changed files with 36 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -716,9 +716,7 @@ template<> struct DataSerializerTraits_t<TrackDesignSceneryElement>
{
static void encode(OpenRCT2::IStream* stream, const TrackDesignSceneryElement& val)
{
stream->Write(&val.x);
stream->Write(&val.y);
stream->Write(&val.z);
stream->Write(&val.loc);
stream->Write(&val.flags);
stream->Write(&val.primary_colour);
stream->Write(&val.secondary_colour);
@@ -727,9 +725,7 @@ template<> struct DataSerializerTraits_t<TrackDesignSceneryElement>
}
static void decode(OpenRCT2::IStream* stream, TrackDesignSceneryElement& val)
{
stream->Read(&val.x);
stream->Read(&val.y);
stream->Read(&val.z);
stream->Read(&val.loc);
stream->Read(&val.flags);
stream->Read(&val.primary_colour);
stream->Read(&val.secondary_colour);
@@ -741,7 +737,7 @@ template<> struct DataSerializerTraits_t<TrackDesignSceneryElement>
char msg[128] = {};
snprintf(
msg, sizeof(msg), "TrackDesignSceneryElement(x = %d, y = %d, z = %d, flags = %d, colour1 = %d, colour2 = %d)",
val.x, val.y, val.z, val.flags, val.primary_colour, val.secondary_colour);
val.loc.x, val.loc.y, val.loc.z, val.flags, val.primary_colour, val.secondary_colour);
stream->Write(msg, strlen(msg));
auto identifier = val.scenery_object.GetName();