Add: store headers for most savegame chunks

When a header is added, the chunk changes from CH_ARRAY type to
CH_TABLE type.

1 files changed, 16 insertions, 10 deletions

diff --git a/src/saveload/engine_sl.cpp b/src/saveload/engine_sl.cpp
index 12670449e..109d90434 100644
--- a/src/saveload/engine_sl.cpp
+++ b/src/saveload/engine_sl.cpp
@@ -8,6 +8,10 @@
 /** @file engine_sl.cpp Code handling saving and loading of engines */
 
 #include "../stdafx.h"
+
+#include "saveload.h"
+#include "compat/engine_sl_compat.h"
+
 #include "saveload_internal.h"
 #include "../engine_base.h"
 #include "../string_func.h"
@@ -28,20 +32,14 @@ static const SaveLoad _engine_desc[] = {
 	     SLE_VAR(Engine, duration_phase_1,    SLE_UINT16),
 	     SLE_VAR(Engine, duration_phase_2,    SLE_UINT16),
 	     SLE_VAR(Engine, duration_phase_3,    SLE_UINT16),
-
-	SLE_CONDNULL(1,                                                        SL_MIN_VERSION, SLV_121),
 	     SLE_VAR(Engine, flags,               SLE_UINT8),
-	SLE_CONDNULL(1,                                                        SL_MIN_VERSION, SLV_179), // old preview_company_rank
 	 SLE_CONDVAR(Engine, preview_asked,       SLE_UINT16,                SLV_179, SL_MAX_VERSION),
 	 SLE_CONDVAR(Engine, preview_company,     SLE_UINT8,                 SLV_179, SL_MAX_VERSION),
 	     SLE_VAR(Engine, preview_wait,        SLE_UINT8),
-	SLE_CONDNULL(1,                                                        SL_MIN_VERSION,  SLV_45),
 	 SLE_CONDVAR(Engine, company_avail,       SLE_FILE_U8  | SLE_VAR_U16,  SL_MIN_VERSION, SLV_104),
 	 SLE_CONDVAR(Engine, company_avail,       SLE_UINT16,                SLV_104, SL_MAX_VERSION),
 	 SLE_CONDVAR(Engine, company_hidden,      SLE_UINT16,                SLV_193, SL_MAX_VERSION),
 	SLE_CONDSSTR(Engine, name,                SLE_STR,                    SLV_84, SL_MAX_VERSION),
-
-	SLE_CONDNULL(16,                                                       SLV_2, SLV_144), // old reserved space
 };
 
 static std::vector<Engine*> _temp_engine;
@@ -84,6 +82,8 @@ Engine *GetTempDataEngine(EngineID index)
 
 static void Save_ENGN()
 {
+	SlTableHeader(_engine_desc);
+
 	for (Engine *e : Engine::Iterate()) {
 		SlSetArrayIndex(e->index);
 		SlObject(e, _engine_desc);
@@ -92,13 +92,15 @@ static void Save_ENGN()
 
 static void Load_ENGN()
 {
+	const std::vector<SaveLoad> slt = SlCompatTableHeader(_engine_desc, _engine_sl_compat);
+
 	/* As engine data is loaded before engines are initialized we need to load
 	 * this information into a temporary array. This is then copied into the
 	 * engine pool after processing NewGRFs by CopyTempEngineData(). */
 	int index;
 	while ((index = SlIterateArray()) != -1) {
 		Engine *e = GetTempDataEngine(index);
-		SlObject(e, _engine_desc);
+		SlObject(e, slt);
 
 		if (IsSavegameVersionBefore(SLV_179)) {
 			/* preview_company_rank was replaced with preview_company and preview_asked.
@@ -175,6 +177,8 @@ static const SaveLoad _engine_id_mapping_desc[] = {
 
 static void Save_EIDS()
 {
+	SlTableHeader(_engine_id_mapping_desc);
+
 	uint index = 0;
 	for (EngineIDMapping &eid : _engine_mngr) {
 		SlSetArrayIndex(index);
@@ -185,17 +189,19 @@ static void Save_EIDS()
 
 static void Load_EIDS()
 {
+	const std::vector<SaveLoad> slt = SlCompatTableHeader(_engine_id_mapping_desc, _engine_id_mapping_sl_compat);
+
 	_engine_mngr.clear();
 
 	while (SlIterateArray() != -1) {
 		EngineIDMapping *eid = &_engine_mngr.emplace_back();
-		SlObject(eid, _engine_id_mapping_desc);
+		SlObject(eid, slt);
 	}
 }
 
 static const ChunkHandler engine_chunk_handlers[] = {
-	{ 'EIDS', Save_EIDS, Load_EIDS, nullptr, nullptr, CH_ARRAY },
-	{ 'ENGN', Save_ENGN, Load_ENGN, nullptr, nullptr, CH_ARRAY },
+	{ 'EIDS', Save_EIDS, Load_EIDS, nullptr, nullptr, CH_TABLE },
+	{ 'ENGN', Save_ENGN, Load_ENGN, nullptr, nullptr, CH_TABLE },
 	{ 'ENGS', nullptr,   Load_ENGS, nullptr, nullptr, CH_READONLY  },
 };