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

Fix #23636: Mismatched entity count in save file (#25731)

Browse Source 
This is based on #24552, with two changes:
1. The entity list is copied and used for both the count and the actual writes
2. It no longer asserts if the count mismatches (which is why #24552 was not merged).

Co-authored-by: ZehMatt <ZehMatt@users.noreply.github.com>
This commit is contained in:
Michael Steenbeek
2026-01-18 14:18:44 +01:00
committed by GitHub
parent e9bde4dae9
commit 795cdaa53e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2639,10 +2639,19 @@ namespace OpenRCT2
template<typename T>
void ParkFile::WriteEntitiesOfType(GameState_t& gameState, OrcaStream& os, OrcaStream::ChunkStream& cs)
{
uint16_t count = gameState.entities.GetEntityListCount(T::cEntityType);
const auto entityList = EntityList<T>();
// We do not rely on GetEntityListCount as there is a potential issue (#23636) that needs investigating.
const auto count = [&]() -> uint16_t {
uint16_t res = 0;
for ([[maybe_unused]] auto* _ : entityList)
{
res++;
}
return res;
}();
cs.write(T::cEntityType);
cs.write(count);
for (auto* ent : EntityList<T>())
for (auto* ent : entityList)
{
cs.write(ent->Id);
ReadWriteEntity(os, cs, *ent);