gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-11 18:10:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12057) -Fix: slowdown train when approaching 90deg turn when 90deg turns are forbidden

Browse Source
This commit is contained in:
smatz 2008-02-04 15:56:39 +00:00
parent 2a2aa1d22a
commit 04ef38ec60
1 changed files with 7 additions and 1 deletions

8
src/train_cmd.cpp
View File

@ -3462,9 +3462,15 @@ static bool TrainCheckIfLineEnds(Vehicle *v)
/* We are sure the train is not entering a depot, it is detected above */ /* We are sure the train is not entering a depot, it is detected above */
/* mask unreachable track bits if we are forbidden to do 90deg turns */
TrackBits bits = (TrackBits)((ts | (ts >> 8)) & TRACK_BIT_MASK);
if ((_patches.new_pathfinding_all || _patches.yapf.rail_use_yapf) && _patches.forbid_90_deg) {
bits &= ~TrackCrossesTracks(FindFirstTrack(v->u.rail.track));
}
/* no suitable trackbits at all || wrong railtype || not our track || /* no suitable trackbits at all || wrong railtype || not our track ||
* tunnel/bridge from opposite side || depot from opposite side */ * tunnel/bridge from opposite side || depot from opposite side */
if (GB(ts, 0, 16) == 0 || !CheckCompatibleRail(v, tile) || GetTileOwner(tile) != v->owner || if (bits == TRACK_BIT_NONE || !CheckCompatibleRail(v, tile) || GetTileOwner(tile) != v->owner ||
(IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeDirection(tile) != dir) || (IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeDirection(tile) != dir) ||
(IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == dir) ) { (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == dir) ) {
return TrainApproachingLineEnd(v, false); return TrainApproachingLineEnd(v, false);