mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53: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-07-19 19:04:19 +02:00
parent d8eb762a19 4760642fd5
commit b2ffbb3639
123 changed files with 1741 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/ParkFile.cpp
View File

@@ -400,7 +400,7 @@ namespace OpenRCT2
cs.ReadWrite(gGrassSceneryTileLoopPosition);
cs.ReadWrite(gWidePathTileLoopPosition);
ReadWriteRideRatingCalculationData(cs, gRideRatingsCalcData);
ReadWriteRideRatingCalculationData(cs, gRideRatingUpdateState);
});
if (!found)
{
@@ -408,7 +408,7 @@ namespace OpenRCT2
}
}
void ReadWriteRideRatingCalculationData(OrcaStream::ChunkStream& cs, RideRatingCalculationData& calcData)
void ReadWriteRideRatingCalculationData(OrcaStream::ChunkStream& cs, RideRatingUpdateState& calcData)
{
cs.ReadWrite(calcData.AmountOfBrakes);
cs.ReadWrite(calcData.Proximity);