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/pbs.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/pbs.cpp')
| -rw-r--r-- | src/pbs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pbs.cpp b/src/pbs.cpp index 26a586516..0554b2ecc 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -236,7 +236,7 @@ static Vehicle *FindTrainOnTrackEnum(Vehicle *v, void *data) if (v->type != VEH_TRAIN || (v->vehstatus & VS_CRASHED)) return NULL; Train *t = (Train *)v; - if (HasBit((TrackBits)t->u.rail.track, TrackdirToTrack(info->res.trackdir))) { + if (HasBit((TrackBits)t->track, TrackdirToTrack(info->res.trackdir))) { t = t->First(); /* ALWAYS return the lowest ID (anti-desync!) */ @@ -264,7 +264,7 @@ PBSTileInfo FollowTrainReservation(const Train *v, bool *train_on_res) if (IsRailDepotTile(tile) && !GetRailDepotReservation(tile)) return PBSTileInfo(tile, trackdir, false); FindTrainOnTrackInfo ftoti; - ftoti.res = FollowReservation(v->owner, GetRailTypeInfo(v->u.rail.railtype)->compatible_railtypes, tile, trackdir); + ftoti.res = FollowReservation(v->owner, GetRailTypeInfo(v->railtype)->compatible_railtypes, tile, trackdir); ftoti.res.okay = IsSafeWaitingPosition(v, ftoti.res.tile, ftoti.res.trackdir, true, _settings_game.pf.forbid_90_deg); if (train_on_res != NULL) *train_on_res = HasVehicleOnPos(ftoti.res.tile, &ftoti, FindTrainOnTrackEnum); return ftoti.res; @@ -333,7 +333,7 @@ bool IsSafeWaitingPosition(const Train *v, TileIndex tile, Trackdir trackdir, bo } /* Check next tile. For perfomance reasons, we check for 90 degree turns ourself. */ - CFollowTrackRail ft(v, GetRailTypeInfo(v->u.rail.railtype)->compatible_railtypes); + CFollowTrackRail ft(v, GetRailTypeInfo(v->railtype)->compatible_railtypes); /* End of track? */ if (!ft.Follow(tile, trackdir)) { @@ -376,7 +376,7 @@ bool IsWaitingPositionFree(const Train *v, TileIndex tile, Trackdir trackdir, bo if (IsTileType(tile, MP_RAILWAY) && HasSignalOnTrackdir(tile, trackdir) && !IsPbsSignal(GetSignalType(tile, track))) return true; /* Check the next tile, if it's a PBS signal, it has to be free as well. */ - CFollowTrackRail ft(v, GetRailTypeInfo(v->u.rail.railtype)->compatible_railtypes); + CFollowTrackRail ft(v, GetRailTypeInfo(v->railtype)->compatible_railtypes); if (!ft.Follow(tile, trackdir)) return true; |