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

Saveload: Fix upstream version handling of league table chunks

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-03-07 18:41:23 +00:00
parent 6aa8997eee
commit 57437e7068
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/league_sl.cpp
View File

@@ -10,9 +10,14 @@
#include "saveload.h"
extern SaveLoadVersion _sl_xv_upstream_version;
struct GetLeagueChunkLoadInfo
{
static SaveLoadVersion GetVersion() { return SLV_MULTITRACK_LEVEL_CROSSINGS; }
static SaveLoadVersion GetLoadVersion()
{
return _sl_xv_upstream_version != SL_MIN_VERSION ? _sl_xv_upstream_version : SLV_MULTITRACK_LEVEL_CROSSINGS;
}
};
static const ChunkHandler league_chunk_handlers[] = {

4
src/saveload/saveload.cpp
View File

@@ -2298,8 +2298,10 @@ static void SlSaveChunk(const ChunkHandler &ch)
if (ch.type == CH_UPSTREAM_SAVE) {
SaveLoadVersion old_ver = _sl_version;
_sl_version = MAX_LOAD_SAVEGAME_VERSION;
upstream_sl::SlSaveChunkChunkByID(ch.id);
auto guard = scope_guard([&]() {
_sl_version = old_ver;
});
upstream_sl::SlSaveChunkChunkByID(ch.id);
return;
}

11
src/saveload/saveload.h
View File

@@ -14,6 +14,7 @@
#include "../fileio_type.h"
#include "../fios.h"
#include "../strings_type.h"
#include "../scope.h"
#include <stdarg.h>
#include <vector>
@@ -112,8 +113,10 @@ void SlExecWithSlVersion(SaveLoadVersion use_version, F proc)
extern SaveLoadVersion _sl_version;
SaveLoadVersion old_ver = _sl_version;
_sl_version = use_version;
proc();
auto guard = scope_guard([&]() {
_sl_version = old_ver;
});
proc();
}
namespace upstream_sl {
@@ -129,7 +132,7 @@ namespace upstream_sl {
nullptr,
SlUnreachablePlaceholder,
[]() {
SlExecWithSlVersion(F::GetVersion(), []() {
SlExecWithSlVersion(F::GetLoadVersion(), []() {
SlFixPointerChunkByID(id);
});
},
@@ -140,12 +143,12 @@ namespace upstream_sl {
assert(id == chunk_id);
switch (op) {
case CSLSO_PRE_LOAD:
SlExecWithSlVersion(F::GetVersion(), []() {
SlExecWithSlVersion(F::GetLoadVersion(), []() {
SlLoadChunkByID(id);
});
break;
case CSLSO_PRE_LOADCHECK:
SlExecWithSlVersion(F::GetVersion(), []() {
SlExecWithSlVersion(F::GetLoadVersion(), []() {
SlLoadCheckChunkByID(id);
});
break;