dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saveload: Use table format for NewGRF/ID mapping chunks

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-21 18:57:19 +00:00
parent b3bd1bb5ad
commit 0e262620d2
7 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sl/airport_sl.cpp
View File

@@ -35,8 +35,8 @@ static void Load_ATID()
} }
static const ChunkHandler airport_chunk_handlers[] = { static const ChunkHandler airport_chunk_handlers[] = {
{ 'ATID', Save_ATID, Load_ATID, nullptr, nullptr, CH_ARRAY }, { 'ATID', Save_ATID, Load_ATID, nullptr, nullptr, CH_TABLE },
{ 'APID', Save_APID, Load_APID, nullptr, nullptr, CH_ARRAY }, { 'APID', Save_APID, Load_APID, nullptr, nullptr, CH_TABLE },
}; };
extern const ChunkHandlerTable _airport_chunk_handlers(airport_chunk_handlers); extern const ChunkHandlerTable _airport_chunk_handlers(airport_chunk_handlers);

1
src/sl/extended_ver_sl.cpp
View File

@@ -214,6 +214,7 @@ const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = {
{ XSLFI_TABLE_PATS, XSCF_NULL, 1, 1, "table_pats", nullptr, nullptr, nullptr }, { XSLFI_TABLE_PATS, XSCF_NULL, 1, 1, "table_pats", nullptr, nullptr, nullptr },
{ XSLFI_TABLE_MISC_SL, XSCF_NULL, 2, 2, "table_misc_sl", nullptr, nullptr, nullptr }, { XSLFI_TABLE_MISC_SL, XSCF_NULL, 2, 2, "table_misc_sl", nullptr, nullptr, nullptr },
{ XSLFI_TABLE_SCRIPT_SL, XSCF_NULL, 1, 1, "table_script_sl", nullptr, nullptr, nullptr }, { XSLFI_TABLE_SCRIPT_SL, XSCF_NULL, 1, 1, "table_script_sl", nullptr, nullptr, nullptr },
{ XSLFI_TABLE_NEWGRF_SL, XSCF_NULL, 1, 1, "table_newgrf_sl", nullptr, nullptr, nullptr },
{ XSLFI_NULL, XSCF_NULL, 0, 0, nullptr, nullptr, nullptr, nullptr }, // This is the end marker { XSLFI_NULL, XSCF_NULL, 0, 0, nullptr, nullptr, nullptr, nullptr }, // This is the end marker
}; };

1
src/sl/extended_ver_sl.h
View File

@@ -165,6 +165,7 @@ enum SlXvFeatureIndex {
///< v1: DATE, VIEW, MAPS ///< v1: DATE, VIEW, MAPS
///< v2: SUBS, CMDL, CMPU, ERNW, DEPT, CAPY, ECMY, EIDS, ENGN, GOAL, GRPS, RAIL, OBJS, SIGN, PSAC, STPE, STPA ///< v2: SUBS, CMDL, CMPU, ERNW, DEPT, CAPY, ECMY, EIDS, ENGN, GOAL, GRPS, RAIL, OBJS, SIGN, PSAC, STPE, STPA
XSLFI_TABLE_SCRIPT_SL, ///< Use upstream table format for script chunks XSLFI_TABLE_SCRIPT_SL, ///< Use upstream table format for script chunks
XSLFI_TABLE_NEWGRF_SL, ///< Use upstream table format for NewGRF/ID mapping chunks
XSLFI_RIFF_HEADER_60_BIT, ///< Size field in RIFF chunk header is 60 bit XSLFI_RIFF_HEADER_60_BIT, ///< Size field in RIFF chunk header is 60 bit
XSLFI_HEIGHT_8_BIT, ///< Map tile height is 8 bit instead of 4 bit, but savegame version may be before this became true in trunk XSLFI_HEIGHT_8_BIT, ///< Map tile height is 8 bit instead of 4 bit, but savegame version may be before this became true in trunk

4
src/sl/industry_sl.cpp
View File

@@ -178,8 +178,8 @@ static void Load_ITBL()
static const ChunkHandler industry_chunk_handlers[] = { static const ChunkHandler industry_chunk_handlers[] = {
{ 'INDY', Save_INDY, Load_INDY, Ptrs_INDY, nullptr, CH_ARRAY }, { 'INDY', Save_INDY, Load_INDY, Ptrs_INDY, nullptr, CH_ARRAY },
{ 'IIDS', Save_IIDS, Load_IIDS, nullptr, nullptr, CH_ARRAY }, { 'IIDS', Save_IIDS, Load_IIDS, nullptr, nullptr, CH_TABLE },
{ 'TIDS', Save_TIDS, Load_TIDS, nullptr, nullptr, CH_ARRAY }, { 'TIDS', Save_TIDS, Load_TIDS, nullptr, nullptr, CH_TABLE },
{ 'IBLD', LoadSave_IBLD, LoadSave_IBLD, nullptr, nullptr, CH_RIFF }, { 'IBLD', LoadSave_IBLD, LoadSave_IBLD, nullptr, nullptr, CH_RIFF },
{ 'ITBL', Save_ITBL, Load_ITBL, nullptr, nullptr, CH_ARRAY }, { 'ITBL', Save_ITBL, Load_ITBL, nullptr, nullptr, CH_ARRAY },
}; };

49
src/sl/newgrf_sl.cpp
View File

@@ -23,10 +23,10 @@ static const SaveLoad _newgrf_mapping_desc_old[] = {
SLE_VAR(EntityIDMapping, entity_id, SLE_FILE_U8 | SLE_VAR_U16), SLE_VAR(EntityIDMapping, entity_id, SLE_FILE_U8 | SLE_VAR_U16),
SLE_VAR(EntityIDMapping, substitute_id, SLE_FILE_U8 | SLE_VAR_U16), SLE_VAR(EntityIDMapping, substitute_id, SLE_FILE_U8 | SLE_VAR_U16),
}; };
static const SaveLoad _newgrf_mapping_desc_new[] = { static const NamedSaveLoad _newgrf_mapping_desc_new[] = {
SLE_VAR(EntityIDMapping, grfid, SLE_UINT32), NSL("grfid", SLE_VAR(EntityIDMapping, grfid, SLE_UINT32)),
SLE_VAR(EntityIDMapping, entity_id, SLE_UINT16), NSL("entity_id", SLE_VAR(EntityIDMapping, entity_id, SLE_UINT16)),
SLE_VAR(EntityIDMapping, substitute_id, SLE_UINT16), NSL("substitute_id", SLE_VAR(EntityIDMapping, substitute_id, SLE_UINT16)),
}; };
/** /**
@@ -35,12 +35,14 @@ static const SaveLoad _newgrf_mapping_desc_new[] = {
*/ */
void Save_NewGRFMapping(const OverrideManagerBase &mapping) void Save_NewGRFMapping(const OverrideManagerBase &mapping)
{ {
std::vector<SaveLoad> sld = SlTableHeader(_newgrf_mapping_desc_new);
for (uint i = 0; i < mapping.GetMaxMapping(); i++) { for (uint i = 0; i < mapping.GetMaxMapping(); i++) {
if (mapping.mappings[i].grfid == 0 && if (mapping.mappings[i].grfid == 0 &&
mapping.mappings[i].entity_id == 0) continue; mapping.mappings[i].entity_id == 0) continue;
SlSetArrayIndex(i); SlSetArrayIndex(i);
SlSetLength(4 + 2 + 2); SlSetLength(4 + 2 + 2);
SlObjectSaveFiltered(const_cast<EntityIDMapping *>(&mapping.mappings[i]), _newgrf_mapping_desc_new); // _newgrf_mapping_desc_new has no conditionals SlObjectSaveFiltered(const_cast<EntityIDMapping *>(&mapping.mappings[i]), sld);
} }
} }
@@ -56,7 +58,15 @@ void Load_NewGRFMapping(OverrideManagerBase &mapping)
uint max_id = mapping.GetMaxMapping(); uint max_id = mapping.GetMaxMapping();
SaveLoadTable slt = SlXvIsFeaturePresent(XSLFI_NEWGRF_ENTITY_EXTRA) ? SaveLoadTable(_newgrf_mapping_desc_new) : SaveLoadTable(_newgrf_mapping_desc_old); SaveLoadTable slt;
std::vector<SaveLoad> sld;
if (SlXvIsFeaturePresent(XSLFI_NEWGRF_ENTITY_EXTRA) || SlIsTableChunk()) {
sld = SlTableHeaderOrRiff(_newgrf_mapping_desc_new);
slt = SaveLoadTable(sld);
} else {
slt = SaveLoadTable(_newgrf_mapping_desc_old);
}
int index; int index;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
@@ -67,37 +77,38 @@ void Load_NewGRFMapping(OverrideManagerBase &mapping)
static std::string _grf_name; static std::string _grf_name;
static const SaveLoad _grfconfig_desc[] = { static const NamedSaveLoad _grfconfig_desc[] = {
SLE_SSTR(GRFConfig, filename, SLE_STR), NSL("filename", SLE_SSTR(GRFConfig, filename, SLE_STR)),
SLE_VAR(GRFConfig, ident.grfid, SLE_UINT32), NSL("ident.grfid", SLE_VAR(GRFConfig, ident.grfid, SLE_UINT32)),
SLE_ARR(GRFConfig, ident.md5sum, SLE_UINT8, 16), NSL("ident.md5sum", SLE_ARR(GRFConfig, ident.md5sum, SLE_UINT8, 16)),
SLE_CONDVAR(GRFConfig, version, SLE_UINT32, SLV_151, SL_MAX_VERSION), NSL("version", SLE_CONDVAR(GRFConfig, version, SLE_UINT32, SLV_151, SL_MAX_VERSION)),
SLE_ARR(GRFConfig, param, SLE_UINT32, 0x80), NSL("param", SLE_ARR(GRFConfig, param, SLE_UINT32, 0x80)),
SLE_VAR(GRFConfig, num_params, SLE_UINT8), NSL("num_params", SLE_VAR(GRFConfig, num_params, SLE_UINT8)),
SLE_CONDVAR(GRFConfig, palette, SLE_UINT8, SLV_101, SL_MAX_VERSION), NSL("palette", SLE_CONDVAR(GRFConfig, palette, SLE_UINT8, SLV_101, SL_MAX_VERSION)),
SLEG_CONDSSTR_X(_grf_name, SLE_STR, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_NEWGRF_INFO_EXTRA)), NSL("grf_name", SLEG_CONDSSTR_X(_grf_name, SLE_STR, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_NEWGRF_INFO_EXTRA))),
}; };
static void Save_NGRF() static void Save_NGRF()
{ {
std::vector<SaveLoad> sld = SlTableHeader(_grfconfig_desc);
int index = 0; int index = 0;
for (GRFConfig *c = _grfconfig; c != nullptr; c = c->next) { for (GRFConfig *c = _grfconfig; c != nullptr; c = c->next) {
if (HasBit(c->flags, GCF_STATIC) || HasBit(c->flags, GCF_INIT_ONLY)) continue; if (HasBit(c->flags, GCF_STATIC) || HasBit(c->flags, GCF_INIT_ONLY)) continue;
SlSetArrayIndex(index++); SlSetArrayIndex(index++);
_grf_name = str_strip_all_scc(GetDefaultLangGRFStringFromGRFText(c->name)); _grf_name = str_strip_all_scc(GetDefaultLangGRFStringFromGRFText(c->name));
SlObject(c, _grfconfig_desc); SlObjectSaveFiltered(c, sld);
} }
} }
static void Load_NGRF_common(GRFConfig *&grfconfig) static void Load_NGRF_common(GRFConfig *&grfconfig)
{ {
std::vector<SaveLoad> sld = SlTableHeaderOrRiff(_grfconfig_desc);
ClearGRFConfigList(&grfconfig); ClearGRFConfigList(&grfconfig);
while (SlIterateArray() != -1) { while (SlIterateArray() != -1) {
GRFConfig *c = new GRFConfig(); GRFConfig *c = new GRFConfig();
SlObject(c, _grfconfig_desc); SlObjectLoadFiltered(c, sld);
if (SlXvIsFeaturePresent(XSLFI_NEWGRF_INFO_EXTRA)) { if (SlXvIsFeaturePresent(XSLFI_NEWGRF_INFO_EXTRA)) {
AddGRFTextToList(c->name, 0x7F, c->ident.grfid, false, _grf_name.c_str()); AddGRFTextToList(c->name, 0x7F, c->ident.grfid, false, _grf_name.c_str());
} }
@@ -128,7 +139,7 @@ static void Check_NGRF()
} }
static const ChunkHandler newgrf_chunk_handlers[] = { static const ChunkHandler newgrf_chunk_handlers[] = {
{ 'NGRF', Save_NGRF, Load_NGRF, nullptr, Check_NGRF, CH_ARRAY } { 'NGRF', Save_NGRF, Load_NGRF, nullptr, Check_NGRF, CH_TABLE }
}; };
extern const ChunkHandlerTable _newgrf_chunk_handlers(newgrf_chunk_handlers); extern const ChunkHandlerTable _newgrf_chunk_handlers(newgrf_chunk_handlers);

2
src/sl/object_sl.cpp
View File

@@ -27,7 +27,7 @@ static void Load_OBID()
} }
static const ChunkHandler object_chunk_handlers[] = { static const ChunkHandler object_chunk_handlers[] = {
{ 'OBID', Save_OBID, Load_OBID, nullptr, nullptr, CH_ARRAY }, { 'OBID', Save_OBID, Load_OBID, nullptr, nullptr, CH_TABLE },
MakeUpstreamChunkHandler<'OBJS', GeneralUpstreamChunkLoadInfo>(), MakeUpstreamChunkHandler<'OBJS', GeneralUpstreamChunkLoadInfo>(),
}; };

2
src/sl/town_sl.cpp
View File

@@ -452,7 +452,7 @@ static ChunkSaveLoadSpecialOpResult Special_TNNC(uint32_t chunk_id, ChunkSaveLoa
/** Chunk handler for towns. */ /** Chunk handler for towns. */
static const ChunkHandler town_chunk_handlers[] = { static const ChunkHandler town_chunk_handlers[] = {
{ 'HIDS', Save_HIDS, Load_HIDS, nullptr, nullptr, CH_ARRAY }, { 'HIDS', Save_HIDS, Load_HIDS, nullptr, nullptr, CH_TABLE },
{ 'CITY', Save_TOWN, Load_TOWN, Ptrs_TOWN, nullptr, CH_ARRAY }, { 'CITY', Save_TOWN, Load_TOWN, Ptrs_TOWN, nullptr, CH_ARRAY },
{ 'TNNC', Save_TNNC, Load_TNNC, nullptr, nullptr, CH_RIFF, Special_TNNC }, { 'TNNC', Save_TNNC, Load_TNNC, nullptr, nullptr, CH_RIFF, Special_TNNC },
}; };