Merge pull request #281 from VacuumBreather/train_speed_adaptation

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h

src/saveload/CMakeLists.txt

@@ -48,6 +48,7 @@ add_files(
     tbtr_template_veh_sl.cpp
     town_sl.cpp
     tracerestrict_sl.cpp
+    train_speed_adaptation.cpp
     tunnel_sl.cpp
     vehicle_sl.cpp
     waypoint_sl.cpp

src/saveload/afterload.cpp

@@ -938,6 +938,10 @@ bool AfterLoadGame()
 		_settings_game.vehicle.train_braking_model = TBM_ORIGINAL;
 	}
 
+	if (SlXvIsFeatureMissing(XSLFI_TRAIN_SPEED_ADAPTATION)) {
+		_settings_game.vehicle.train_speed_adaptation = false;
+	}
+
 	AfterLoadEngines();
 
 	/* Update all vehicles */

src/saveload/extended_ver_sl.cpp

@@ -152,6 +152,7 @@ const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = {
 	{ XSLFI_MORE_HOUSES,            XSCF_NULL,                2,   2, "more_houses",               nullptr, nullptr, nullptr        },
 	{ XSLFI_CUSTOM_TOWN_ZONE,       XSCF_IGNORABLE_UNKNOWN,   1,   1, "custom_town_zone",          nullptr, nullptr, nullptr        },
 	{ XSLFI_STATION_CARGO_HISTORY,  XSCF_NULL,                1,   1, "station_cargo_history",     nullptr, nullptr, nullptr        },
+	{ XSLFI_TRAIN_SPEED_ADAPTATION, XSCF_NULL,                1,   1, "train_speed_adaptation",    nullptr, nullptr, "TSAS"         },
 	{ XSLFI_NULL, XSCF_NULL, 0, 0, nullptr, nullptr, nullptr, nullptr },// This is the end marker
 };
 

src/saveload/extended_ver_sl.h

@@ -106,6 +106,7 @@ enum SlXvFeatureIndex {
 	XSLFI_MORE_HOUSES,                            ///< More house types
 	XSLFI_CUSTOM_TOWN_ZONE,                       ///< Custom town zones
 	XSLFI_STATION_CARGO_HISTORY,                  ///< Station waiting cargo history
+	XSLFI_TRAIN_SPEED_ADAPTATION,                 ///< Train speed adaptation
 
 	XSLFI_RIFF_HEADER_60_BIT,                     ///< Size field in RIFF chunk header is 60 bit
 	XSLFI_HEIGHT_8_BIT,                           ///< Map tile height is 8 bit instead of 4 bit, but savegame version may be before this became true in trunk

src/saveload/saveload.cpp

@@ -288,6 +288,7 @@ extern const ChunkHandler _template_replacement_chunk_handlers[];
 extern const ChunkHandler _template_vehicle_chunk_handlers[];
 extern const ChunkHandler _bridge_signal_chunk_handlers[];
 extern const ChunkHandler _tunnel_chunk_handlers[];
+extern const ChunkHandler _train_speed_adaptation_chunk_handlers[];
 extern const ChunkHandler _debug_chunk_handlers[];
 
 /** Array of all chunks in a savegame, \c nullptr terminated. */
@@ -333,6 +334,7 @@ static const ChunkHandler * const _chunk_handlers[] = {
 	_template_vehicle_chunk_handlers,
 	_bridge_signal_chunk_handlers,
 	_tunnel_chunk_handlers,
+	_train_speed_adaptation_chunk_handlers,
 	_debug_chunk_handlers,
 	nullptr,
 };

src/saveload/train_speed_adaptation.cpp

@@ -0,0 +1,51 @@
+/*
+ * 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 train_speed_adaptation.cpp Code handling saving and loading of data for train speed adaptation */
+
+#include "../stdafx.h"
+#include "../train_speed_adaptation.h"
+#include "saveload.h"
+
+using SignalSpeedType = std::pair<const SignalSpeedKey, SignalSpeedValue>;
+
+static const SaveLoad _train_speed_adaptation_map_desc[] = {
+	SLE_VAR(SignalSpeedType, first.signal_track,           SLE_UINT8),
+	SLE_VAR(SignalSpeedType, first.last_passing_train_dir, SLE_UINT8),
+	SLE_VAR(SignalSpeedType, second.train_speed,           SLE_UINT16),
+	SLE_VAR(SignalSpeedType, second.time_stamp,            SLE_UINT64),
+	SLE_END()
+};
+
+static void Load_TSAS()
+{
+	int index;
+	SignalSpeedType data;
+	while ((index = SlIterateArray()) != -1) {
+		const_cast<SignalSpeedKey &>(data.first).signal_tile = index;
+		SlObject(&data, _train_speed_adaptation_map_desc);
+		_signal_speeds.insert(data);
+	}
+}
+
+static void RealSave_TSAS(SignalSpeedType *data)
+{
+	SlObject(data, _train_speed_adaptation_map_desc);
+}
+
+static void Save_TSAS()
+{
+	for (auto &it : _signal_speeds) {
+		SlSetArrayIndex(it.first.signal_tile);
+		SignalSpeedType *data = &it;
+		SlAutolength((AutolengthProc*) RealSave_TSAS, data);
+	}
+}
+
+extern const ChunkHandler _train_speed_adaptation_chunk_handlers[] = {
+	{ 'TSAS', Save_TSAS, Load_TSAS, nullptr, nullptr, CH_SPARSE_ARRAY | CH_LAST},
+};

src/saveload/vehicle_sl.cpp

@@ -807,6 +807,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt)
 		SLE_CONDNULL(11, SLV_2, SLV_144), // old reserved space
 		SLE_CONDVAR_X(Train, reverse_distance,    SLE_UINT16,         SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_REVERSE_AT_WAYPOINT)),
 		SLE_CONDVAR_X(Train, speed_restriction,   SLE_UINT16,         SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_SPEED_RESTRICTION)),
+		SLE_CONDVAR_X(Train, signal_speed_restriction, SLE_UINT16,    SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_TRAIN_SPEED_ADAPTATION)),
 		SLE_CONDVAR_X(Train, critical_breakdown_count, SLE_UINT8,     SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_IMPROVED_BREAKDOWNS, 2)),
 
 		     SLE_END()