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

Saveload: Use table format for speed adaptation chunk

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-07-08 18:48:25 +01:00
parent 3202fc2ce3
commit 3035b91b5c
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sl/extended_ver_sl.cpp
View File

@@ -163,7 +163,7 @@ const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = {
{ XSLFI_MORE_HOUSES, XSCF_NULL, 2, 2, "more_houses", nullptr, nullptr, nullptr }, { XSLFI_MORE_HOUSES, XSCF_NULL, 2, 2, "more_houses", nullptr, nullptr, nullptr },
{ XSLFI_CUSTOM_TOWN_ZONE, XSCF_IGNORABLE_UNKNOWN, 1, 1, "custom_town_zone", nullptr, nullptr, nullptr }, { XSLFI_CUSTOM_TOWN_ZONE, XSCF_IGNORABLE_UNKNOWN, 1, 1, "custom_town_zone", nullptr, nullptr, nullptr },
{ XSLFI_STATION_CARGO_HISTORY, XSCF_NULL, 2, 2, "station_cargo_history", nullptr, nullptr, nullptr }, { XSLFI_STATION_CARGO_HISTORY, XSCF_NULL, 2, 2, "station_cargo_history", nullptr, nullptr, nullptr },
{ XSLFI_TRAIN_SPEED_ADAPTATION, XSCF_NULL, 2, 2, "train_speed_adaptation", nullptr, nullptr, "TSAS" }, { XSLFI_TRAIN_SPEED_ADAPTATION, XSCF_NULL, 3, 3, "train_speed_adaptation", nullptr, nullptr, "TSAS" },
{ XSLFI_EXTRA_STATION_NAMES, XSCF_NULL, 1, 1, "extra_station_names", nullptr, nullptr, nullptr }, { XSLFI_EXTRA_STATION_NAMES, XSCF_NULL, 1, 1, "extra_station_names", nullptr, nullptr, nullptr },
{ XSLFI_DEPOT_ORDER_EXTRA_FLAGS, XSCF_IGNORABLE_UNKNOWN, 1, 1, "depot_order_extra_flags", nullptr, nullptr, nullptr }, { XSLFI_DEPOT_ORDER_EXTRA_FLAGS, XSCF_IGNORABLE_UNKNOWN, 1, 1, "depot_order_extra_flags", nullptr, nullptr, nullptr },
{ XSLFI_EXTRA_SIGNAL_TYPES, XSCF_NULL, 1, 1, "extra_signal_types", nullptr, nullptr, nullptr }, { XSLFI_EXTRA_SIGNAL_TYPES, XSCF_NULL, 1, 1, "extra_signal_types", nullptr, nullptr, nullptr },

42
src/sl/train_speed_adaptation.cpp
View File

@@ -13,47 +13,45 @@
using SignalSpeedType = std::pair<const SignalSpeedKey, SignalSpeedValue>; using SignalSpeedType = std::pair<const SignalSpeedKey, SignalSpeedValue>;
static const SaveLoad _train_speed_adaptation_map_desc[] = { static const NamedSaveLoad _train_speed_adaptation_map_desc[] = {
SLE_CONDVAR_X(SignalSpeedType, first.signal_track, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_TRAIN_SPEED_ADAPTATION, 1, 1)), NSLT("signal_tile", SLE_VAR(SignalSpeedType, first.signal_tile, SLE_UINT32)),
SLE_CONDVAR_X(SignalSpeedType, first.signal_track, SLE_UINT16, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_TRAIN_SPEED_ADAPTATION, 2)), NSL("signal_track", SLE_CONDVAR_X(SignalSpeedType, first.signal_track, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_TRAIN_SPEED_ADAPTATION, 1, 1))),
SLE_VAR(SignalSpeedType, first.last_passing_train_dir, SLE_UINT8), NSL("signal_track", SLE_CONDVAR_X(SignalSpeedType, first.signal_track, SLE_UINT16, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_TRAIN_SPEED_ADAPTATION, 2))),
SLE_VAR(SignalSpeedType, second.train_speed, SLE_UINT16), NSL("last_passing_train_dir", SLE_VAR(SignalSpeedType, first.last_passing_train_dir, SLE_UINT8)),
SLE_VAR(SignalSpeedType, second.time_stamp, SLE_UINT64), NSL("train_speed", SLE_VAR(SignalSpeedType, second.train_speed, SLE_UINT16)),
NSL("time_stamp", SLE_VAR(SignalSpeedType, second.time_stamp, SLE_UINT64)),
}; };
static std::vector<SaveLoad> _filtered_train_speed_adaptation_map_desc;
static void Load_TSAS() static void Load_TSAS()
{ {
_filtered_train_speed_adaptation_map_desc = SlFilterObject(_train_speed_adaptation_map_desc); const bool table_mode = SlIsTableChunk();
std::vector<SaveLoad> slt = SlTableHeaderOrRiff(_train_speed_adaptation_map_desc);
int index; int index;
SignalSpeedType data; SignalSpeedType data;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
const_cast<SignalSpeedKey &>(data.first).signal_tile = index; if (!table_mode) {
SlObjectLoadFiltered(&data, _filtered_train_speed_adaptation_map_desc); const_cast<SignalSpeedKey &>(data.first).signal_tile = index;
}
SlObjectLoadFiltered(&data, slt);
_signal_speeds.insert(data); _signal_speeds.insert(data);
} }
_filtered_train_speed_adaptation_map_desc.clear();
}
static void RealSave_TSAS(SignalSpeedType *data)
{
SlObjectSaveFiltered(data, _filtered_train_speed_adaptation_map_desc);
} }
static void Save_TSAS() static void Save_TSAS()
{ {
_filtered_train_speed_adaptation_map_desc = SlFilterObject(_train_speed_adaptation_map_desc); std::vector<SaveLoad> slt = SlTableHeader(_train_speed_adaptation_map_desc);
int index = 0;
for (auto &it : _signal_speeds) { for (auto &it : _signal_speeds) {
SlSetArrayIndex(it.first.signal_tile); SlSetArrayIndex(index++);
SignalSpeedType *data = &it; SignalSpeedType *data = &it;
SlAutolength((AutolengthProc*) RealSave_TSAS, data); SlObjectSaveFiltered(data, slt);
} }
_filtered_train_speed_adaptation_map_desc.clear();
} }
extern const ChunkHandler train_speed_adaptation_chunk_handlers[] = { extern const ChunkHandler train_speed_adaptation_chunk_handlers[] = {
{ 'TSAS', Save_TSAS, Load_TSAS, nullptr, nullptr, CH_SPARSE_ARRAY }, { 'TSAS', Save_TSAS, Load_TSAS, nullptr, nullptr, CH_TABLE },
}; };
extern const ChunkHandlerTable _train_speed_adaptation_chunk_handlers(train_speed_adaptation_chunk_handlers); extern const ChunkHandlerTable _train_speed_adaptation_chunk_handlers(train_speed_adaptation_chunk_handlers);