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

Saveload: Log changes in SlExecWithSlVersion

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-02-21 19:40:48 +00:00
parent 6dec7a5b35
commit dadbad2bfc
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sl/saveload.cpp
View File

@@ -4204,6 +4204,20 @@ void SlUnreachablePlaceholder()
NOT_REACHED(); NOT_REACHED();
} }
SaveLoadVersion SlExecWithSlVersionStart(SaveLoadVersion use_version)
{
DEBUG(sl, 4, "SlExecWithSlVersion start: %u", use_version);
SaveLoadVersion old_ver = _sl_version;
_sl_version = use_version;
return old_ver;
}
void SlExecWithSlVersionEnd(SaveLoadVersion old_version)
{
DEBUG(sl, 4, "SlExecWithSlVersion end");
_sl_version = old_version;
}
const char *ChunkIDDumper::operator()(uint32_t id) const char *ChunkIDDumper::operator()(uint32_t id)
{ {
seprintf(this->buffer, lastof(this->buffer), "%c%c%c%c", id >> 24, id >> 16, id >> 8, id); seprintf(this->buffer, lastof(this->buffer), "%c%c%c%c", id >> 24, id >> 16, id >> 8, id);

9
src/sl/saveload.h
View File

@@ -135,11 +135,12 @@ private:
template <typename F> template <typename F>
void SlExecWithSlVersion(SaveLoadVersion use_version, F proc) void SlExecWithSlVersion(SaveLoadVersion use_version, F proc)
{ {
extern SaveLoadVersion _sl_version; extern SaveLoadVersion SlExecWithSlVersionStart(SaveLoadVersion use_version);
SaveLoadVersion old_ver = _sl_version; extern void SlExecWithSlVersionEnd(SaveLoadVersion old_version);
_sl_version = use_version;
SaveLoadVersion old_ver = SlExecWithSlVersionStart(use_version);
auto guard = scope_guard([&]() { auto guard = scope_guard([&]() {
_sl_version = old_ver; SlExecWithSlVersionEnd(old_ver);
}); });
proc(); proc();
} }