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

Merge branch 'develop' into new-save-format

Browse Source
This commit is contained in:
Ted John
2021-04-25 13:36:33 +01:00
parent 4252d4ed4c 1aec32056d
commit 6db0c01fdc
87 changed files with 2607 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/ParkFile.cpp
View File

@@ -1093,7 +1093,6 @@ namespace OpenRCT2
{
cs.ReadWrite(entity.sprite_index);
cs.ReadWrite(entity.sprite_height_negative);
cs.ReadWrite(entity.flags);
cs.ReadWrite(entity.x);
cs.ReadWrite(entity.y);
cs.ReadWrite(entity.z);
@@ -1343,6 +1342,7 @@ namespace OpenRCT2
cs.ReadWrite(entity.colours_extended);
cs.ReadWrite(entity.seat_rotation);
cs.ReadWrite(entity.target_seat_rotation);
cs.ReadWrite(entity.IsCrashedVehicle);
}
template<> void ParkFile::ReadWriteEntity(OrcaStream::ChunkStream& cs, Guest& entity)