diff options
author | rubidium <rubidium@openttd.org> | 2009-05-22 22:33:05 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-22 22:33:05 +0000 |
commit | c4b627af422075ce4a0e1026c52f871dd3f146c0 (patch) | |
tree | febaea249dc307b4b619aeff09e353677bbbcd84 /src/saveload/afterload.cpp | |
parent | 80e94b9bb15f846189e98f1f457afe2b96ba2b58 (diff) | |
download | openttd-c4b627af422075ce4a0e1026c52f871dd3f146c0.tar.xz |
(svn r16392) -Codechange: move some variables (the ones that aren't caches) from VehicleRail to Train
Diffstat (limited to 'src/saveload/afterload.cpp')
-rw-r--r-- | src/saveload/afterload.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 3e0309ac1..bc3aa436a 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -912,7 +912,7 @@ bool AfterLoadGame() continue; } if (v->type == VEH_TRAIN) { - ((Train *)v)->u.rail.track = TRACK_BIT_WORMHOLE; + ((Train *)v)->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; - ((Train *)v)->u.rail.railtype = rt; + ((Train *)v)->railtype = rt; if (rt == RAILTYPE_ELECTRIC) min_rail = RAILTYPE_RAIL; } } @@ -1704,10 +1704,10 @@ bool AfterLoadGame() FOR_ALL_VEHICLES(u) { if (u->type == VEH_TRAIN) { Train *v = (Train *)u; - if ((v->u.rail.track & TRACK_BIT_WORMHOLE) == TRACK_BIT_WORMHOLE) { + if ((v->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) { - TryReserveRailTrack(v->tile, TrackBitsToTrack(v->u.rail.track)); + } else if ((v->track & TRACK_BIT_MASK) != TRACK_BIT_NONE) { + TryReserveRailTrack(v->tile, TrackBitsToTrack(v->track)); } } } |