mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into new-save-format

Browse Source
This commit is contained in:
Gymnasiast
2021-08-31 00:42:44 +02:00
parent 7912e0eee4 0be585024f
commit 612724e8f8
53 changed files with 1142 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/ParkFile.cpp
View File

@@ -1522,18 +1522,18 @@ namespace OpenRCT2
cs.ReadWrite(guest->RejoinQueueTimeout);
cs.ReadWrite(guest->PreviousRide);
cs.ReadWrite(guest->PreviousRideTimeOut);
cs.ReadWriteArray(guest->Thoughts, [&cs](rct_peep_thought& thought) {
cs.ReadWriteArray(guest->Thoughts, [&cs](PeepThought& thought) {
cs.ReadWrite(thought.type);
uint8_t item;
cs.ReadWrite(item);
if (item == 255)
{
thought.argument = std::numeric_limits<uint32_t>::max();
thought.item = PeepThoughtItemNone;
}
else
{
thought.argument = item;
thought.item = item;
}
cs.ReadWrite(thought.freshness);
@@ -1550,8 +1550,8 @@ namespace OpenRCT2
cs.Ignore<ride_id_t>();
cs.Ignore<uint16_t>();
std::vector<rct_peep_thought> temp;
cs.ReadWriteVector(temp, [&cs](rct_peep_thought& thought) {
std::vector<PeepThought> temp;
cs.ReadWriteVector(temp, [&cs](PeepThought& thought) {
cs.ReadWrite(thought.type);
cs.ReadWrite(thought.item);
cs.ReadWrite(thought.freshness);
@@ -1743,7 +1743,6 @@ namespace OpenRCT2
cs.ReadWrite(entity.dodgems_collision_direction);
cs.ReadWrite(entity.animation_frame);
cs.ReadWrite(entity.animationState);
cs.ReadWrite(entity.var_CA);
cs.ReadWrite(entity.scream_sound_id);
cs.ReadWrite(entity.TrackSubposition);
cs.ReadWrite(entity.var_CE);
@@ -1863,9 +1862,9 @@ namespace OpenRCT2
cs.ReadWrite(guest.RejoinQueueTimeout);
cs.ReadWrite(guest.PreviousRide);
cs.ReadWrite(guest.PreviousRideTimeOut);
cs.ReadWriteArray(guest.Thoughts, [&cs](rct_peep_thought& thought) {
cs.ReadWriteArray(guest.Thoughts, [&cs](PeepThought& thought) {
cs.ReadWrite(thought.type);
cs.ReadWrite(thought.argument);
cs.ReadWrite(thought.item);
cs.ReadWrite(thought.freshness);
cs.ReadWrite(thought.fresh_timeout);
return true;