Fix #6507: Don't try to load invalid depots from older savegames

OpenTTD · May 28, 2019 · 5eb7d49 · 5eb7d49
1 parent 69c0332
commit 5eb7d49
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
@@ -2305,6 +2305,14 @@ bool AfterLoadGame()
 	if (IsSavegameVersionBefore(SLV_128)) {
 		const Depot *d;
 		FOR_ALL_DEPOTS(d) {
+			/* At some point, invalid depots were saved into the game (possibly those removed in the past?)
+			 * Remove them here, so they don't cause issues further down the line */
+			if (!IsDepotTile(d->xy)) {
+				DEBUG(sl, 0, "Removing invalid depot %d at %d, %d", d->index, TileX(d->xy), TileY(d->xy));
+				delete d;
+				d = nullptr;
+				continue;
+			}
 			_m[d->xy].m2 = d->index;
 			if (IsTileType(d->xy, MP_WATER)) _m[GetOtherShipDepotTile(d->xy)].m2 = d->index;
 		}