diff options
author | rubidium <rubidium@openttd.org> | 2009-05-22 22:22:46 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-22 22:22:46 +0000 |
commit | 80e94b9bb15f846189e98f1f457afe2b96ba2b58 (patch) | |
tree | b623c3e1cc75771986452340a138bd3ac60d4cbc /src/saveload/afterload.cpp | |
parent | 7a37220881c995f317bf5bd0f3077fa6c9e9d098 (diff) | |
download | openttd-80e94b9bb15f846189e98f1f457afe2b96ba2b58.tar.xz |
(svn r16391) -Codechange: use Train instead of Vehicle where appropriate.
Diffstat (limited to 'src/saveload/afterload.cpp')
-rw-r--r-- | src/saveload/afterload.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 088aef84f..3e0309ac1 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -912,7 +912,7 @@ bool AfterLoadGame() continue; } if (v->type == VEH_TRAIN) { - v->u.rail.track = TRACK_BIT_WORMHOLE; + ((Train *)v)->u.rail.track = TRACK_BIT_WORMHOLE; } else { ((RoadVehicle *)v)->state = RVSB_WORMHOLE; } @@ -928,7 +928,7 @@ bool AfterLoadGame() if (v->type == VEH_TRAIN) { RailType rt = RailVehInfo(v->engine_type)->railtype; - v->u.rail.railtype = rt; + ((Train *)v)->u.rail.railtype = rt; if (rt == RAILTYPE_ELECTRIC) min_rail = RAILTYPE_RAIL; } } @@ -964,7 +964,7 @@ bool AfterLoadGame() } FOR_ALL_VEHICLES(v) { - if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) TrainConsistChanged(v, true); + if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) TrainConsistChanged((Train *)v, true); } } @@ -1700,9 +1700,10 @@ bool AfterLoadGame() /* Reserve all tracks trains are currently on. */ if (CheckSavegameVersion(101)) { - Vehicle *v; - FOR_ALL_VEHICLES(v) { - if (v->type == VEH_TRAIN) { + Vehicle *u; + FOR_ALL_VEHICLES(u) { + if (u->type == VEH_TRAIN) { + Train *v = (Train *)u; if ((v->u.rail.track & TRACK_BIT_WORMHOLE) == TRACK_BIT_WORMHOLE) { TryReserveRailTrack(v->tile, DiagDirToDiagTrack(GetTunnelBridgeDirection(v->tile))); } else if ((v->u.rail.track & TRACK_BIT_MASK) != TRACK_BIT_NONE) { |