Merge branch 'signal_tunnels_bridges' into jgrpp

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h

src/saveload/afterload.cpp

@@ -3245,13 +3245,28 @@ bool AfterLoadGame()
 		/* set the semaphore bit to match what it would have been in v1 */
 		/* clear the PBS bit, update the end signal state */
 		for (TileIndex t = 0; t < map_size; t++) {
-			if (IsTileType(t, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL && HasWormholeSignals(t)) {
+			if (IsTileType(t, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL && IsTunnelBridgeWithSignalSimulation(t)) {
 				SetTunnelBridgeSemaphore(t, _cur_year < _settings_client.gui.semaphore_build_before);
 				SetTunnelBridgePBS(t, false);
 				UpdateSignalsOnSegment(t, INVALID_DIAGDIR, GetTileOwner(t));
 			}
 		}
 	}
+	if (SlXvIsFeaturePresent(XSLFI_SIG_TUNNEL_BRIDGE, 1, 2)) {
+		/* red/green signal state bit for tunnel entrances moved
+		 * to no longer re-use signalled tunnel exit bit
+		 */
+		for (TileIndex t = 0; t < map_size; t++) {
+			if (IsTileType(t, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL && IsTunnelBridgeWithSignalSimulation(t)) {
+				if (HasBit(_m[t].m5, 5)) {
+					/* signalled tunnel entrance */
+					SignalState state = HasBit(_m[t].m5, 6) ? SIGNAL_STATE_RED : SIGNAL_STATE_GREEN;
+					ClrBit(_m[t].m5, 6);
+					SetTunnelBridgeSignalState(t, state);
+				}
+			}
+		}
+	}
 
 	/* Station acceptance is some kind of cache */
 	if (IsSavegameVersionBefore(127)) {

src/saveload/bridge_signal_sl.cpp

@@ -0,0 +1,58 @@
+/* $Id$ */
+
+/*
+ * 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 bridge_signal_sl.cpp Code handling saving and loading of data for signal on bridges */
+
+#include "../stdafx.h"
+#include "../bridge_signal_map.h"
+#include "saveload.h"
+#include <vector>
+
+/** stub save header struct */
+struct LongBridgeSignalStorageStub {
+	uint32 length;
+};
+
+static const SaveLoad _long_bridge_signal_storage_stub_desc[] = {
+	SLE_VAR(LongBridgeSignalStorageStub, length, SLE_UINT32),
+	SLE_END()
+};
+
+static void Load_XBSS()
+{
+	int index;
+	LongBridgeSignalStorageStub stub;
+	while ((index = SlIterateArray()) != -1) {
+		LongBridgeSignalStorage &lbss = _long_bridge_signal_sim_map[index];
+		SlObject(&stub, _long_bridge_signal_storage_stub_desc);
+		lbss.signal_red_bits.resize(stub.length);
+		SlArray(&(lbss.signal_red_bits[0]), stub.length, SLE_UINT64);
+	}
+}
+
+static void RealSave_XBSS(const LongBridgeSignalStorage *lbss)
+{
+	LongBridgeSignalStorageStub stub;
+	stub.length = lbss->signal_red_bits.size();
+	SlObject(&stub, _long_bridge_signal_storage_stub_desc);
+	SlArray(const_cast<uint64*>(&(lbss->signal_red_bits[0])), stub.length, SLE_UINT64);
+}
+
+static void Save_XBSS()
+{
+	for (const auto &it : _long_bridge_signal_sim_map) {
+		const LongBridgeSignalStorage &lbss = it.second;
+		SlSetArrayIndex(it.first);
+		SlAutolength((AutolengthProc*) RealSave_XBSS, const_cast<LongBridgeSignalStorage*>(&lbss));
+	}
+}
+
+extern const ChunkHandler _bridge_signal_chunk_handlers[] = {
+	{ 'XBSS', Save_XBSS, Load_XBSS, NULL, NULL, CH_SPARSE_ARRAY | CH_LAST},
+};

src/saveload/extended_ver_sl.cpp

@@ -54,7 +54,7 @@ const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = {
 	{ XSLFI_DEPARTURE_BOARDS,       XSCF_IGNORABLE_UNKNOWN,   1,   1, "departure_boards",          NULL, NULL, NULL        },
 	{ XSLFI_TIMETABLES_START_TICKS, XSCF_NULL,                2,   2, "timetable_start_ticks",     NULL, NULL, NULL        },
 	{ XSLFI_TOWN_CARGO_ADJ,         XSCF_IGNORABLE_UNKNOWN,   1,   1, "town_cargo_adj",            NULL, NULL, NULL        },
-	{ XSLFI_SIG_TUNNEL_BRIDGE,      XSCF_NULL,                2,   2, "signal_tunnel_bridge",      NULL, NULL, NULL        },
+	{ XSLFI_SIG_TUNNEL_BRIDGE,      XSCF_NULL,                4,   4, "signal_tunnel_bridge",      NULL, NULL, "XBSS"      },
 	{ XSLFI_IMPROVED_BREAKDOWNS,    XSCF_NULL,                4,   4, "improved_breakdowns",       NULL, NULL, NULL        },
 	{ XSLFI_TT_WAIT_IN_DEPOT,       XSCF_NULL,                1,   1, "tt_wait_in_depot",          NULL, NULL, NULL        },
 	{ XSLFI_AUTO_TIMETABLE,         XSCF_NULL,                4,   4, "auto_timetables",           NULL, NULL, NULL        },

src/saveload/saveload.cpp

@@ -464,6 +464,7 @@ extern const ChunkHandler _signal_chunk_handlers[];
 extern const ChunkHandler _plan_chunk_handlers[];
 extern const ChunkHandler _template_replacement_chunk_handlers[];
 extern const ChunkHandler _template_vehicle_chunk_handlers[];
+extern const ChunkHandler _bridge_signal_chunk_handlers[];
 
 /** Array of all chunks in a savegame, \c NULL terminated. */
 static const ChunkHandler * const _chunk_handlers[] = {
@@ -506,6 +507,7 @@ static const ChunkHandler * const _chunk_handlers[] = {
 	_plan_chunk_handlers,
 	_template_replacement_chunk_handlers,
 	_template_vehicle_chunk_handlers,
+	_bridge_signal_chunk_handlers,
 	NULL,
 };