mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 07:44:38 +01:00
Code Issues Releases Wiki Activity

Widen Vehicle::update_flags to 32 bits (#19340)

Browse Source 
* Expand update_flags to uint32

* move IsCrashedVehicle to update_flags

* rename update_flags to Flags

* Update replays

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
This commit is contained in:
spacek531
2023-02-10 13:46:06 -08:00
committed by GitHub
parent 96bfa633fe
commit 1dfbb5f124
13 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2/park/ParkFile.cpp
View File

@@ -1887,7 +1887,16 @@ namespace OpenRCT2
cs.ReadWrite(entity.next_vehicle_on_ride);
cs.ReadWrite(entity.var_44);
cs.ReadWrite(entity.mass);
cs.ReadWrite(entity.update_flags);
if (cs.GetMode() == OrcaStream::Mode::READING && os.GetHeader().TargetVersion < 18)
{
uint16_t updateFlags = 0;
cs.ReadWrite(updateFlags);
entity.Flags = updateFlags;
}
else
{
cs.ReadWrite(entity.Flags);
}
cs.ReadWrite(entity.SwingSprite);
cs.ReadWrite(entity.current_station);
cs.ReadWrite(entity.current_time);
@@ -1940,7 +1949,15 @@ namespace OpenRCT2
cs.ReadWrite(entity.colours.Tertiary);
cs.ReadWrite(entity.seat_rotation);
cs.ReadWrite(entity.target_seat_rotation);
cs.ReadWrite(entity.IsCrashedVehicle);
if (cs.GetMode() == OrcaStream::Mode::READING && os.GetHeader().TargetVersion < 18)
{
bool isCrashedVehicle = false;
cs.ReadWrite(isCrashedVehicle);
if (isCrashedVehicle)
{
entity.SetUpdateFlag(VEHICLE_UPDATE_FLAG_CRASHED);
}
}
}
template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, Guest& guest)