diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index 798195b753..968a574518 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -1199,6 +1199,7 @@ namespace OpenRCT2 ReadWriteEntityCommon(cs, entity); auto guest = entity.As(); + auto staff = entity.As(); if (cs.GetMode() == OrcaStream::Mode::READING) { @@ -1237,7 +1238,7 @@ namespace OpenRCT2 } else { - cs.Ignore(); + cs.ReadWrite(staff->AssignedStaffType); } } @@ -1362,7 +1363,7 @@ namespace OpenRCT2 } else { - cs.Ignore(); + cs.ReadWrite(staff->MechanicTimeSinceCall); } } @@ -1426,7 +1427,7 @@ namespace OpenRCT2 { cs.Ignore(); cs.Ignore(); - cs.Ignore(); + cs.ReadWrite(staff->HireDate); cs.Ignore(); cs.Ignore(); cs.Ignore(); @@ -1455,7 +1456,7 @@ namespace OpenRCT2 else { cs.Ignore(); - cs.Ignore(); + cs.ReadWrite(staff->StaffOrders); cs.Ignore(); } } @@ -1504,12 +1505,12 @@ namespace OpenRCT2 else { cs.Ignore(); + cs.ReadWrite(staff->StaffMowingTimeout); cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); + cs.ReadWrite(staff->StaffLawnsMown); + cs.ReadWrite(staff->StaffGardensWatered); + cs.ReadWrite(staff->StaffLitterSwept); + cs.ReadWrite(staff->StaffBinsEmptied); cs.Ignore(); cs.Ignore(); cs.Ignore(); @@ -1645,6 +1646,11 @@ namespace OpenRCT2 { ReadWritePeep(os, cs, guest); + if (os.GetHeader().TargetVersion <= 1) + { + return; + } + cs.ReadWrite(guest.GuestNumRides); cs.ReadWrite(guest.GuestNextInQueue); cs.ReadWrite(guest.ParkEntryTime); @@ -1778,6 +1784,22 @@ namespace OpenRCT2 { SetPatrolArea(entity, patrolArea); } + + if (os.GetHeader().TargetVersion <= 1) + { + return; + } + + cs.ReadWrite(entity.AssignedStaffType); + cs.ReadWrite(entity.MechanicTimeSinceCall); + cs.ReadWrite(entity.HireDate); + cs.ReadWrite(entity.StaffId); + cs.ReadWrite(entity.StaffOrders); + cs.ReadWrite(entity.StaffMowingTimeout); + cs.ReadWrite(entity.StaffLawnsMown); + cs.ReadWrite(entity.StaffGardensWatered); + cs.ReadWrite(entity.StaffLitterSwept); + cs.ReadWrite(entity.StaffBinsEmptied); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, SteamParticle& steamParticle)