Add support for loading trunk savegames versions 293 - 299 (12.0)

Use modified upstream saveload implementation for these versions Re-arrange headers to support multiple saveload implementations
2021-11-01 18:33:39 +00:00
parent c6f0559ad4
commit d1f1a6942a
88 changed files with 11154 additions and 511 deletions
--- a/src/saveload/upstream/misc_sl.cpp
+++ b/src/saveload/upstream/misc_sl.cpp
@@ -0,0 +1,138 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file misc_sl.cpp Saving and loading of things that didn't fit anywhere else */
+
+#include "../../stdafx.h"
+
+#include "saveload.h"
+#include "compat/misc_sl_compat.h"
+
+#include "../../date_func.h"
+#include "../../zoom_func.h"
+#include "../../window_gui.h"
+#include "../../window_func.h"
+#include "../../viewport_func.h"
+#include "../../gfx_func.h"
+#include "../../core/random_func.hpp"
+#include "../../fios.h"
+
+#include "../../safeguards.h"
+
+extern TileIndex _cur_tileloop_tile;
+extern uint16 _disaster_delay;
+extern byte _trees_tick_ctr;
+
+/* Keep track of current game position */
+extern int _saved_scrollpos_x;
+extern int _saved_scrollpos_y;
+extern ZoomLevel _saved_scrollpos_zoom;
+
+extern byte _age_cargo_skip_counter; ///< Skip aging of cargo? Used before savegame version 162.
+
+namespace upstream_sl {
+
+static const SaveLoad _date_desc[] = {
+	SLEG_CONDVAR("date",                   _date,                   SLE_FILE_U16 | SLE_VAR_I32,  SL_MIN_VERSION,  SLV_31),
+	SLEG_CONDVAR("date",                   _date,                   SLE_INT32,                  SLV_31, SL_MAX_VERSION),
+	    SLEG_VAR("date_fract",             _date_fract,             SLE_UINT16),
+	    SLEG_VAR("tick_counter",         _tick_counter,           SLE_UINT16),
+	SLEG_CONDVAR("age_cargo_skip_counter", _age_cargo_skip_counter, SLE_UINT8,                   SL_MIN_VERSION, SLV_162),
+	SLEG_CONDVAR("cur_tileloop_tile",      _cur_tileloop_tile,      SLE_FILE_U16 | SLE_VAR_U32,  SL_MIN_VERSION, SLV_6),
+	SLEG_CONDVAR("cur_tileloop_tile",      _cur_tileloop_tile,      SLE_UINT32,                  SLV_6, SL_MAX_VERSION),
+	    SLEG_VAR("next_disaster_start",         _disaster_delay,         SLE_UINT16),
+	    SLEG_VAR("random_state[0]",        _random.state[0],        SLE_UINT32),
+	    SLEG_VAR("random_state[1]",        _random.state[1],        SLE_UINT32),
+	    SLEG_VAR("company_tick_counter", _cur_company_tick_index, SLE_FILE_U8  | SLE_VAR_U32),
+	SLEG_CONDVAR("next_competitor_start",  _next_competitor_start,  SLE_FILE_U16 | SLE_VAR_U32,  SL_MIN_VERSION, SLV_109),
+	SLEG_CONDVAR("next_competitor_start",  _next_competitor_start,  SLE_UINT32,                SLV_109, SL_MAX_VERSION),
+	    SLEG_VAR("trees_tick_counter",     _trees_tick_ctr,         SLE_UINT8),
+	SLEG_CONDVAR("pause_mode",             _pause_mode,             SLE_UINT8,                   SLV_4, SL_MAX_VERSION),
+};
+
+static const SaveLoad _date_check_desc[] = {
+	SLEG_CONDVAR("date", _load_check_data.current_date,  SLE_FILE_U16 | SLE_VAR_I32,  SL_MIN_VERSION,  SLV_31),
+	SLEG_CONDVAR("date", _load_check_data.current_date,  SLE_INT32,                  SLV_31, SL_MAX_VERSION),
+};
+
+/* Save load date related variables as well as persistent tick counters
+ * XXX: currently some unrelated stuff is just put here */
+struct DATEChunkHandler : ChunkHandler {
+	DATEChunkHandler() : ChunkHandler('DATE', CH_TABLE) {}
+
+	void Save() const override
+	{
+		SlTableHeader(_date_desc);
+
+		SlSetArrayIndex(0);
+		SlGlobList(_date_desc);
+	}
+
+	void LoadCommon(const SaveLoadTable &slt, const SaveLoadCompatTable &slct) const
+	{
+		const std::vector<SaveLoad> oslt = SlCompatTableHeader(slt, slct);
+
+		if (!IsSavegameVersionBefore(SLV_RIFF_TO_ARRAY) && SlIterateArray() == -1) return;
+		SlGlobList(oslt);
+		if (!IsSavegameVersionBefore(SLV_RIFF_TO_ARRAY) && SlIterateArray() != -1) SlErrorCorrupt("Too many DATE entries");
+	}
+
+	void Load() const override
+	{
+		this->LoadCommon(_date_desc, _date_sl_compat);
+	}
+
+
+	void LoadCheck(size_t) const override
+	{
+		this->LoadCommon(_date_check_desc, _date_check_sl_compat);
+
+		if (IsSavegameVersionBefore(SLV_31)) {
+			_load_check_data.current_date += DAYS_TILL_ORIGINAL_BASE_YEAR;
+		}
+	}
+};
+
+static const SaveLoad _view_desc[] = {
+	SLEG_CONDVAR("x",    _saved_scrollpos_x,    SLE_FILE_I16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_6),
+	SLEG_CONDVAR("x",    _saved_scrollpos_x,    SLE_INT32,                  SLV_6, SL_MAX_VERSION),
+	SLEG_CONDVAR("y",    _saved_scrollpos_y,    SLE_FILE_I16 | SLE_VAR_I32, SL_MIN_VERSION, SLV_6),
+	SLEG_CONDVAR("y",    _saved_scrollpos_y,    SLE_INT32,                  SLV_6, SL_MAX_VERSION),
+	    SLEG_VAR("zoom", _saved_scrollpos_zoom, SLE_UINT8),
+};
+
+struct VIEWChunkHandler : ChunkHandler {
+	VIEWChunkHandler() : ChunkHandler('VIEW', CH_TABLE) {}
+
+	void Save() const override
+	{
+		SlTableHeader(_view_desc);
+
+		SlSetArrayIndex(0);
+		SlGlobList(_view_desc);
+	}
+
+	void Load() const override
+	{
+		const std::vector<SaveLoad> slt = SlCompatTableHeader(_view_desc, _view_sl_compat);
+
+		if (!IsSavegameVersionBefore(SLV_RIFF_TO_ARRAY) && SlIterateArray() == -1) return;
+		SlGlobList(slt);
+		if (!IsSavegameVersionBefore(SLV_RIFF_TO_ARRAY) && SlIterateArray() != -1) SlErrorCorrupt("Too many DATE entries");
+	}
+};
+
+static const DATEChunkHandler DATE;
+static const VIEWChunkHandler VIEW;
+static const ChunkHandlerRef misc_chunk_handlers[] = {
+	DATE,
+	VIEW,
+};
+
+extern const ChunkHandlerTable _misc_chunk_handlers(misc_chunk_handlers);
+
+}