Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Saveload: Fix handling of chunk table/non-table mode in SlPrepareNamedSaveLoadTableForPtrOrNull

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-08-03 11:56:13 +01:00
parent 6af9b4b2ae
commit 66c0d4c20d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sl/saveload.cpp
View File

@ -2472,8 +2472,16 @@ SaveLoadTableData SlTableHeaderOrRiff(const NamedSaveLoadTable &slt)
SaveLoadTableData SlPrepareNamedSaveLoadTableForPtrOrNull(const NamedSaveLoadTable &slt)
{
const bool table_mode = (_sl.action == SLA_NULL) || SlIsTableChunk();
SaveLoadTableData saveloads;
SlFilterNamedSaveLoadTable(slt, saveloads);
for (auto &nsld : slt) {
if (table_mode) {
if (StrEmpty(nsld.name)) continue;
} else {
if ((nsld.nsl_flags & NSLF_TABLE_ONLY) != 0) continue;
}
SlFilterObjectMember(nsld.save_load, saveloads);
}
for (auto &sld : saveloads) {
if (sld.cmd == SL_STRUCTLIST || sld.cmd == SL_STRUCT) {
std::unique_ptr<SaveLoadStructHandler> handler = sld.struct_handler_factory();
@ -2689,6 +2697,7 @@ static void SlLoadChunk(const ChunkHandler &ch)
/* read in real header */
m = SlReadByte();
_sl.block_mode = m;
_sl.chunk_block_modes[_sl.current_chunk_id] = m;
}
_sl.expect_table_header = (_sl.block_mode == CH_TABLE || _sl.block_mode == CH_SPARSE_TABLE);
@ -2776,6 +2785,7 @@ static void SlLoadCheckChunk(const ChunkHandler *ch, uint32_t chunk_id)
/* read in real header */
m = SlReadByte();
_sl.block_mode = m;
_sl.chunk_block_modes[_sl.current_chunk_id] = m;
}
_sl.expect_table_header = (_sl.block_mode == CH_TABLE || _sl.block_mode == CH_SPARSE_TABLE);
@ -3012,6 +3022,7 @@ static void SlFixPointers()
for (auto &ch : ChunkHandlers()) {
_sl.current_chunk_id = ch.id;
_sl.block_mode = _sl.chunk_block_modes[_sl.current_chunk_id];
if (ch.special_proc != nullptr) {
if (ch.special_proc(ch.id, CSLSO_PRE_PTRS) == CSLSOR_LOAD_CHUNK_CONSUMED) continue;
}