mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +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-29 15:39:42 +02:00
parent 0652b326e1 cba52b240e
commit 93c656f91d
258 changed files with 9060 additions and 9379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/ParkFile.cpp
View File

@@ -1271,7 +1271,7 @@ namespace OpenRCT2
template<typename T> static void ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, T& entity);
static void ReadWriteEntityCommon(OrcaStream::ChunkStream& cs, SpriteBase& entity)
static void ReadWriteEntityCommon(OrcaStream::ChunkStream& cs, EntityBase& entity)
{
cs.ReadWrite(entity.sprite_index);
cs.ReadWrite(entity.sprite_height_negative);
@@ -1744,7 +1744,7 @@ namespace OpenRCT2
cs.ReadWrite(entity.powered_acceleration);
cs.ReadWrite(entity.dodgems_collision_direction);
cs.ReadWrite(entity.animation_frame);
cs.ReadWrite(entity.var_C8);
cs.ReadWrite(entity.animationState);
cs.ReadWrite(entity.var_CA);
cs.ReadWrite(entity.scream_sound_id);
cs.ReadWrite(entity.TrackSubposition);