dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16392) -Codechange: move some variables (the ones that aren't caches) from VehicleRail to Train

Browse Source
This commit is contained in:
rubidium
2009-05-22 22:33:05 +00:00
parent 1324100d69
commit 6350648a6c
24 changed files with 265 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/saveload/afterload.cpp
View File

@@ -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));
}
}
}