cpp/openttd-patchpack/source Changeset - r26794:e2431112c56e

Changeset - r26794:e2431112c56e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Tyler Trahan - 17 months ago 2023-01-23 17:08:19
tyler@tylertrahan.com

Fix #10395: When loading old saves, don't forcibly bar level crossings (#10400)

1 file changed with 2 insertions and 9 deletions:

src/saveload/afterload.cpp

0 comments (0 inline, 0 general)

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -1982,19 +1982,12 @@ bool AfterLoadGame() @@
 	if (IsSavegameVersionBefore(SLV_101)) {
 		for (const Train *t : Train::Iterate()) {
 			if (t->First() == t) t->ReserveTrackUnderConsist();
+		}
+	}
 	if (IsSavegameVersionBefore(SLV_102)) {
 		for (TileIndex t = 0; t < map_size; t++) {
 			/* Now all crossings should be in correct state */
 			if (IsLevelCrossingTile(t)) UpdateLevelCrossing(t, false);
+		}
+	}
 	if (IsSavegameVersionBefore(SLV_103)) {
 		/* Non-town-owned roads now store the closest town */
 		UpdateNearestTownForRoadTiles(false);
 		/* signs with invalid owner left from older savegames */
 		for (Sign *si : Sign::Iterate()) {
@@ @@ -3193,15 +3186,15 @@ bool AfterLoadGame() @@
 					u->UpdatePosition();
+				}
 				RoadVehLeaveDepot(rv, false);
+			}
+		}
 		/* Refresh all level crossings to bar adjacent crossing tiles. */
+		/* Refresh all level crossings to bar adjacent crossing tiles, if needed. */
 		for (TileIndex tile = 0; tile < Map::Size(); tile++) {
-			if (IsLevelCrossingTile(tile)) UpdateLevelCrossing(tile, false, true);
 			if (IsLevelCrossingTile(tile)) UpdateLevelCrossing(tile, false);
+		}
+	}
 	/* Compute station catchment areas. This is needed here in case UpdateStationAcceptance is called below. */
 	Station::RecomputeCatchmentForAll();

0 comments (0 inline, 0 general)