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

Saveload: Add version label feature to SLXI chunk

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-03 02:10:04 +01:00
parent d5ada6a14b
commit f4cf966167
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/saveload/extended_ver_sl.cpp
View File

@@ -38,9 +38,11 @@
#include "../stdafx.h" #include "../stdafx.h"
#include "../debug.h" #include "../debug.h"
#include "saveload.h" #include "saveload.h"
#include "saveload_buffer.h"
#include "extended_ver_sl.h" #include "extended_ver_sl.h"
#include "../timetable.h" #include "../timetable.h"
#include "../map_func.h" #include "../map_func.h"
#include "../rev.h"
#include <vector> #include <vector>
@@ -52,10 +54,15 @@ bool _sl_is_faked_ext; ///< is this a faked
bool _sl_maybe_springpp; ///< is this possibly a SpringPP savegame? bool _sl_maybe_springpp; ///< is this possibly a SpringPP savegame?
bool _sl_maybe_chillpp; ///< is this possibly a ChillPP v8 savegame? bool _sl_maybe_chillpp; ///< is this possibly a ChillPP v8 savegame?
std::vector<uint32> _sl_xv_discardable_chunk_ids; ///< list of chunks IDs which we can discard if no chunk loader exists std::vector<uint32> _sl_xv_discardable_chunk_ids; ///< list of chunks IDs which we can discard if no chunk loader exists
std::string _sl_xv_version_label; ///< optional SLXI version label
static const uint32 _sl_xv_slxi_chunk_version = 0; ///< current version of SLXI chunk static const uint32 _sl_xv_slxi_chunk_version = 0; ///< current version of SLXI chunk
static void loadVL(const SlxiSubChunkInfo *info, uint32 length);
static uint32 saveVL(const SlxiSubChunkInfo *info, bool dry_run);
const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = { const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = {
{ XSLFI_VERSION_LABEL, XSCF_IGNORABLE_ALL, 1, 1, "version_label", saveVL, loadVL, nullptr },
{ XSLFI_TRACE_RESTRICT, XSCF_NULL, 11, 11, "tracerestrict", nullptr, nullptr, "TRRM,TRRP,TRRS" }, { XSLFI_TRACE_RESTRICT, XSCF_NULL, 11, 11, "tracerestrict", nullptr, nullptr, "TRRM,TRRP,TRRS" },
{ XSLFI_TRACE_RESTRICT_OWNER, XSCF_NULL, 1, 1, "tracerestrict_owner", nullptr, nullptr, nullptr }, { XSLFI_TRACE_RESTRICT_OWNER, XSCF_NULL, 1, 1, "tracerestrict_owner", nullptr, nullptr, nullptr },
{ XSLFI_TRACE_RESTRICT_ORDRCND, XSCF_NULL, 3, 3, "tracerestrict_order_cond", nullptr, nullptr, nullptr }, { XSLFI_TRACE_RESTRICT_ORDRCND, XSCF_NULL, 3, 3, "tracerestrict_order_cond", nullptr, nullptr, nullptr },
@@ -183,6 +190,7 @@ void SlXvResetState()
_sl_maybe_chillpp = false; _sl_maybe_chillpp = false;
_sl_xv_discardable_chunk_ids.clear(); _sl_xv_discardable_chunk_ids.clear();
memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions)); memset(_sl_xv_feature_versions, 0, sizeof(_sl_xv_feature_versions));
_sl_xv_version_label.clear();
} }
/** /**
@@ -591,6 +599,19 @@ static void Load_SLXI()
} }
} }
static void loadVL(const SlxiSubChunkInfo *info, uint32 length)
{
_sl_xv_version_label.resize(length);
ReadBuffer::GetCurrent()->CopyBytes(reinterpret_cast<byte *>(const_cast<char *>(_sl_xv_version_label.c_str())), length);
}
static uint32 saveVL(const SlxiSubChunkInfo *info, bool dry_run)
{
uint32 length = strlen(_openttd_revision);
if (!dry_run) MemoryDumper::GetCurrent()->CopyBytes(reinterpret_cast<const byte *>(_openttd_revision), length);
return length;
}
extern const ChunkHandler _version_ext_chunk_handlers[] = { extern const ChunkHandler _version_ext_chunk_handlers[] = {
{ 'SLXI', Save_SLXI, Load_SLXI, nullptr, Load_SLXI, CH_RIFF | CH_LAST}, { 'SLXI', Save_SLXI, Load_SLXI, nullptr, Load_SLXI, CH_RIFF | CH_LAST},
}; };

1
src/saveload/extended_ver_sl.h
View File

@@ -21,6 +21,7 @@ enum SaveLoadVersion : uint16;
*/ */
enum SlXvFeatureIndex { enum SlXvFeatureIndex {
XSLFI_NULL = 0, ///< Unused value, to indicate that no extended feature test is in use XSLFI_NULL = 0, ///< Unused value, to indicate that no extended feature test is in use
XSLFI_VERSION_LABEL, ///< Version label
XSLFI_TRACE_RESTRICT, ///< Trace restrict XSLFI_TRACE_RESTRICT, ///< Trace restrict
XSLFI_TRACE_RESTRICT_OWNER, ///< Trace restrict: train owner test XSLFI_TRACE_RESTRICT_OWNER, ///< Trace restrict: train owner test
XSLFI_TRACE_RESTRICT_ORDRCND, ///< Trace restrict: slot conditional order XSLFI_TRACE_RESTRICT_ORDRCND, ///< Trace restrict: slot conditional order