Update to 1.10.0

src/saveload/afterload.cpp

@@ -3116,13 +3116,11 @@ bool AfterLoadGame()
 				if (IsDock(t) || IsOilRig(t)) Station::GetByTile(t)->ship_station.Add(t);
 			}
 		}
-
-		/* Scan for docking tiles */
-		for (Station *st : Station::Iterate()) {
-			if (st->ship_station.tile != INVALID_TILE) UpdateStationDockingTiles(st);
-		}
 	}
 
+	/* Update station docking tiles. */
+	AfterLoadScanDockingTiles();
+
 	/* Compute station catchment areas. This is needed here in case UpdateStationAcceptance is called below. */
 	Station::RecomputeCatchmentForAll();
 

src/saveload/oldloader_sl.cpp

@@ -716,7 +716,7 @@ static const OldChunks station_chunk[] = {
 	OCL_NULL( 4 ), ///< bus/lorry tile
 	OCL_SVAR(   OC_TILE, Station, train_station.tile ),
 	OCL_SVAR(   OC_TILE, Station, airport.tile ),
-	OCL_NULL( 4 ), ///< dock tile
+	OCL_NULL( 2 ), ///< dock tile
 	OCL_SVAR( OC_FILE_U8 | OC_VAR_U16, Station, train_station.w ),
 
 	OCL_NULL( 1 ),         ///< sort-index, no longer in use

src/saveload/saveload_internal.h

@@ -29,6 +29,7 @@ void AfterLoadVehicles(bool part_of_load);
 void FixupTrainLengths();
 void AfterLoadStations();
 void AfterLoadRoadStops();
+void AfterLoadScanDockingTiles();
 void ResetLabelMaps();
 void AfterLoadLabelMaps();
 void AfterLoadStoryBook();

src/saveload/station_sl.cpp

@@ -141,6 +141,17 @@ void AfterLoadRoadStops()
 	}
 }
 
+/**
+ * (Re)scan for station docking tiles after loading a savegame.
+ */
+void AfterLoadScanDockingTiles()
+{
+	/* Scan for docking tiles */
+	for (Station *st : Station::Iterate()) {
+		if (st->ship_station.tile != INVALID_TILE) UpdateStationDockingTiles(st);
+	}
+}
+
 static const SaveLoad _roadstop_desc[] = {
 	SLE_VAR(RoadStop, xy,           SLE_UINT32),
 	SLE_CONDNULL(1, SL_MIN_VERSION, SLV_45),