From 35c8fee3685e0bb561ec99724684d0223f9d1a37 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Fri, 28 May 2021 17:38:44 +0100 Subject: [PATCH] Fix peep thought desync issues and handle >255 rides --- src/openrct2/ParkFile.cpp | 2 +- src/openrct2/core/DataSerialiserTraits.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index d915081bbd..36cc6dcdac 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -1700,7 +1700,7 @@ namespace OpenRCT2 cs.ReadWrite(guest.PreviousRideTimeOut); cs.ReadWriteArray(guest.Thoughts, [&cs](rct_peep_thought& thought) { cs.ReadWrite(thought.type); - cs.ReadWrite(thought.item); + cs.ReadWrite(thought.argument); cs.ReadWrite(thought.freshness); cs.ReadWrite(thought.fresh_timeout); return true; diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h index 48c5948ea6..14d0ee1736 100644 --- a/src/openrct2/core/DataSerialiserTraits.h +++ b/src/openrct2/core/DataSerialiserTraits.h @@ -850,14 +850,14 @@ template<> struct DataSerializerTraits_t static void encode(OpenRCT2::IStream* stream, const rct_peep_thought& val) { stream->Write(&val.type); - stream->Write(&val.item); + stream->Write(&val.argument); stream->Write(&val.freshness); stream->Write(&val.fresh_timeout); } static void decode(OpenRCT2::IStream* stream, rct_peep_thought& val) { stream->Read(&val.type); - stream->Read(&val.item); + stream->Read(&val.argument); stream->Read(&val.freshness); stream->Read(&val.fresh_timeout); }