cpp/openttd-patchpack/source Changeset - r10848:b7a73f1f079e

Changeset - r10848:b7a73f1f079e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 16 years ago 2009-01-21 00:14:08
smatz@openttd.org

(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.

1 file changed with 48 insertions and 19 deletions:

src/saveload/afterload.cpp

0 comments (0 inline, 0 general)

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -289,6 +289,51 @@ void CDECL HandleSavegameLoadCrash(int u @@
 	ShowInfo(buffer);
+}
 /**
  * Tries to change owner of this rail tile to a valid owner. In very old versions it could happen that
  * a rail track had an invalid owner. When conversion isn't possible, track is removed.
  * @param t tile to update
  */
 static void FixOwnerOfRailTrack(TileIndex t)
+{
 	assert(!IsValidCompanyID(GetTileOwner(t)) && (IsLevelCrossingTile(t) || IsPlainRailTile(t)));
 	/* remove leftover rail piece from crossing (from very old savegames) */
 	Vehicle *v = NULL, *w;
 	FOR_ALL_VEHICLES(w) {
 		if (w->type == VEH_TRAIN && w->tile == t) {
 			v = w;
 			break;
+		}
+	}
 	if (v != NULL) {
 		/* when there is a train on crossing (it could happen in TTD), set owner of crossing to train owner */
 		SetTileOwner(t, v->owner);
 		return;
+	}
 	/* try to find any connected rail */
 	for (DiagDirection dd = DIAGDIR_BEGIN; dd < DIAGDIR_END; dd++) {
 		TileIndex tt = t + TileOffsByDiagDir(dd);
 		if (GetTileTrackStatus(t, TRANSPORT_RAIL, 0, dd) != 0 &&
 				GetTileTrackStatus(tt, TRANSPORT_RAIL, 0, ReverseDiagDir(dd)) != 0 &&
 				IsValidCompanyID(GetTileOwner(tt))) {
 			SetTileOwner(t, GetTileOwner(tt));
 			return;
+		}
+	}
 	if (IsLevelCrossingTile(t)) {
 		/* else change the crossing to normal road (road vehicles won't care) */
 		MakeRoadNormal(t, GetCrossingRoadBits(t), GetRoadTypes(t), GetTownIndex(t),
 		GetRoadOwner(t, ROADTYPE_ROAD), GetRoadOwner(t, ROADTYPE_TRAM), GetRoadOwner(t, ROADTYPE_HWAY));
 		return;
+	}
 	/* if it's not a crossing, make it clean land */
 	MakeClear(t, CLEAR_GRASS, 0);
+}
 bool AfterLoadGame()
+{
@@ @@ -1449,26 +1494,10 @@ bool AfterLoadGame() @@
 					if (o < MAX_COMPANIES && !IsValidCompanyID(o)) SetRoadOwner(t, rt, OWNER_NONE);
+				}
 				if (IsLevelCrossing(t)) {
 					Owner o = GetTileOwner(t);
 					if (!IsValidCompanyID(o)) {
 						/* remove leftover rail piece from crossing (from very old savegames) */
 						Vehicle *v = NULL, *w;
 						FOR_ALL_VEHICLES(w) {
 							if (w->type == VEH_TRAIN && w->tile == t) {
 								v = w;
 								break;
+							}
+						}
 						if (v != NULL) {
 							/* when there is a train on crossing (it could happen in TTD), set owner of crossing to train owner */
 							SetTileOwner(t, v->owner);
 						} else {
 							/* else change the crossing to normal road (road vehicles won't care) */
 							MakeRoadNormal(t, GetCrossingRoadBits(t), GetRoadTypes(t), GetTownIndex(t),
 								GetRoadOwner(t, ROADTYPE_ROAD), GetRoadOwner(t, ROADTYPE_TRAM), GetRoadOwner(t, ROADTYPE_HWAY));
+						}
+					}
 					if (!IsValidCompanyID(GetTileOwner(t))) FixOwnerOfRailTrack(t);
+				}
 			} else if (IsTileType(t, MP_RAILWAY) && IsPlainRailTile(t)) {
 				if (!IsValidCompanyID(GetTileOwner(t))) FixOwnerOfRailTrack(t);
+			}
+		}

0 comments (0 inline, 0 general)