|
|
|
@ -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, substitute_id, SLE_FILE_U8 | SLE_VAR_U16),
|
|
|
|
|
};
|
|
|
|
|
static const SaveLoad _newgrf_mapping_desc_new[] = {
|
|
|
|
|
SLE_VAR(EntityIDMapping, grfid, SLE_UINT32),
|
|
|
|
|
SLE_VAR(EntityIDMapping, entity_id, SLE_UINT16),
|
|
|
|
|
SLE_VAR(EntityIDMapping, substitute_id, SLE_UINT16),
|
|
|
|
|
static const NamedSaveLoad _newgrf_mapping_desc_new[] = {
|
|
|
|
|
NSL("grfid", SLE_VAR(EntityIDMapping, grfid, SLE_UINT32)),
|
|
|
|
|
NSL("entity_id", SLE_VAR(EntityIDMapping, entity_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)
|
|
|
|
|
{
|
|
|
|
|
std::vector<SaveLoad> sld = SlTableHeader(_newgrf_mapping_desc_new);
|
|
|
|
|
|
|
|
|
|
for (uint i = 0; i < mapping.GetMaxMapping(); i++) {
|
|
|
|
|
if (mapping.mappings[i].grfid == 0 &&
|
|
|
|
|
mapping.mappings[i].entity_id == 0) continue;
|
|
|
|
|
SlSetArrayIndex(i);
|
|
|
|
|
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();
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
while ((index = SlIterateArray()) != -1) {
|
|
|
|
@ -67,37 +77,38 @@ void Load_NewGRFMapping(OverrideManagerBase &mapping)
|
|
|
|
|
|
|
|
|
|
static std::string _grf_name;
|
|
|
|
|
|
|
|
|
|
static const SaveLoad _grfconfig_desc[] = {
|
|
|
|
|
SLE_SSTR(GRFConfig, filename, SLE_STR),
|
|
|
|
|
SLE_VAR(GRFConfig, ident.grfid, SLE_UINT32),
|
|
|
|
|
SLE_ARR(GRFConfig, ident.md5sum, SLE_UINT8, 16),
|
|
|
|
|
SLE_CONDVAR(GRFConfig, version, SLE_UINT32, SLV_151, SL_MAX_VERSION),
|
|
|
|
|
SLE_ARR(GRFConfig, param, SLE_UINT32, 0x80),
|
|
|
|
|
SLE_VAR(GRFConfig, num_params, SLE_UINT8),
|
|
|
|
|
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)),
|
|
|
|
|
static const NamedSaveLoad _grfconfig_desc[] = {
|
|
|
|
|
NSL("filename", SLE_SSTR(GRFConfig, filename, SLE_STR)),
|
|
|
|
|
NSL("ident.grfid", SLE_VAR(GRFConfig, ident.grfid, SLE_UINT32)),
|
|
|
|
|
NSL("ident.md5sum", SLE_ARR(GRFConfig, ident.md5sum, SLE_UINT8, 16)),
|
|
|
|
|
NSL("version", SLE_CONDVAR(GRFConfig, version, SLE_UINT32, SLV_151, SL_MAX_VERSION)),
|
|
|
|
|
NSL("param", SLE_ARR(GRFConfig, param, SLE_UINT32, 0x80)),
|
|
|
|
|
NSL("num_params", SLE_VAR(GRFConfig, num_params, SLE_UINT8)),
|
|
|
|
|
NSL("palette", SLE_CONDVAR(GRFConfig, palette, SLE_UINT8, SLV_101, SL_MAX_VERSION)),
|
|
|
|
|
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()
|
|
|
|
|
{
|
|
|
|
|
std::vector<SaveLoad> sld = SlTableHeader(_grfconfig_desc);
|
|
|
|
|
int index = 0;
|
|
|
|
|
|
|
|
|
|
for (GRFConfig *c = _grfconfig; c != nullptr; c = c->next) {
|
|
|
|
|
if (HasBit(c->flags, GCF_STATIC) || HasBit(c->flags, GCF_INIT_ONLY)) continue;
|
|
|
|
|
SlSetArrayIndex(index++);
|
|
|
|
|
_grf_name = str_strip_all_scc(GetDefaultLangGRFStringFromGRFText(c->name));
|
|
|
|
|
SlObject(c, _grfconfig_desc);
|
|
|
|
|
SlObjectSaveFiltered(c, sld);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void Load_NGRF_common(GRFConfig *&grfconfig)
|
|
|
|
|
{
|
|
|
|
|
std::vector<SaveLoad> sld = SlTableHeaderOrRiff(_grfconfig_desc);
|
|
|
|
|
ClearGRFConfigList(&grfconfig);
|
|
|
|
|
while (SlIterateArray() != -1) {
|
|
|
|
|
GRFConfig *c = new GRFConfig();
|
|
|
|
|
SlObject(c, _grfconfig_desc);
|
|
|
|
|
SlObjectLoadFiltered(c, sld);
|
|
|
|
|
if (SlXvIsFeaturePresent(XSLFI_NEWGRF_INFO_EXTRA)) {
|
|
|
|
|
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[] = {
|
|
|
|
|
{ '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);
|
|
|
|
|